diff options
author | Brad King <brad.king@kitware.com> | 2020-05-08 12:18:00 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-08 12:18:17 (GMT) |
commit | 171bf5fa92076dd177d7fd5a611440ac0f2597b4 (patch) | |
tree | fc19d383bfd94a95ce05210fe8ea349c222498fd /Tests | |
parent | 3a0ea8f93a790ab7a9b7d6d11f09de55220183b0 (diff) | |
parent | 2faa3f6c55d2288316419f3efb8a483904a295f2 (diff) | |
download | CMake-171bf5fa92076dd177d7fd5a611440ac0f2597b4.zip CMake-171bf5fa92076dd177d7fd5a611440ac0f2597b4.tar.gz CMake-171bf5fa92076dd177d7fd5a611440ac0f2597b4.tar.bz2 |
Merge topic 'third-parties-layout'
2faa3f6c55 Refactoring: Third-parties public headers are under cm3p prefix
75e87e3db4 bootstrap: update list of problematic files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4705
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLib/testUVProcessChain.cxx | 2 | ||||
-rw-r--r-- | Tests/CMakeLib/testUVRAII.cxx | 2 | ||||
-rw-r--r-- | Tests/CMakeLib/testUVStreambuf.cxx | 3 | ||||
-rw-r--r-- | Tests/CPackWiXGenerator/myotherapp.cpp | 2 | ||||
-rw-r--r-- | Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h | bin | 58 -> 59 bytes | |||
-rw-r--r-- | Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/Tests/CMakeLib/testUVProcessChain.cxx b/Tests/CMakeLib/testUVProcessChain.cxx index 71a1764..61a77cf 100644 --- a/Tests/CMakeLib/testUVProcessChain.cxx +++ b/Tests/CMakeLib/testUVProcessChain.cxx @@ -8,7 +8,7 @@ #include <cm/memory> -#include "cm_uv.h" +#include <cm3p/uv.h> #include "cmGetPipes.h" #include "cmUVHandlePtr.h" diff --git a/Tests/CMakeLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx index cb05ace..0607f44 100644 --- a/Tests/CMakeLib/testUVRAII.cxx +++ b/Tests/CMakeLib/testUVRAII.cxx @@ -3,7 +3,7 @@ #include <thread> #include <utility> -#include "cm_uv.h" +#include <cm3p/uv.h> #include "cmUVHandlePtr.h" diff --git a/Tests/CMakeLib/testUVStreambuf.cxx b/Tests/CMakeLib/testUVStreambuf.cxx index cd9c9d4..b86ed76 100644 --- a/Tests/CMakeLib/testUVStreambuf.cxx +++ b/Tests/CMakeLib/testUVStreambuf.cxx @@ -3,10 +3,9 @@ #include <string> #include <vector> +#include <cm3p/uv.h> #include <stdint.h> -#include "cm_uv.h" - #include "cmGetPipes.h" #include "cmUVHandlePtr.h" #include "cmUVStreambuf.h" diff --git a/Tests/CPackWiXGenerator/myotherapp.cpp b/Tests/CPackWiXGenerator/myotherapp.cpp index 0eefc1c..5047a34 100644 --- a/Tests/CPackWiXGenerator/myotherapp.cpp +++ b/Tests/CPackWiXGenerator/myotherapp.cpp @@ -1,3 +1,3 @@ int main() { -}
\ No newline at end of file +} diff --git a/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h b/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h Binary files differindex bf56ec6..2d39178 100644 --- a/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h +++ b/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h diff --git a/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp b/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp index 154e268..0c37370 100644 --- a/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp +++ b/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp @@ -1 +1 @@ -#include "MyForm.h"
\ No newline at end of file +#include "MyForm.h" |