diff options
| author | Allen Winter <allen.winter@kdab.com> | 2021-08-14 18:33:19 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2021-08-14 18:33:19 -0400 |
| commit | 66da823417cc546140814d7eaf4d467879a91967 (patch) | |
| tree | b6af3c949cb6c3bbd4c8cd1b9161d248b65340ed /CMakeLists.txt | |
| parent | 6f6e85c037fd4f36fd9d96cf114b244e4eac1edc (diff) | |
| download | libical-git-66da823417cc546140814d7eaf4d467879a91967.tar.gz | |
buildsystem - minor cleanups found with cmake --warn-uninitialized
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f4546599..5749bdbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ if(POLICY CMP0054) cmake_policy(SET CMP0054 NEW) endif() -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) #Include CMake capabilities include(LibIcalMacrosInternal) @@ -206,8 +206,10 @@ endif() # libicu is highly recommended for RSCALE support # libicu can be found at http://www.icu-project.org # RSCALE info at http://tools.ietf.org/html/rfc7529 -if(NOT "$ENV{ICU_BASE}" STREQUAL "") #support the old ICU_BASE env - set(ICU_ROOT $ENV{ICU_BASE}) +if(DEFINED ICU_BASE) #to make --warn-uninitialized happy + if(NOT "$ENV{ICU_BASE}" STREQUAL "") #support the old ICU_BASE env + set(ICU_ROOT $ENV{ICU_BASE}) + endif() endif() find_package(ICU COMPONENTS uc i18n) set_package_properties(ICU PROPERTIES @@ -279,6 +281,7 @@ endif() # Use GNUInstallDirs include(GNUInstallDirs) +set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "User exectuables directory name" FORCE) set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Library directory name" FORCE) set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "Include directory name" FORCE) set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR} CACHE STRING "Share directory name") |