Browse Source

Wrap CMAKE_SHARED_LIBRARY_CXX_FLAGS in quotes.

The variable is empty on some platforms (Windows), would cause issues.
pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
fc0bde4f47
  1. 2
      src/CMakeLists.txt
  2. 2
      src/DebugTools/CMakeLists.txt
  3. 2
      src/MeshTools/CMakeLists.txt
  4. 2
      src/Primitives/CMakeLists.txt
  5. 2
      src/Shaders/CMakeLists.txt
  6. 2
      src/Shapes/CMakeLists.txt
  7. 2
      src/Text/CMakeLists.txt
  8. 2
      src/TextureTools/CMakeLists.txt

2
src/CMakeLists.txt

@ -164,7 +164,7 @@ add_library(Magnum ${SHARED_OR_STATIC}
$<TARGET_OBJECTS:MagnumMathObjects>) $<TARGET_OBJECTS:MagnumMathObjects>)
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
set(Magnum_LIBS set(Magnum_LIBS
${CORRADE_UTILITY_LIBRARY} ${CORRADE_UTILITY_LIBRARY}

2
src/DebugTools/CMakeLists.txt

@ -50,7 +50,7 @@ set(MagnumDebugTools_HEADERS
add_library(MagnumDebugTools ${SHARED_OR_STATIC} ${MagnumDebugTools_SRCS}) add_library(MagnumDebugTools ${SHARED_OR_STATIC} ${MagnumDebugTools_SRCS})
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
target_link_libraries(MagnumDebugTools target_link_libraries(MagnumDebugTools
Magnum Magnum

2
src/MeshTools/CMakeLists.txt

@ -62,7 +62,7 @@ add_library(MagnumMeshTools ${SHARED_OR_STATIC}
${MagnumMeshTools_GracefulAssert_SRCS}) ${MagnumMeshTools_GracefulAssert_SRCS})
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
target_link_libraries(MagnumMeshTools Magnum) target_link_libraries(MagnumMeshTools Magnum)

2
src/Primitives/CMakeLists.txt

@ -54,7 +54,7 @@ set(MagnumPrimitives_HEADERS
add_library(MagnumPrimitives ${SHARED_OR_STATIC} ${MagnumPrimitives_SRCS}) add_library(MagnumPrimitives ${SHARED_OR_STATIC} ${MagnumPrimitives_SRCS})
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
target_link_libraries(MagnumPrimitives Magnum) target_link_libraries(MagnumPrimitives Magnum)

2
src/Shaders/CMakeLists.txt

@ -52,7 +52,7 @@ endif()
add_library(MagnumShaders ${SHARED_OR_STATIC} ${MagnumShaders_SRCS}) add_library(MagnumShaders ${SHARED_OR_STATIC} ${MagnumShaders_SRCS})
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
target_link_libraries(MagnumShaders Magnum) target_link_libraries(MagnumShaders Magnum)

2
src/Shapes/CMakeLists.txt

@ -60,7 +60,7 @@ set(MagnumShapes_HEADERS
add_library(MagnumShapes ${SHARED_OR_STATIC} ${MagnumShapes_SRCS}) add_library(MagnumShapes ${SHARED_OR_STATIC} ${MagnumShapes_SRCS})
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
target_link_libraries(MagnumShapes Magnum MagnumSceneGraph) target_link_libraries(MagnumShapes Magnum MagnumSceneGraph)

2
src/Text/CMakeLists.txt

@ -41,7 +41,7 @@ set(MagnumText_HEADERS
add_library(MagnumText ${SHARED_OR_STATIC} ${MagnumText_SRCS}) add_library(MagnumText ${SHARED_OR_STATIC} ${MagnumText_SRCS})
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
target_link_libraries(MagnumText Magnum MagnumTextureTools) target_link_libraries(MagnumText Magnum MagnumTextureTools)

2
src/TextureTools/CMakeLists.txt

@ -42,7 +42,7 @@ endif()
add_library(MagnumTextureTools ${SHARED_OR_STATIC} ${MagnumTextureTools_SRCS}) add_library(MagnumTextureTools ${SHARED_OR_STATIC} ${MagnumTextureTools_SRCS})
if(BUILD_STATIC_PIC) if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property # 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() endif()
target_link_libraries(MagnumTextureTools Magnum) target_link_libraries(MagnumTextureTools Magnum)

Loading…
Cancel
Save