From 531bb7423265c7c0181c32d0547cc06529124560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 23 May 2012 09:31:01 +0200 Subject: [PATCH] Using more portable CMAKE_SHARED_LIBRARY_CXX_FLAGS instead of -fPIC. --- src/CMakeLists.txt | 12 +----------- src/MeshTools/CMakeLists.txt | 4 +--- src/Physics/CMakeLists.txt | 1 + src/Shaders/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be26f0de8..8b926a47c 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/MeshTools/CMakeLists.txt b/src/MeshTools/CMakeLists.txt index 38bd28372..a4b4ebe15 100644 --- a/src/MeshTools/CMakeLists.txt +++ b/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 diff --git a/src/Physics/CMakeLists.txt b/src/Physics/CMakeLists.txt index 0f3833d7a..ce69e40a0 100644 --- a/src/Physics/CMakeLists.txt +++ b/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) diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt index 290555900..373cce71f 100644 --- a/src/Shaders/CMakeLists.txt +++ b/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})