diff options
author | Robert Maynard <robert.maynard@kitware.com> | 2017-01-23 19:13:49 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-04-18 15:36:09 (GMT) |
commit | 93c89bc75ceee599ba7c08b8fe1ac5104942054f (patch) | |
tree | fc956fd1c58cd967309e78b9dd0f2384505b8807 /Tests/RunCMake/File_Generate | |
parent | ac0cf7ff4f5a846381593cf28ebbc9cfaf107149 (diff) | |
download | CMake-93c89bc75ceee599ba7c08b8fe1ac5104942054f.zip CMake-93c89bc75ceee599ba7c08b8fe1ac5104942054f.tar.gz CMake-93c89bc75ceee599ba7c08b8fe1ac5104942054f.tar.bz2 |
Genex: Allow TARGET_OBJECTS to be used everywhere
Previously the `TARGET_OBJECTS` generator expression was limited
only to use in a buildsystem context so that Xcode's placeholders
in object file paths can be evaluated. Lift this restriction so
that the expression can at least be used in most settings.
Co-Author: Brad King <brad.king@kitware.com>
Diffstat (limited to 'Tests/RunCMake/File_Generate')
-rw-r--r-- | Tests/RunCMake/File_Generate/OutputConflict-stderr.txt | 5 | ||||
-rw-r--r-- | Tests/RunCMake/File_Generate/OutputNameMatchesObjects.cmake | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt b/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt index 0abb7df..a242180 100644 --- a/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt +++ b/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt @@ -1,5 +1,6 @@ CMake Error in CMakeLists.txt: - Evaluation file to be written multiple times for different configurations - or languages with different content: + Evaluation file to be written multiple times with different content. This + is generally caused by the content evaluating the configuration type, + language, or location of object files: .*output.txt diff --git a/Tests/RunCMake/File_Generate/OutputNameMatchesObjects.cmake b/Tests/RunCMake/File_Generate/OutputNameMatchesObjects.cmake index d807450..daa7c49 100644 --- a/Tests/RunCMake/File_Generate/OutputNameMatchesObjects.cmake +++ b/Tests/RunCMake/File_Generate/OutputNameMatchesObjects.cmake @@ -1,3 +1,4 @@ +enable_language(CXX) file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<BOOL:$<TARGET_OBJECTS:foo>>somefile.cpp" |