diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-08 19:36:46 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-08 21:00:44 +0100 |
| commit | 9ebb0309bd4f3707cfc2b0ac7517b408f8c41541 (patch) | |
| tree | 7722fd636be9b90f3943ab45954245092128904a | |
| parent | 93057cb2141dee8846c9304eb6a9aae2ba9c4dc0 (diff) | |
Fix test for CMAKE_INSTALL_PREFIX being explicitly set.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | default_build_settings.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 378439a4fbb..45de080dd1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,9 @@ vespa_detect_build_platform() message("-- Vespa build platform is ${VESPA_OS_DISTRO} ${VESPA_OS_DISTRO_VERSION}") vespa_use_default_cxx_compiler() vespa_use_default_java_home() -vespa_use_default_build_settings() project(vespa CXX C) +vespa_use_default_build_settings() # allows import of project in CLion on OSX if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 7d43c99b45d..244883f01f4 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -87,6 +87,7 @@ endfunction() function(vespa_use_default_build_settings) if (DEFINED CMAKE_INSTALL_PREFIX AND DEFINED CMAKE_PREFIX_PATH AND + NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND DEFINED VESPA_LLVM_VERSION AND DEFINED EXTRA_INCLUDE_DIRECTORY AND DEFINED EXTRA_LINK_DIRECTORY AND DEFINED CMAKE_INSTALL_RPATH AND DEFINED CMAKE_BUILD_RPATH) @@ -187,10 +188,9 @@ function(vespa_use_default_build_settings) if(DEFINED DEFAULT_VESPA_USER) message("-- DEFAULT_VESPA_USER is ${DEFAULT_VESPA_USER}") endif() - if(NOT DEFINED CMAKE_INSTALL_PREFIX AND DEFINED DEFAULT_CMAKE_INSTALL_PREFIX) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND DEFINED DEFAULT_CMAKE_INSTALL_PREFIX) message("-- Setting CMAKE_INSTALL_PREFIX to ${DEFAULT_CMAKE_INSTALL_PREFIX}") - set(CMAKE_INSTALL_PREFIX "${DEFAULT_CMAKE_INSTALL_PREFIX}" PARENT_SCOPE) - set(CMAKE_INSTALL_PREFIX "${DEFAULT_CMAKE_INSTALL_PREFIX}") + set(CMAKE_INSTALL_PREFIX "${DEFAULT_CMAKE_INSTALL_PREFIX}" CACHE PATH "Install prefix for vespa project" FORCE) endif() if(NOT DEFINED CMAKE_PREFIX_PATH AND DEFINED DEFAULT_CMAKE_PREFIX_PATH) message("-- Setting CMAKE_PREFIX_PATH to ${DEFAULT_CMAKE_PREFIX_PATH}") |