summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2024-01-19 10:09:32 -0800
committerMark Adler <madler@alumni.caltech.edu>2024-01-19 10:10:42 -0800
commit7b632b486a591aa28d3d98d0ed8aa2235ee34643 (patch)
treef662540f965ec0412d4f26f1568f5d7d2cfcbdda
parent3f635df97edbb85f55f8e991e5f00d94f4132a14 (diff)
downloadzlib-7b632b486a591aa28d3d98d0ed8aa2235ee34643.tar.gz
zlib-7b632b486a591aa28d3d98d0ed8aa2235ee34643.tar.bz2
zlib-7b632b486a591aa28d3d98d0ed8aa2235ee34643.zip
Revert "Add a CMake option to link the C runtime statically."
This reverts commit 44dc43ab047d65febed972a17b0e3bf7e994e8f2.
-rw-r--r--CMakeLists.txt25
1 files changed, 4 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ae4d6f..6fab3dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,11 @@
1cmake_minimum_required(VERSION 2.4.4...3.15.0) 1cmake_minimum_required(VERSION 2.4.4...3.15.0)
2set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) 2set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3 3
4if(POLICY CMP0091)
5 cmake_policy(SET CMP0091 NEW)
6endif()
7
8project(zlib C) 4project(zlib C)
9 5
10set(VERSION "1.3.0.1") 6set(VERSION "1.3.0.1")
11 7
12option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON) 8option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
13option(ZLIB_STATIC_LINK_CRT "Link the MSVC runtime library statically" OFF)
14 9
15set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") 10set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
16set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") 11set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@@ -83,24 +78,12 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
83endif() 78endif()
84 79
85set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) 80set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
86configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein 81configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
87 ${ZLIB_PC} @ONLY) 82 ${ZLIB_PC} @ONLY)
88configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein 83configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
89 ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) 84 ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
90include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) 85include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
91 86
92if(POLICY CMP0091)
93 # CMake >= 3.15 has CMAKE_MSVC_RUNTIME_LIBRARY to set the MSVCC runtime library
94 if(WIN32 AND CMAKE_GENERATOR MATCHES "Visual Studio .*|NMake .*")
95 if(ZLIB_STATIC_LINK_CRT)
96 message(STATUS "Configuring to link the MSVC runtime library statically")
97 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
98 else()
99 message(STATUS "Configuring to link the MSVC runtime library dynamically")
100 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
101 endif()
102 endif()
103endif()
104 87
105#============================================================================ 88#============================================================================
106# zlib 89# zlib