From 3d6700dd4103c271e92444455c02f8339b553858 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Mon, 7 Aug 2017 10:30:21 +0200 Subject: [PATCH] CMake: drop linker flag setting CMake propagates the normal compiler flags also to the linker, one would only need this for special linker-only flags. --- expat/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index de31d458..9ec332e3 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -55,14 +55,12 @@ endif(BUILD_tests) include(${CMAKE_CURRENT_LIST_DIR}/ConfigureChecks.cmake) -set(EXTRA_LINK_AND_COMPILE_FLAGS) +set(EXTRA_COMPILE_FLAGS) if(FLAG_NO_STRICT_ALIASING) - set(EXTRA_LINK_AND_COMPILE_FLAGS "${EXTRA_LINK_AND_COMPILE_FLAGS} -fno-strict-aliasing") + set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -fno-strict-aliasing") endif() -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}") -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}") -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${EXTRA_LINK_AND_COMPILE_FLAGS}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_COMPILE_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}") include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib) if(MSVC) -- 2.40.0