Tests/RunCMake: Merge TargetSources into target_sources

Tests/RunCMake/CMakeLists.txt

@@ -347,7 +347,6 @@ endif()
 add_RunCMake_test(ScriptMode)
 add_RunCMake_test(Swift -DCMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER})
 add_RunCMake_test(TargetObjects)
-add_RunCMake_test(TargetSources)
 add_RunCMake_test(TargetProperties)
 add_RunCMake_test(ToolchainFile)
 add_RunCMake_test(find_dependency)

Tests/RunCMake/TargetSources/CMakeLists.txt

@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake)

Tests/RunCMake/TargetSources/RelativePathInInterface-stdout.txt

@@ -1 +0,0 @@
--- iface: .*Tests/RunCMake/TargetSources/empty_1.cpp

Tests/RunCMake/TargetSources/RelativePathInSubdirGenEx-stdout.txt

@@ -1 +0,0 @@
--- genexlib: \$<1:.*Tests/RunCMake/TargetSources/RelativePathInSubdirGenEx/subdir_empty_1.cpp>;\$<1:.*Tests/RunCMake/TargetSources/RelativePathInSubdirGenEx/../empty_1.cpp>;\$<1:empty_2.cpp>

Tests/RunCMake/TargetSources/RelativePathInSubdirInclude-stdout.txt

@@ -1 +0,0 @@
--- privatelib: .*Tests/RunCMake/TargetSources/RelativePathInSubdirInclude/subdir_empty_1.cpp;empty_1.cpp

Tests/RunCMake/TargetSources/RelativePathInSubdirInterface-stdout.txt

@@ -1 +0,0 @@
--- iface: .*Tests/RunCMake/TargetSources/RelativePathInSubdirInterface/subdir_empty_1.cpp;.*Tests/RunCMake/TargetSources/RelativePathInSubdirInterface/subdir_empty_2.cpp;.*Tests/RunCMake/TargetSources/RelativePathInSubdirInterface/../empty_1.cpp;.*Tests/RunCMake/TargetSources/RelativePathInSubdirInterface/../empty_2.cpp

Tests/RunCMake/TargetSources/RelativePathInSubdirPrivate-stdout.txt

@@ -1 +0,0 @@
--- privatelib: .*Tests/RunCMake/TargetSources/RelativePathInSubdirPrivate/subdir_empty_1.cpp;.*Tests/RunCMake/TargetSources/RelativePathInSubdirPrivate/subdir_empty_2.cpp;.*Tests/RunCMake/TargetSources/RelativePathInSubdirPrivate/../empty_1.cpp;.*Tests/RunCMake/TargetSources/RelativePathInSubdirPrivate/../empty_2.cpp

Tests/RunCMake/TargetSources/RunCMakeTest.cmake

@@ -1,22 +0,0 @@
-include(RunCMake)
-
-if(RunCMake_GENERATOR STREQUAL "Xcode")
-  run_cmake(ConfigNotAllowed)
-endif()
-
-run_cmake(OriginDebug)
-run_cmake(CMP0026-LOCATION)
-run_cmake(CMP0076-OLD)
-run_cmake(CMP0076-WARN)
-run_cmake(RelativePathInInterface)
-run_cmake(RelativePathInSubdirGenEx)
-run_cmake(RelativePathInSubdirInterface)
-run_cmake(RelativePathInSubdirPrivate)
-run_cmake(RelativePathInSubdirInclude)
-run_cmake(ExportBuild)
-run_cmake(AddCustomTargetPublicSources)
-run_cmake(AddCustomTargetPrivateSources)
-run_cmake(AddCustomTargetInterfaceSources)
-run_cmake(AddCustomTargetSources)
-run_cmake(AddCustomTargetCheckProperty)
-run_cmake(AddCustomTargetGenx)

Tests/RunCMake/TargetSources/CMP0026-LOCATION.cmake → Tests/RunCMake/target_sources/CMP0026-LOCATION.cmake

@@ -1,5 +1,6 @@
 
 cmake_policy(SET CMP0026 OLD)
+enable_language(CXX)
 
 add_library(objlib OBJECT
     empty_1.cpp

Tests/RunCMake/target_sources/CMakeLists.txt

@@ -1,5 +1,3 @@
 cmake_minimum_required(VERSION 3.11)
-
 project(${RunCMake_TEST} LANGUAGES NONE)
-
 include(${RunCMake_TEST}.cmake)

Tests/RunCMake/TargetSources/ConfigNotAllowed-stderr.txt → Tests/RunCMake/target_sources/ConfigNotAllowed-stderr.txt

@@ -4,9 +4,9 @@ CMake Error in CMakeLists.txt:
 
   Config "Debug":
 
-    .*/Tests/RunCMake/TargetSources/empty_1.cpp
-    .*/Tests/RunCMake/TargetSources/empty_2.cpp
+    .*/Tests/RunCMake/target_sources/empty_1.cpp
+    .*/Tests/RunCMake/target_sources/empty_2.cpp
 
   Config "Release":
 
-    .*/Tests/RunCMake/TargetSources/empty_1.cpp
+    .*/Tests/RunCMake/target_sources/empty_1.cpp

Tests/RunCMake/TargetSources/OriginDebug-stderr.txt → Tests/RunCMake/target_sources/OriginDebug-stderr.txt

@@ -1,7 +1,7 @@
 CMake Debug Log at OriginDebug.cmake:13 \(add_library\):
   Used sources for target OriginDebug:
 
-   \* .*Tests/RunCMake/TargetSources/empty_2.cpp
+   \* .*Tests/RunCMake/target_sources/empty_2.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -9,7 +9,7 @@ Call Stack \(most recent call first\):
 CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
   Used sources for target OriginDebug:
 
-   \* .*Tests/RunCMake/TargetSources/empty_3.cpp
+   \* .*Tests/RunCMake/target_sources/empty_3.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -17,7 +17,7 @@ Call Stack \(most recent call first\):
 CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
   Used sources for target OriginDebug:
 
-   \* .*Tests/RunCMake/TargetSources/empty_4.cpp
+   \* .*Tests/RunCMake/target_sources/empty_4.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -25,7 +25,7 @@ Call Stack \(most recent call first\):
 CMake Debug Log at OriginDebug.cmake:14 \(target_link_libraries\):
   Used sources for target OriginDebug:
 
-   \* .*Tests/RunCMake/TargetSources/empty_1.cpp
+   \* .*Tests/RunCMake/target_sources/empty_1.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)

