diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-24 15:04:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-24 15:05:12 (GMT) |
| commit | b928be62fa403403ba5d8bc7521b5a8ae5ff54cf (patch) | |
| tree | 0f1f1b2ac6bb24d19ac6a503b4b51e56b328d83a /Tests | |
| parent | 1ec112c70de1718464074febdad16ede4da4a12f (diff) | |
| parent | 76ad2ecb500c8652e59179959b8ecee28a5196de (diff) | |
| download | CMake-b928be62fa403403ba5d8bc7521b5a8ae5ff54cf.zip CMake-b928be62fa403403ba5d8bc7521b5a8ae5ff54cf.tar.gz CMake-b928be62fa403403ba5d8bc7521b5a8ae5ff54cf.tar.bz2 | |
Merge topic 'reorder-sys-includes'
76ad2ecb50 Order SYSTEM include directories after non-system directories
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1968
Diffstat (limited to 'Tests')
4 files changed, 7 insertions, 0 deletions
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt index db18462..b7b8320 100644 --- a/Tests/IncludeDirectories/CMakeLists.txt +++ b/Tests/IncludeDirectories/CMakeLists.txt @@ -65,6 +65,10 @@ else() PROPERTIES COMPILE_FLAGS "-ITarProp") endif() +add_library(ordertest ordertest.cpp) +target_include_directories(ordertest SYSTEM PUBLIC SystemIncludeDirectories/systemlib) +target_include_directories(ordertest PUBLIC SystemIncludeDirectories/userlib) + add_subdirectory(StandardIncludeDirectories) add_subdirectory(TargetIncludeDirectories) diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/systemlib/ordertest.h b/Tests/IncludeDirectories/SystemIncludeDirectories/systemlib/ordertest.h new file mode 100644 index 0000000..28915e6 --- /dev/null +++ b/Tests/IncludeDirectories/SystemIncludeDirectories/systemlib/ordertest.h @@ -0,0 +1 @@ +#error ordertest.h includes from systemlib diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/userlib/ordertest.h b/Tests/IncludeDirectories/SystemIncludeDirectories/userlib/ordertest.h new file mode 100644 index 0000000..fa882cb --- /dev/null +++ b/Tests/IncludeDirectories/SystemIncludeDirectories/userlib/ordertest.h @@ -0,0 +1 @@ +/* empty file */ diff --git a/Tests/IncludeDirectories/ordertest.cpp b/Tests/IncludeDirectories/ordertest.cpp new file mode 100644 index 0000000..7e24f77 --- /dev/null +++ b/Tests/IncludeDirectories/ordertest.cpp @@ -0,0 +1 @@ +#include "ordertest.h" |