From 570dabfa0925fbaa32a4494239bfbb16eb64f87f Mon Sep 17 00:00:00 2001 From: Johannes Zarl-Zierl Date: Mon, 12 Oct 2015 09:08:37 +0000 Subject: [PATCH] Export relevant static compile flags on windows. Use target_compile_definitions to populate the INTERFACE_COMPILE_DEFINITIONS property on the freeglut_static target on windows. (cherry picked from commit ffc24cfb7607739e49cd2730e44301ef4f3072ae) (cherry picked from commit ffc24cfb7607739e49cd2730e44301ef4f3072ae) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1772 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be50f98..8da214d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -392,10 +392,10 @@ ENDIF() IF(WIN32) LIST(APPEND LIBS winmm) IF(FREEGLUT_BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) + TARGET_COMPILE_DEFINITIONS(freeglut PRIVATE FREEGLUT_EXPORTS) ENDIF() IF(FREEGLUT_BUILD_STATIC_LIBS) - SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) + TARGET_COMPILE_DEFINITIONS(freeglut_static PUBLIC FREEGLUT_STATIC) # need to set machine:x64 for linker, at least for VC10, and # doesn't hurt for older compilers: # http://public.kitware.com/Bug/view.php?id=11240#c22768 @@ -509,7 +509,6 @@ MACRO(ADD_DEMO name) IF(FREEGLUT_BUILD_STATIC_LIBS) ADD_EXECUTABLE(${name}_static ${ARGN}) TARGET_LINK_LIBRARIES(${name}_static ${DEMO_LIBS} freeglut_static) - SET_TARGET_PROPERTIES(${name}_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) IF(WIN32 AND MSVC) SET_TARGET_PROPERTIES(${name}_static PROPERTIES DEBUG_POSTFIX d) ENDIF() -- 1.7.10.4