Browse Source

Fix BUILD_STATIC_PIC build.

pull/77/head
Vladimír Vondruš 12 years ago
parent
commit
4480d9a5ec
  1. 4
      src/Magnum/Audio/CMakeLists.txt
  2. 4
      src/Magnum/SceneGraph/CMakeLists.txt

4
src/Magnum/Audio/CMakeLists.txt

@ -49,6 +49,10 @@ add_library(MagnumAudio ${SHARED_OR_STATIC}
${MagnumAudio_SRCS} ${MagnumAudio_SRCS}
${MagnumAudio_HEADERS}) ${MagnumAudio_HEADERS})
set_target_properties(MagnumAudio PROPERTIES DEBUG_POSTFIX "-d") set_target_properties(MagnumAudio PROPERTIES DEBUG_POSTFIX "-d")
if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property
set_target_properties(MagnumAudio PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
endif()
target_link_libraries(MagnumAudio ${CORRADE_PLUGINMANAGER_LIBRARIES} ${OPENAL_LIBRARY}) target_link_libraries(MagnumAudio ${CORRADE_PLUGINMANAGER_LIBRARIES} ${OPENAL_LIBRARY})
install(TARGETS MagnumAudio install(TARGETS MagnumAudio

4
src/Magnum/SceneGraph/CMakeLists.txt

@ -86,6 +86,10 @@ add_library(MagnumSceneGraph ${SHARED_OR_STATIC}
$<TARGET_OBJECTS:MagnumSceneGraphObjects> $<TARGET_OBJECTS:MagnumSceneGraphObjects>
${MagnumSceneGraph_GracefulAssert_SRCS}) ${MagnumSceneGraph_GracefulAssert_SRCS})
set_target_properties(MagnumSceneGraph PROPERTIES DEBUG_POSTFIX "-d") set_target_properties(MagnumSceneGraph PROPERTIES DEBUG_POSTFIX "-d")
if(BUILD_STATIC_PIC)
# TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property
set_target_properties(MagnumSceneGraph PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
endif()
target_link_libraries(MagnumSceneGraph Magnum) target_link_libraries(MagnumSceneGraph Magnum)
install(TARGETS MagnumSceneGraph install(TARGETS MagnumSceneGraph

Loading…
Cancel
Save