From bcf0cb43f4c98e18cb5dc1f2d452eab547ef54bd Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Sat, 29 Aug 2015 15:30:28 +0000 Subject: [PATCH] Add ld-version-script option to cmake build. --- CMakeLists.txt | 3 ++- ChangeLog | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25e45c16..c6e0c40f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,7 @@ if(MSVC) set(CMAKE_DEBUG_POSTFIX "d") endif() +option(ld-version-script "Enable linker version script" ON) # Check if LD supports linker scripts. file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map" "VERS_1 { global: sym; @@ -167,7 +168,7 @@ set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script=${CMAKE_C check_c_source_compiles("int main(void){return 0;}" HAVE_LD_VERSION_SCRIPT) set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE}) file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map") -if (HAVE_LD_VERSION_SCRIPT) +if (ld-version-script AND HAVE_LD_VERSION_SCRIPT) set(HAVE_LD_VERSION_SCRIPT TRUE) else() set(HAVE_LD_VERSION_SCRIPT FALSE) diff --git a/ChangeLog b/ChangeLog index 2b3eff01..6db3df06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-08-29 Bob Friesenhahn + + * CMakeLists.txt: Applied patch by Roger Leigh (via tiff mailing + list on 2015-08-29) to add ld-version-script option to cmake build + to match autoconf. Note: defaults to 'on' to be ABI-compatible by + default with common Linux distribution builds. Note that the + autoconf configure script defaults to 'off'. + + * html/build.html: Applied patch by Roger Leigh (via tiff mailing + list on 2015-08-29) to describe how to use CMake to build libtiff. + 2015-08-28 Bob Friesenhahn * html/v4.0.5.html: Added HTML file describing the changes which