blob: e202834879dd913b4cad99d71a16d2339cf2b07e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9c601b..aa35908 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,8 +246,8 @@ check_cxx_source_compiles(
CPPCMS_HAVE_FSEEKI64
)
if(NOT DISABLE_GZIP)
- find_library(ZLIB NAMES z zdll zlib${ZLIB_SUFFIX} zlib)
- find_path(ZLIB_INCLUDE_DIR zlib.h)
+ find_package(ZLIB REQUIRED)
+ set(ZLIB "${ZLIB_LIBRARIES}")
if(NOT ZLIB OR NOT ZLIB_INCLUDE_DIR)
set(DISABLE_GZIP ON)
message("Can't fild zlib - disabling compression support")
@@ -403,8 +403,8 @@ if(NOT DISABLE_GCRYPT)
endif()
if(NOT DISABLE_OPENSSL)
- find_path(OPENSSL_INCLUDE_DIR openssl/aes.h)
- find_library(LIB_OPENSSL NAMES crypto libcrypto libeay32)
+ find_package(OpenSSL REQUIRED)
+ set(LIB_OPENSSL "${OPENSSL_CRYPTO_LIBRARIES}")
endif()
if (OPENSSL_INCLUDE_DIR AND LIB_OPENSSL)
diff --git a/booster/CMakeLists.txt b/booster/CMakeLists.txt
index 0687d1d..aeaaaa8 100644
--- a/booster/CMakeLists.txt
+++ b/booster/CMakeLists.txt
@@ -124,6 +124,10 @@ endif()
if(NOT DISABLE_ICU_LOCALE)
message("-- Looking for ICU libraries")
+ find_package(ICU REQUIRED COMPONENTS i18n uc data)
+ include_directories(${ICU_INCLUDE_DIRS})
+ set(ICU_I18N "${ICU_LIBRARIES}")
+elseif(0)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
if(MSVC)
|
