diff options
| author | bfriesen <bfriesen> | 2015-08-29 15:30:28 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2015-08-29 15:30:28 +0000 |
| commit | a32818fc9722b864d3dbd229a95d1fd4e1c71e5f (patch) | |
| tree | 59e01e15ccbb8d14b1af83fa734a6c64e8e8792f | |
| parent | e16b43ecffc1042e0d3b205ce53cbdc43507673d (diff) | |
| download | libtiff-a32818fc9722b864d3dbd229a95d1fd4e1c71e5f.tar.gz | |
Add ld-version-script option to cmake build.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ChangeLog | 11 |
2 files changed, 13 insertions, 1 deletions
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) @@ -1,3 +1,14 @@ +2015-08-29 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + + * 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 <bfriesen@simple.dallas.tx.us> * html/v4.0.5.html: Added HTML file describing the changes which |