Changeset: 515b3ad50e31 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=515b3ad50e31
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Don't change static libraries linking flags yet.
diffs (19 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1197,7 +1197,6 @@ else() #GCC, clang and Apple clang
MT_addCompilerFlag("-Wl,-Bsymbolic-functions"
"-Wl,-Bsymbolic-functions" "${LINK_OPTIONS}" "all" LINK_OPTIONS)
if(${CMAKE_C_COMPILER_ID} STREQUAL "AppleClang")
MT_addCompilerFlag("-Wl,-undefined,dynamic_lookup"
"-Wl,-undefined,dynamic_lookup" "${CMAKE_SHARED_LINKER_FLAGS}" "all shared
libraries" CMAKE_SHARED_LINKER_FLAGS)
- MT_addCompilerFlag("-Wl,-undefined,dynamic_lookup"
"-Wl,-undefined,dynamic_lookup" "${CMAKE_STATIC_LINKER_FLAGS}" "all static
libraries" CMAKE_STATIC_LINKER_FLAGS)
MT_addCompilerFlag("-Wl,-undefined,dynamic_lookup"
"-Wl,-undefined,dynamic_lookup" "${CMAKE_MODULE_LINKER_FLAGS}" "all shared
library modules" CMAKE_MODULE_LINKER_FLAGS)
endif()
endif()
@@ -1286,7 +1285,6 @@ endif()
set(CMAKE_C_LINK_FLAGS "${LINK_OPTIONS}" CACHE STRING "Link flags for all
builds" FORCE) # This variable is depreacted but still used
set(LINK_OPTIONS "${LINK_OPTIONS}" CACHE STRING "Link options for all builds"
FORCE)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" CACHE STRING
"Shared library link options for all builds" FORCE)
-set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}" CACHE STRING
"Static library link options for all builds" FORCE)
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" CACHE STRING
"Shared library module link options for all builds" FORCE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "Compilation flags for all
builds" FORCE)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" CACHE STRING "Debug flags"
FORCE)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
