diff options
| author | Allen Winter <allen.winter@kdab.com> | 2022-03-05 16:19:50 -0500 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2022-03-05 16:19:50 -0500 |
| commit | 5c9d4cf40fb34cd9294bbf89edbeb44304c7edc3 (patch) | |
| tree | 2c0582a6083672629d87620815133e3152034cc6 /CMakeLists.txt | |
| parent | db4eb1eeb32ef97cb3abe55f288ade41e862450f (diff) | |
| download | libical-git-5c9d4cf40fb34cd9294bbf89edbeb44304c7edc3.tar.gz | |
buildsystem - fix more uninitialized cmake variables, again
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a8733d24..52ecad2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,7 +243,6 @@ add_feature_info( "build in RSCALE support" ) if(ICU_FOUND) - set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc set(HAVE_LIBICU 1) if(ICU_VERSION VERSION_GREATER 50) set(HAVE_ICU_DANGI TRUE) @@ -276,6 +275,7 @@ if(DEFINED BerkeleyDB_ROOT_DIR) #to make --warn-uninitialized happy endif() endif() endif() +set(BerkeleyDB_FIND_QUIETLY True) find_package(BerkeleyDB) set_package_properties(BerkeleyDB PROPERTIES TYPE OPTIONAL @@ -334,10 +334,6 @@ else() set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) endif() -if(APPLE) - set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION}) -endif() - libical_option(ICAL_ERRORS_ARE_FATAL "icalerror_* calls will abort instead of internally signaling an error." False) if(ICAL_ERRORS_ARE_FATAL) set(ICAL_ERRORS_ARE_FATAL 1) @@ -717,6 +713,13 @@ else() endif() if(DEFINED CMAKE_THREAD_LIBS_INIT) set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}") +else() + set(PTHREAD_LIBS "") +endif() +if(ICU_FOUND) + set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc +else() + set(REQUIRES_PRIVATE_ICU "") endif() configure_file( |