diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-25 17:26:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-25 18:36:30 (GMT) |
| commit | 6e2a4087f2ff93fcea8391963a4101fce52ee94d (patch) | |
| tree | 29b04b188382fcc8411b799e2d788e83c8f78ee0 /Tests | |
| parent | 993d064197b36de9e18131afc4ace753b8570d0b (diff) | |
| download | CMake-6e2a4087f2ff93fcea8391963a4101fce52ee94d.zip CMake-6e2a4087f2ff93fcea8391963a4101fce52ee94d.tar.gz CMake-6e2a4087f2ff93fcea8391963a4101fce52ee94d.tar.bz2 | |
Ninja: Centralize path conversion in global generator (#15757)
In the Ninja generator we run all build rules from the top of the build
tree rather than changing into each subdirectory. Therefore we convert
all paths relative to the HOME_OUTPUT directory. However, the Convert
method on cmLocalGenerator restricts relative path conversions to avoid
leaving the build tree with a "../" sequence. Therefore conversions
performed for "subdirectories" that are outside the top of the build
tree always use full paths while conversions performed for
subdirectories that are inside the top of the build tree may use
relative paths to refer to the same files.
Since Ninja always runs rules from the top of the build tree we should
convert them using only the top-level cmLocalGenerator in order to
remain consistent. Also extend the test suite with a case that fails
without this fix.
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; } |