diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-10-25 21:38:32 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-10-25 21:38:32 -0400 |
| commit | e946315627c22ec5c83505c9c72b9db64b7e67c7 (patch) | |
| tree | 37482e0ea097f37afbdb5ffc52ab3ea2680277c6 /CMakeLists.txt | |
| parent | Merge pull request #8989 (diff) | |
| parent | depends: remove libiconv: unused (diff) | |
| download | monero-e946315627c22ec5c83505c9c72b9db64b7e67c7.tar.xz | |
Merge pull request #9002
932bba3 depends: remove libiconv: unused (tobtoht)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c1fca051..7f96017c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1070,7 +1070,12 @@ if(STATIC) set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) endif() -find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale) + +set(BOOST_COMPONENTS system filesystem thread date_time chrono regex serialization program_options) +if (WIN32) + list(APPEND BOOST_COMPONENTS locale) +endif() +find_package(Boost 1.58 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS}) add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION) set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_LIB_SUFFIXES}) @@ -1095,9 +1100,7 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) if(MINGW) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj") set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt) - if(DEPENDS) - set(ICU_LIBRARIES iconv) - else() + if(NOT DEPENDS) set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv) endif() elseif(APPLE OR OPENBSD OR ANDROID) |