From fc0bde4f47ccf4d79a1da37bedaded4f26210ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 23 Jul 2013 12:26:07 +0200 Subject: [PATCH] Wrap CMAKE_SHARED_LIBRARY_CXX_FLAGS in quotes. The variable is empty on some platforms (Windows), would cause issues. --- src/CMakeLists.txt | 2 +- src/DebugTools/CMakeLists.txt | 2 +- src/MeshTools/CMakeLists.txt | 2 +- src/Primitives/CMakeLists.txt | 2 +- src/Shaders/CMakeLists.txt | 2 +- src/Shapes/CMakeLists.txt | 2 +- src/Text/CMakeLists.txt | 2 +- src/TextureTools/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 60ce0ab96..d73655b32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -164,7 +164,7 @@ add_library(Magnum ${SHARED_OR_STATIC} $) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(Magnum PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(Magnum PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() set(Magnum_LIBS ${CORRADE_UTILITY_LIBRARY} diff --git a/src/DebugTools/CMakeLists.txt b/src/DebugTools/CMakeLists.txt index 8295748fe..66546c172 100644 --- a/src/DebugTools/CMakeLists.txt +++ b/src/DebugTools/CMakeLists.txt @@ -50,7 +50,7 @@ set(MagnumDebugTools_HEADERS add_library(MagnumDebugTools ${SHARED_OR_STATIC} ${MagnumDebugTools_SRCS}) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(MagnumDebugTools PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(MagnumDebugTools PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() target_link_libraries(MagnumDebugTools Magnum diff --git a/src/MeshTools/CMakeLists.txt b/src/MeshTools/CMakeLists.txt index 3ed711ac5..ef0c26d2e 100644 --- a/src/MeshTools/CMakeLists.txt +++ b/src/MeshTools/CMakeLists.txt @@ -62,7 +62,7 @@ add_library(MagnumMeshTools ${SHARED_OR_STATIC} ${MagnumMeshTools_GracefulAssert_SRCS}) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(MagnumMeshTools PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(MagnumMeshTools PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() target_link_libraries(MagnumMeshTools Magnum) diff --git a/src/Primitives/CMakeLists.txt b/src/Primitives/CMakeLists.txt index 8ee9e9951..ae364551e 100644 --- a/src/Primitives/CMakeLists.txt +++ b/src/Primitives/CMakeLists.txt @@ -54,7 +54,7 @@ set(MagnumPrimitives_HEADERS add_library(MagnumPrimitives ${SHARED_OR_STATIC} ${MagnumPrimitives_SRCS}) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(Magnum PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(Magnum PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() target_link_libraries(MagnumPrimitives Magnum) diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt index 79de6f97c..6e4747b37 100644 --- a/src/Shaders/CMakeLists.txt +++ b/src/Shaders/CMakeLists.txt @@ -52,7 +52,7 @@ endif() add_library(MagnumShaders ${SHARED_OR_STATIC} ${MagnumShaders_SRCS}) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(MagnumShaders PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(MagnumShaders PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() target_link_libraries(MagnumShaders Magnum) diff --git a/src/Shapes/CMakeLists.txt b/src/Shapes/CMakeLists.txt index 189a1f07e..2f23c8abb 100644 --- a/src/Shapes/CMakeLists.txt +++ b/src/Shapes/CMakeLists.txt @@ -60,7 +60,7 @@ set(MagnumShapes_HEADERS add_library(MagnumShapes ${SHARED_OR_STATIC} ${MagnumShapes_SRCS}) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(MagnumShapes PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(MagnumShapes PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() target_link_libraries(MagnumShapes Magnum MagnumSceneGraph) diff --git a/src/Text/CMakeLists.txt b/src/Text/CMakeLists.txt index daed39f76..ddd67fb42 100644 --- a/src/Text/CMakeLists.txt +++ b/src/Text/CMakeLists.txt @@ -41,7 +41,7 @@ set(MagnumText_HEADERS add_library(MagnumText ${SHARED_OR_STATIC} ${MagnumText_SRCS}) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(MagnumText PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(MagnumText PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() target_link_libraries(MagnumText Magnum MagnumTextureTools) diff --git a/src/TextureTools/CMakeLists.txt b/src/TextureTools/CMakeLists.txt index b2237b57b..6529facbf 100644 --- a/src/TextureTools/CMakeLists.txt +++ b/src/TextureTools/CMakeLists.txt @@ -42,7 +42,7 @@ endif() add_library(MagnumTextureTools ${SHARED_OR_STATIC} ${MagnumTextureTools_SRCS}) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property - set_target_properties(MagnumTextureTools PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + set_target_properties(MagnumTextureTools PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") endif() target_link_libraries(MagnumTextureTools Magnum)