Browse Source

Using more portable CMAKE_SHARED_LIBRARY_CXX_FLAGS instead of -fPIC.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
531bb74232
  1. 12
      src/CMakeLists.txt
  2. 4
      src/MeshTools/CMakeLists.txt
  3. 1
      src/Physics/CMakeLists.txt
  4. 1
      src/Shaders/CMakeLists.txt

12
src/CMakeLists.txt

@ -2,13 +2,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -std=c++0x -fvisibility=
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CORRADE_INCLUDE_DIR})
# On 64bit Linux with GCC flag -fPIC is needed for building some static libraries
if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(USE_FPIC ON)
else()
set(USE_FPIC OFF)
endif()
# Files shared between main library and unit test library
set(Magnum_SRCS
AbstractImage.cpp
@ -37,10 +30,7 @@ set(MagnumMath_SRCS
)
add_library(MagnumMathObjects OBJECT ${MagnumMath_SRCS})
if(USE_FPIC)
set_target_properties(MagnumObjects PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(MagnumMathObjects PROPERTIES COMPILE_FLAGS -fPIC)
endif()
set_target_properties(MagnumObjects MagnumMathObjects PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
# Files compiled with different flags for main library and unit test library
set(Magnum_GracefulAssert_SRCS

4
src/MeshTools/CMakeLists.txt

@ -3,9 +3,7 @@ set(MagnumMeshTools_SRCS
Tipsify.cpp
)
add_library(MagnumMeshToolsObjects OBJECT ${MagnumMeshTools_SRCS})
if(USE_FPIC)
set_target_properties(MagnumMeshToolsObjects PROPERTIES COMPILE_FLAGS -fPIC)
endif()
set_target_properties(MagnumMeshToolsObjects PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
# Files compiled with different flags for main library and unit test library
set(MagnumMeshTools_GracefulAssert_SRCS

1
src/Physics/CMakeLists.txt

@ -9,6 +9,7 @@ set(MagnumPhysics_SRCS
)
add_library(MagnumPhysics SHARED ${MagnumPhysics_SRCS})
set_target_properties(MagnumPhysics PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
target_link_libraries(MagnumPhysics Magnum)

1
src/Shaders/CMakeLists.txt

@ -5,6 +5,7 @@ set(Shaders_SRCS
)
add_library(MagnumShaders SHARED ${Shaders_SRCS})
set_target_properties(MagnumShaders PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
target_link_libraries(MagnumShaders Magnum)
install(TARGETS MagnumShaders DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})

Loading…
Cancel
Save