From 371895de424df621d711e55e8e44586f15f00048 Mon Sep 17 00:00:00 2001 From: Bluenaxela Date: Fri, 7 Apr 2017 23:46:14 -0700 Subject: [PATCH] Add proper support for static builds on WIN32 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c233dc..14c1b79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ OPTION( glew-cmake_BUILD_MULTI_CONTEXT "Build the multi context glew library" ON SET( LIBGLEW_SRCS ${SRC_DIR}/glew.c ) IF( WIN32 ) - ADD_DEFINITIONS( -DWIN32_MEAN_AND_LEAN -DVC_EXTRALEAN -DGLEW_BUILD -D_CRT_SECURE_NO_WARNINGS ) + ADD_DEFINITIONS( -DWIN32_MEAN_AND_LEAN -DVC_EXTRALEAN -D_CRT_SECURE_NO_WARNINGS ) ENDIF( ) IF( MSVC ) @@ -48,6 +48,7 @@ IF ( glew-cmake_BUILD_STATIC ) ARCHIVE_OUTPUT_NAME "glew" DEBUG_POSTFIX d ) TARGET_INCLUDE_DIRECTORIES( libglew_static PUBLIC ${INCLUDE_DIR} ) + TARGET_COMPILE_DEFINITIONS( libglew_static PUBLIC GLEW_STATIC ) TARGET_LINK_LIBRARIES( libglew_static ${GL_LIBRARY} ${PLATFORM_SPECIFIC_LIBRARIES} ) INSTALL( TARGETS libglew_static ARCHIVE DESTINATION lib ) ENDIF ( ) @@ -60,6 +61,7 @@ IF ( glew-cmake_BUILD_STATIC ) DEBUG_POSTFIX d ) TARGET_COMPILE_DEFINITIONS( libglewmx_static INTERFACE GLEW_MX) TARGET_INCLUDE_DIRECTORIES( libglewmx_static PUBLIC ${INCLUDE_DIR} ) + TARGET_COMPILE_DEFINITIONS( libglewmx_static PUBLIC GLEW_STATIC ) TARGET_LINK_LIBRARIES( libglewmx_static ${GL_LIBRARY} ${PLATFORM_SPECIFIC_LIBRARIES} ) INSTALL( TARGETS libglewmx_static ARCHIVE DESTINATION lib ) ENDIF ( ) @@ -75,6 +77,7 @@ IF ( glew-cmake_BUILD_SHARED ) DEBUG_POSTFIX d ) TARGET_INCLUDE_DIRECTORIES( libglew_shared PUBLIC ${INCLUDE_DIR} ) + TARGET_COMPILE_DEFINITIONS( libglew_shared PUBLIC GLEW_BUILD ) TARGET_LINK_LIBRARIES( libglew_shared ${GL_LIBRARY} ${PLATFORM_SPECIFIC_LIBRARIES} ) INSTALL( TARGETS libglew_shared ARCHIVE DESTINATION lib LIBRARY DESTINATION lib @@ -91,6 +94,7 @@ IF ( glew-cmake_BUILD_SHARED ) TARGET_COMPILE_DEFINITIONS( libglewmx_shared INTERFACE GLEW_MX) TARGET_INCLUDE_DIRECTORIES( libglewmx_shared PUBLIC ${INCLUDE_DIR} ) + TARGET_COMPILE_DEFINITIONS( libglewmx_shared PUBLIC GLEW_BUILD ) TARGET_LINK_LIBRARIES( libglewmx_shared ${GL_LIBRARY} ${PLATFORM_SPECIFIC_LIBRARIES} ) INSTALL( TARGETS libglewmx_shared ARCHIVE DESTINATION lib LIBRARY DESTINATION lib