diff options
| author | Andrey Pokrovskiy <pokroa@amazon.com> | 2015-04-21 06:28:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-21 14:51:08 (GMT) |
| commit | 0273ef146972e0fbfbf399e468ae9d5f2b4bb3d3 (patch) | |
| tree | dce385a51cfe0fa127fe13dc6f210af23dfdbc27 /Tests/ExternalProjectSubdir | |
| parent | 7bd8cfb813e9bd19cebda92b280beb2deaf052d4 (diff) | |
| download | CMake-0273ef146972e0fbfbf399e468ae9d5f2b4bb3d3.zip CMake-0273ef146972e0fbfbf399e468ae9d5f2b4bb3d3.tar.gz CMake-0273ef146972e0fbfbf399e468ae9d5f2b4bb3d3.tar.bz2 | |
ExternalProject: Allow generator expressions with LOG_* options (#15287)
Use file(GENERATE) to write the logging wrapper scripts to evaluate
generator expressions. Use a per-config script names in case the
content varies by configuration.
Diffstat (limited to 'Tests/ExternalProjectSubdir')
| -rw-r--r-- | Tests/ExternalProjectSubdir/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ExternalProjectSubdir/Subdir1/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Tests/ExternalProjectSubdir/CMakeLists.txt b/Tests/ExternalProjectSubdir/CMakeLists.txt index fb5aa3c..013b418 100644 --- a/Tests/ExternalProjectSubdir/CMakeLists.txt +++ b/Tests/ExternalProjectSubdir/CMakeLists.txt @@ -6,7 +6,7 @@ ExternalProject_Add(Subdir1 SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Subdir1 BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Subdir1 - CMAKE_ARGS -DNORMAL_VAR=NORMAL_VALUE + CMAKE_ARGS -DNORMAL_VAR=NORMAL_VALUE -DGENEX_VAR=$<1:GENEX_VALUE> LOG_CONFIGURE 1 BUILD_COMMAND "" diff --git a/Tests/ExternalProjectSubdir/Subdir1/CMakeLists.txt b/Tests/ExternalProjectSubdir/Subdir1/CMakeLists.txt index 8b0653a..28107f0 100644 --- a/Tests/ExternalProjectSubdir/Subdir1/CMakeLists.txt +++ b/Tests/ExternalProjectSubdir/Subdir1/CMakeLists.txt @@ -4,3 +4,7 @@ project(Subdir1 NONE) if(NOT "${NORMAL_VAR}" STREQUAL "NORMAL_VALUE") message(SEND_ERROR "NORMAL_VAR != 'NORMAL_VALUE'") endif() + +if(NOT "${GENEX_VAR}" STREQUAL "GENEX_VALUE") + message(SEND_ERROR "GENEX_VAR != 'GENEX_VALUE'") +endif() |