diff options
| author | Felix Lelchuk <felix.lelchuk@gmx.de> | 2021-08-21 11:52:49 (GMT) |
|---|---|---|
| committer | Felix Lelchuk <felix.lelchuk@gmx.de> | 2021-08-24 17:21:40 (GMT) |
| commit | 047d46ebdbb87f0388fa1627a3c39810e0b08c69 (patch) | |
| tree | c81e2f73673755c7400cdaf6e70d0d93451d5dcf /Tests/InstallMode/Subproject.cmake | |
| parent | f64e8036aa1498edc34b1624df9dc8633467e7ef (diff) | |
| download | CMake-047d46ebdbb87f0388fa1627a3c39810e0b08c69.zip CMake-047d46ebdbb87f0388fa1627a3c39810e0b08c69.tar.gz CMake-047d46ebdbb87f0388fa1627a3c39810e0b08c69.tar.bz2 | |
Fix: InstallMode tests fail on some platforms
1) The ExternalProject_Add() command was called with
UPDATE_COMMAND ";" which was not noticable on most platforms
2) On AIX/GCC, the executable did not link because symbols from
imported libraries were assumed extern "C" (see commit 4fc47424)
Diffstat (limited to 'Tests/InstallMode/Subproject.cmake')
| -rw-r--r-- | Tests/InstallMode/Subproject.cmake | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Tests/InstallMode/Subproject.cmake b/Tests/InstallMode/Subproject.cmake index e4354d6..826e61e 100644 --- a/Tests/InstallMode/Subproject.cmake +++ b/Tests/InstallMode/Subproject.cmake @@ -10,12 +10,7 @@ function(add_subproject _name) set(_maybe_NO_INSTALL) if(_arg_NO_INSTALL) - set(_maybe_NO_INSTALL "INSTALL_COMMAND") - else() - # This is a trick to get a valid call. - # Since we set UPDATE_COMMAND to "" - # explicitly below, this won't harm. - set(_maybe_NO_INSTALL "UPDATE_COMMAND") + set(_maybe_NO_INSTALL INSTALL_COMMAND "") endif() if(CMAKE_GENERATOR MATCHES "Ninja Multi-Config") @@ -35,7 +30,9 @@ function(add_subproject _name) ExternalProject_Add("${_name}" DOWNLOAD_COMMAND "" UPDATE_COMMAND "" - ${_maybe_NO_INSTALL} "" + UPDATE_DISCONNECTED ON + + "${_maybe_NO_INSTALL}" BUILD_ALWAYS ON @@ -67,7 +64,7 @@ function(add_subproject _name) # however, we need to explicitly inherit other parent # project's build settings. "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}" - ${_maybe_NINJA_MULTICONFIG_ARGS} + "${_maybe_NINJA_MULTICONFIG_ARGS}" # Subproject progress reports clutter up the output, disable "-DCMAKE_TARGET_MESSAGES:BOOL=OFF" |