Tests/RunCMake/target_sources/RelativePathInInterface-stdout.txt

@@ -0,0 +1 @@
+-- iface: .*Tests/RunCMake/target_sources/empty_1.cpp

Tests/RunCMake/TargetSources/RelativePathInInterface.cmake → Tests/RunCMake/target_sources/RelativePathInInterface.cmake

@@ -1,4 +1,5 @@
 cmake_policy(SET CMP0076 NEW)
+enable_language(CXX)
 
 add_library(iface INTERFACE)
 target_sources(iface INTERFACE empty_1.cpp)

Tests/RunCMake/target_sources/RelativePathInSubdirGenEx-stdout.txt

@@ -0,0 +1 @@
+-- genexlib: \$<1:.*Tests/RunCMake/target_sources/RelativePathInSubdirGenEx/subdir_empty_1.cpp>;\$<1:.*Tests/RunCMake/target_sources/RelativePathInSubdirGenEx/../empty_1.cpp>;\$<1:empty_2.cpp>

Tests/RunCMake/TargetSources/RelativePathInSubdirGenEx.cmake → Tests/RunCMake/target_sources/RelativePathInSubdirGenEx.cmake

@@ -1,4 +1,5 @@
 cmake_policy(SET CMP0076 NEW)
+enable_language(CXX)
 
 add_library(genexlib)
 add_subdirectory(RelativePathInSubdirGenEx)

Tests/RunCMake/target_sources/RelativePathInSubdirInclude-stdout.txt

@@ -0,0 +1 @@
+-- privatelib: .*Tests/RunCMake/target_sources/RelativePathInSubdirInclude/subdir_empty_1.cpp;empty_1.cpp

Tests/RunCMake/TargetSources/RelativePathInSubdirInclude.cmake → Tests/RunCMake/target_sources/RelativePathInSubdirInclude.cmake

@@ -1,4 +1,5 @@
 cmake_policy(SET CMP0076 NEW)
+enable_language(CXX)
 
 add_library(privatelib)
 

Tests/RunCMake/target_sources/RelativePathInSubdirInterface-stdout.txt

@@ -0,0 +1 @@
+-- iface: .*Tests/RunCMake/target_sources/RelativePathInSubdirInterface/subdir_empty_1.cpp;.*Tests/RunCMake/target_sources/RelativePathInSubdirInterface/subdir_empty_2.cpp;.*Tests/RunCMake/target_sources/RelativePathInSubdirInterface/../empty_1.cpp;.*Tests/RunCMake/target_sources/RelativePathInSubdirInterface/../empty_2.cpp

Tests/RunCMake/TargetSources/RelativePathInSubdirInterface.cmake → Tests/RunCMake/target_sources/RelativePathInSubdirInterface.cmake

@@ -1,4 +1,5 @@
 cmake_policy(SET CMP0076 NEW)
+enable_language(CXX)
 
 add_library(iface INTERFACE)
 

Tests/RunCMake/target_sources/RelativePathInSubdirPrivate-stdout.txt

@@ -0,0 +1 @@
+-- privatelib: .*Tests/RunCMake/target_sources/RelativePathInSubdirPrivate/subdir_empty_1.cpp;.*Tests/RunCMake/target_sources/RelativePathInSubdirPrivate/subdir_empty_2.cpp;.*Tests/RunCMake/target_sources/RelativePathInSubdirPrivate/../empty_1.cpp;.*Tests/RunCMake/target_sources/RelativePathInSubdirPrivate/../empty_2.cpp

Tests/RunCMake/TargetSources/RelativePathInSubdirPrivate.cmake → Tests/RunCMake/target_sources/RelativePathInSubdirPrivate.cmake

@@ -1,4 +1,5 @@
 cmake_policy(SET CMP0076 NEW)
+enable_language(CXX)
 
 add_library(privatelib)
 

Tests/RunCMake/target_sources/RunCMakeTest.cmake

@@ -1,3 +1,23 @@
 include(RunCMake)
 
-run_cmake(empty_keyword_args)
+if(RunCMake_GENERATOR STREQUAL "Xcode")
+  run_cmake(ConfigNotAllowed)
+endif()
+
+run_cmake(EmptyKeywordArgs)
+run_cmake(OriginDebug)
+run_cmake(CMP0026-LOCATION)
+run_cmake(CMP0076-OLD)
+run_cmake(CMP0076-WARN)
+run_cmake(RelativePathInInterface)
+run_cmake(RelativePathInSubdirGenEx)
+run_cmake(RelativePathInSubdirInterface)
+run_cmake(RelativePathInSubdirPrivate)
+run_cmake(RelativePathInSubdirInclude)
+run_cmake(ExportBuild)
+run_cmake(AddCustomTargetPublicSources)
+run_cmake(AddCustomTargetPrivateSources)
+run_cmake(AddCustomTargetInterfaceSources)
+run_cmake(AddCustomTargetSources)
+run_cmake(AddCustomTargetCheckProperty)
+run_cmake(AddCustomTargetGenx)