diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-28 14:44:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-28 14:44:48 (GMT) |
| commit | 5ed2292d3a5a914c2c6a8432e77ecce633fbfc63 (patch) | |
| tree | 2fda3bebb3889555bb128ff9dc2c91723ec2d061 /Tests | |
| parent | ac5ead4a9ccf9995a8a7afdfd7a7a5e46668c23a (diff) | |
| parent | 6e2a4087f2ff93fcea8391963a4101fce52ee94d (diff) | |
| download | CMake-5ed2292d3a5a914c2c6a8432e77ecce633fbfc63.zip CMake-5ed2292d3a5a914c2c6a8432e77ecce633fbfc63.tar.gz CMake-5ed2292d3a5a914c2c6a8432e77ecce633fbfc63.tar.bz2 | |
Merge topic 'ninja-cleanup-path-conversion'
6e2a4087 Ninja: Centralize path conversion in global generator (#15757)
993d0641 Ninja: Fix OBJECT_DIR placeholder substitution in link rules
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/OutOfBinary/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/OutOfBinary/outexe.c | 2 | ||||
| -rw-r--r-- | Tests/OutOfSource/SubDir/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/OutOfSource/SubDir/subdir.c | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/Tests/OutOfBinary/CMakeLists.txt b/Tests/OutOfBinary/CMakeLists.txt index e327541..f50536e 100644 --- a/Tests/OutOfBinary/CMakeLists.txt +++ b/Tests/OutOfBinary/CMakeLists.txt @@ -1,2 +1,4 @@ add_library(outlib outlib.c) +add_executable(outexe outexe.c) +target_link_libraries(outexe subdir) diff --git a/Tests/OutOfBinary/outexe.c b/Tests/OutOfBinary/outexe.c new file mode 100644 index 0000000..6f14043 --- /dev/null +++ b/Tests/OutOfBinary/outexe.c @@ -0,0 +1,2 @@ +extern int subdir(void); +int main(void) { return subdir(); } diff --git a/Tests/OutOfSource/SubDir/CMakeLists.txt b/Tests/OutOfSource/SubDir/CMakeLists.txt index c5df36e..e18dbb9 100644 --- a/Tests/OutOfSource/SubDir/CMakeLists.txt +++ b/Tests/OutOfSource/SubDir/CMakeLists.txt @@ -6,3 +6,5 @@ add_subdirectory(${OutOfSource_SOURCE_DIR}/../OutOfBinary # subdir to a sibling dir add_subdirectory(${OutOfSource_SOURCE_DIR}/${KEN}OutOfSourceSubdir OutOfSourceSubdir ) + +add_library(subdir subdir.c) diff --git a/Tests/OutOfSource/SubDir/subdir.c b/Tests/OutOfSource/SubDir/subdir.c new file mode 100644 index 0000000..0d0d827 --- /dev/null +++ b/Tests/OutOfSource/SubDir/subdir.c @@ -0,0 +1 @@ +int subdir(void) { return 0; } |