Przeglądaj źródła

Tests: choose an explicit FULL strategy in tests expecting it

Since it can be set in the environment when running the test suite,
guard tests which are sensitive to intermediate directory strategy
changes with explicit settings.
Ben Boeckel 6 miesięcy temu
rodzic
commit
050f891d81
76 zmienionych plików z 168 dodań i 39 usunięć
  1. 2 0
      Tests/Complex/CMakeLists.txt
  2. 2 0
      Tests/ComplexOneConfig/CMakeLists.txt
  3. 2 0
      Tests/FortranOnly/CMakeLists.txt
  4. 2 0
      Tests/MakeClean/ToClean/CMakeLists.txt
  5. 1 0
      Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
  6. 2 0
      Tests/RunCMake/AutoExportDll/AutoExport.cmake
  7. 2 0
      Tests/RunCMake/BuildDepends/CustomCommandDepfile.cmake
  8. 2 0
      Tests/RunCMake/CXXModules/ExportInstallCxxModules.cmake
  9. 2 0
      Tests/RunCMake/CXXModules/InstallBMI.cmake
  10. 2 0
      Tests/RunCMake/CXXModules/InstallBMIGenericArgs.cmake
  11. 2 0
      Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall.cmake
  12. 2 0
      Tests/RunCMake/CXXModules/NinjaDependInfoCompileDatabase.cmake
  13. 2 0
      Tests/RunCMake/CXXModules/NinjaDependInfoExport.cmake
  14. 2 0
      Tests/RunCMake/CXXModules/NinjaDependInfoExportFilesystemSafe.cmake
  15. 2 0
      Tests/RunCMake/CXXModules/NinjaDependInfoFileSet.cmake
  16. 2 0
      Tests/RunCMake/ClangTidy/ExportFixesDir.cmake
  17. 2 0
      Tests/RunCMake/ClangTidy/ExportFixesDir2.cmake
  18. 2 0
      Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake
  19. 2 0
      Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake
  20. 2 0
      Tests/RunCMake/ExternalProject/GNUMakeJobServerAware.cmake
  21. 13 13
      Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json
  22. 3 3
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json
  23. 2 2
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json
  24. 3 3
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json
  25. 5 5
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json
  26. 3 3
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json
  27. 2 2
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json
  28. 1 1
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json
  29. 1 1
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json
  30. 3 3
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json
  31. 3 3
      Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json
  32. 2 0
      Tests/RunCMake/FileAPI/codemodel-v2.cmake
  33. 2 0
      Tests/RunCMake/Make/GNUMakeJobServerAware.cmake
  34. 2 0
      Tests/RunCMake/PrecompileHeaders/CXXnotC.cmake
  35. 2 0
      Tests/RunCMake/PrecompileHeaders/DisabledPch.cmake
  36. 2 0
      Tests/RunCMake/PrecompileHeaders/PchDebugGenex.cmake
  37. 2 0
      Tests/RunCMake/PrecompileHeaders/PchIncludedAllLanguages.cmake
  38. 2 0
      Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake
  39. 2 0
      Tests/RunCMake/PrecompileHeaders/PchInterface.cmake
  40. 2 0
      Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake
  41. 2 0
      Tests/RunCMake/PrecompileHeaders/PchLibObjLibExe.cmake
  42. 2 0
      Tests/RunCMake/PrecompileHeaders/PchMultilanguage.cmake
  43. 2 0
      Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue.cmake
  44. 2 0
      Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-common.cmake
  45. 2 0
      Tests/RunCMake/PrecompileHeaders/PchReuseFromObjLib.cmake
  46. 2 0
      Tests/RunCMake/PrecompileHeaders/PchReuseFromPrefixed.cmake
  47. 2 0
      Tests/RunCMake/PrecompileHeaders/PchReuseFromSubdir.cmake
  48. 2 0
      Tests/RunCMake/PrecompileHeaders/PchWarnInvalid.cmake
  49. 2 0
      Tests/RunCMake/PrecompileHeaders/SkipPrecompileHeaders.cmake
  50. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_anon_ns.cmake
  51. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_batchsize.cmake
  52. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c.cmake
  53. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_absolute_path.cmake
  54. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx.cmake
  55. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_absolute_path.cmake
  56. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_group.cmake
  57. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_relocatable_path.cmake
  58. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_batch.cmake
  59. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_group.cmake
  60. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_c_relocatable_path.cmake
  61. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_code_before_and_after_include.cmake
  62. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_cxx.cmake
  63. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_cxx_absolute_path.cmake
  64. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_cxx_group.cmake
  65. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_cxx_relocatable_path.cmake
  66. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_default_batchsize.cmake
  67. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_order.cmake
  68. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_relocatable_locations.cmake
  69. 2 0
      Tests/RunCMake/UnityBuild/unitybuild_skip.cmake
  70. 2 0
      Tests/RunCMake/VS10Project/UnityBuildNative.cmake
  71. 2 0
      Tests/RunCMake/VS10Project/UnityBuildNativeGrouped.cmake
  72. 2 0
      Tests/RunCMake/VS10Project/UnityBuildPCH.cmake
  73. 2 0
      Tests/RunCMake/VS10Project/VsPrecompileHeaders.cmake
  74. 2 0
      Tests/RunCMake/add_test/TestLauncher.cmake
  75. 2 0
      Tests/RunCMake/install/FILES-TARGET_OBJECTS.cmake
  76. 2 0
      Tests/RunCMake/target_compile_options/Order.cmake

+ 2 - 0
Tests/Complex/CMakeLists.txt

@@ -4,6 +4,8 @@
 cmake_minimum_required(VERSION 3.10)
 project (Complex)
 
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Inform the test if the debug configuration is getting built.
 string(APPEND CMAKE_C_FLAGS_RELEASE " -DCOMPLEX_NDEBUG")
 string(APPEND CMAKE_CXX_FLAGS_RELEASE " -DCOMPLEX_NDEBUG")

+ 2 - 0
Tests/ComplexOneConfig/CMakeLists.txt

@@ -4,6 +4,8 @@
 cmake_minimum_required(VERSION 3.10)
 project (Complex)
 
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Inform the test if the debug configuration is getting built.
 string(APPEND CMAKE_C_FLAGS_RELEASE " -DCOMPLEX_NDEBUG")
 string(APPEND CMAKE_CXX_FLAGS_RELEASE " -DCOMPLEX_NDEBUG")

+ 2 - 0
Tests/FortranOnly/CMakeLists.txt

@@ -3,6 +3,8 @@ cmake_policy(SET CMP0184 NEW)
 project(FortranOnly Fortran)
 message("CTEST_FULL_OUTPUT ")
 
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 if("${CMAKE_Fortran_COMPILER_ID};${CMAKE_Fortran_SIMULATE_ID}" MATCHES "^Intel(LLVM)?;MSVC$")
   string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -Z7")
   string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO " -Z7")

+ 2 - 0
Tests/MakeClean/ToClean/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.14)
 project(ToClean)
 
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Utility variables
 set(CSD ${CMAKE_CURRENT_SOURCE_DIR})
 set(CBD ${CMAKE_CURRENT_BINARY_DIR})

+ 1 - 0
Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt

@@ -76,6 +76,7 @@ execute_process(
         "-DCMAKE_AUTOGEN_VERBOSE=${CMAKE_AUTOGEN_VERBOSE}"
         "-DCMAKE_PREFIX_PATH:STRING=${CMAKE_PREFIX_PATH}"
         "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
+        -DCMAKE_INTERMEDIATE_DIR_STRATEGY:STRING=FULL
     WORKING_DIRECTORY "${GAT_BDIR}"
     OUTPUT_VARIABLE output
     RESULT_VARIABLE result)

+ 2 - 0
Tests/RunCMake/AutoExportDll/AutoExport.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(autoexport)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${autoexport_BINARY_DIR}/bin)

+ 2 - 0
Tests/RunCMake/BuildDepends/CustomCommandDepfile.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 cmake_policy(SET CMP0116 NEW)
 enable_language(C)
 

+ 2 - 0
Tests/RunCMake/CXXModules/ExportInstallCxxModules.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(CXX)
 set(CMAKE_CXX_SCANDEP_SOURCE "")
 

+ 2 - 0
Tests/RunCMake/CXXModules/InstallBMI.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(CXX)
 
 add_library(install-bmi)

+ 2 - 0
Tests/RunCMake/CXXModules/InstallBMIGenericArgs.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(CXX)
 
 add_library(install-bmi-generic-args)

+ 2 - 0
Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 set(CMAKE_CXX_SCANDEP_SOURCE "")

+ 2 - 0
Tests/RunCMake/CXXModules/NinjaDependInfoCompileDatabase.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 set(CMAKE_CXX_SCANDEP_SOURCE "")

+ 2 - 0
Tests/RunCMake/CXXModules/NinjaDependInfoExport.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 set(CMAKE_CXX_SCANDEP_SOURCE "")

+ 2 - 0
Tests/RunCMake/CXXModules/NinjaDependInfoExportFilesystemSafe.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 set(CMAKE_CXX_SCANDEP_SOURCE "")

+ 2 - 0
Tests/RunCMake/CXXModules/NinjaDependInfoFileSet.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Fake out that we have dyndep; we only need to generate, not actually build
 # here.
 set(CMAKE_CXX_SCANDEP_SOURCE "")

+ 2 - 0
Tests/RunCMake/ClangTidy/ExportFixesDir.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 set(CMAKE_C_CLANG_TIDY "${PSEUDO_TIDY}" -some -args)
 set(CMAKE_C_CLANG_TIDY_EXPORT_FIXES_DIR clang-tidy)

+ 2 - 0
Tests/RunCMake/ClangTidy/ExportFixesDir2.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 set(CMAKE_C_CLANG_TIDY "${PSEUDO_TIDY}" -some -args)
 set(CMAKE_C_CLANG_TIDY_EXPORT_FIXES_DIR clang-tidy)

+ 2 - 0
Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_testing()
 if(CMAKE_CROSSCOMPILING)

+ 2 - 0
Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_testing()
 set(CMAKE_CROSSCOMPILING 1)

+ 2 - 0
Tests/RunCMake/ExternalProject/GNUMakeJobServerAware.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 include(ExternalProject)
 ExternalProject_Add(Foo
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Foo

+ 13 - 13
Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json

@@ -51,7 +51,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 46,
+                    "line": 48,
                     "command": "install",
                     "hasParent": true
                 },
@@ -96,7 +96,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 49,
+                    "line": 51,
                     "command": "install",
                     "hasParent": true
                 },
@@ -144,7 +144,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 49,
+                    "line": 51,
                     "command": "install",
                     "hasParent": true
                 },
@@ -189,7 +189,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 49,
+                    "line": 51,
                     "command": "install",
                     "hasParent": true
                 },
@@ -233,7 +233,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 49,
+                    "line": 51,
                     "command": "install",
                     "hasParent": true
                 },
@@ -277,7 +277,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 54,
+                    "line": 56,
                     "command": "install",
                     "hasParent": true
                 },
@@ -324,7 +324,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 56,
+                    "line": 58,
                     "command": "install",
                     "hasParent": true
                 },
@@ -369,7 +369,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 57,
+                    "line": 59,
                     "command": "install",
                     "hasParent": true
                 },
@@ -418,7 +418,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 58,
+                    "line": 60,
                     "command": "install",
                     "hasParent": true
                 },
@@ -470,7 +470,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 59,
+                    "line": 61,
                     "command": "install",
                     "hasParent": true
                 },
@@ -519,7 +519,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 60,
+                    "line": 62,
                     "command": "install",
                     "hasParent": true
                 },
@@ -561,7 +561,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 61,
+                    "line": 63,
                     "command": "install",
                     "hasParent": true
                 },
@@ -603,7 +603,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 62,
+                    "line": 64,
                     "command": "install",
                     "hasParent": true
                 },

+ 3 - 3
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json

@@ -16,7 +16,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 8,
+                    "line": 10,
                     "command": "add_executable",
                     "hasParent": true
                 },
@@ -64,7 +64,7 @@
     "backtrace": [
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 8,
+            "line": 10,
             "command": "add_executable",
             "hasParent": true
         },
@@ -114,7 +114,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 9,
+                    "line": 11,
                     "command": "target_link_libraries",
                     "hasParent": true
                 },

+ 2 - 2
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json

@@ -16,7 +16,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 7,
+                    "line": 9,
                     "command": "add_library",
                     "hasParent": true
                 },
@@ -64,7 +64,7 @@
     "backtrace": [
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 7,
+            "line": 9,
             "command": "add_library",
             "hasParent": true
         },

+ 3 - 3
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json

@@ -16,7 +16,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 13,
+                    "line": 15,
                     "command": "add_executable",
                     "hasParent": true
                 },
@@ -64,7 +64,7 @@
     "backtrace": [
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 13,
+            "line": 15,
             "command": "add_executable",
             "hasParent": true
         },
@@ -114,7 +114,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 14,
+                    "line": 16,
                     "command": "target_link_libraries",
                     "hasParent": true
                 },

+ 5 - 5
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json

@@ -16,7 +16,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 12,
+                    "line": 14,
                     "command": "add_library",
                     "hasParent": true
                 },
@@ -69,7 +69,7 @@
     "backtrace": [
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 12,
+            "line": 14,
             "command": "add_library",
             "hasParent": true
         },
@@ -118,7 +118,7 @@
                 "backtrace": [
                     {
                         "file": "^codemodel-v2\\.cmake$",
-                        "line": 49,
+                        "line": 51,
                         "command": "install",
                         "hasParent": true
                     },
@@ -148,7 +148,7 @@
                 "backtrace": [
                     {
                         "file": "^codemodel-v2\\.cmake$",
-                        "line": 49,
+                        "line": 51,
                         "command": "install",
                         "hasParent": true
                     },
@@ -178,7 +178,7 @@
                 "backtrace": [
                     {
                         "file": "^codemodel-v2\\.cmake$",
-                        "line": 54,
+                        "line": 56,
                         "command": "install",
                         "hasParent": true
                     },

+ 3 - 3
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json

@@ -16,7 +16,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 17,
+                    "line": 19,
                     "command": "add_executable",
                     "hasParent": true
                 },
@@ -64,7 +64,7 @@
     "backtrace": [
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 17,
+            "line": 19,
             "command": "add_executable",
             "hasParent": true
         },
@@ -114,7 +114,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 18,
+                    "line": 20,
                     "command": "target_link_libraries",
                     "hasParent": true
                 },

+ 2 - 2
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json

@@ -16,7 +16,7 @@
             "backtrace": [
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 16,
+                    "line": 18,
                     "command": "add_library",
                     "hasParent": true
                 },
@@ -64,7 +64,7 @@
     "backtrace": [
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 16,
+            "line": 18,
             "command": "add_library",
             "hasParent": true
         },

+ 1 - 1
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json

@@ -89,7 +89,7 @@
     "backtrace": [
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 20,
+            "line": 22,
             "command": "add_library",
             "hasParent": true
         },

+ 1 - 1
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json

@@ -139,7 +139,7 @@
                 "backtrace": [
                     {
                         "file": "^codemodel-v2\\.cmake$",
-                        "line": 46,
+                        "line": 48,
                         "command": "install",
                         "hasParent": true
                     },

+ 3 - 3
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json

@@ -94,7 +94,7 @@
                 "backtrace": [
                     {
                         "file": "^codemodel-v2\\.cmake$",
-                        "line": 49,
+                        "line": 51,
                         "command": "install",
                         "hasParent": true
                     },
@@ -124,7 +124,7 @@
                 "backtrace": [
                     {
                         "file": "^codemodel-v2\\.cmake$",
-                        "line": 49,
+                        "line": 51,
                         "command": "install",
                         "hasParent": true
                     },
@@ -154,7 +154,7 @@
                 "backtrace": [
                     {
                         "file": "^codemodel-v2\\.cmake$",
-                        "line": 54,
+                        "line": 56,
                         "command": "install",
                         "hasParent": true
                     },

+ 3 - 3
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json

@@ -28,7 +28,7 @@
                 },
                 {
                     "file": "^codemodel-v2\\.cmake$",
-                    "line": 5,
+                    "line": 7,
                     "command": "include",
                     "hasParent": true
                 },
@@ -91,7 +91,7 @@
                         },
                         {
                             "file": "^codemodel-v2\\.cmake$",
-                            "line": 5,
+                            "line": 7,
                             "command": "include",
                             "hasParent": true
                         },
@@ -134,7 +134,7 @@
         },
         {
             "file": "^codemodel-v2\\.cmake$",
-            "line": 5,
+            "line": 7,
             "command": "include",
             "hasParent": true
         },

+ 2 - 0
Tests/RunCMake/FileAPI/codemodel-v2.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0)

+ 2 - 0
Tests/RunCMake/Make/GNUMakeJobServerAware.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 # Test JOB_SERVER_AWARE with custom commands
 add_custom_command(
   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/missing"

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/CXXnotC.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_language(CXX)
 

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/DisabledPch.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 add_library(foo foo.c)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchDebugGenex.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 add_library(foo foo.c)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchIncludedAllLanguages.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_language(CXX)
 

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_language(CXX)
 

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchInterface.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 add_library(foo foo.c)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake

@@ -1,2 +1,4 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 set(CMAKE_UNITY_BUILD 1)
 include(PchInterface.cmake)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchLibObjLibExe.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(CXX)
 
 foreach(i 1 2 3)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchMultilanguage.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_language(CXX)
 

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_language(CXX)
 

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-common.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 if(CMAKE_C_COMPILE_OPTIONS_USE_PCH)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchReuseFromObjLib.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_language(CXX)
 

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchReuseFromPrefixed.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 if(CMAKE_C_COMPILE_OPTIONS_USE_PCH)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchReuseFromSubdir.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 add_library(empty empty.c)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/PchWarnInvalid.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

+ 2 - 0
Tests/RunCMake/PrecompileHeaders/SkipPrecompileHeaders.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_language(CXX)
 

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_anon_ns.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_anon_ns CXX)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/unitybuild_anon_ns_test_files.cmake)

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_batchsize.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_batchsize C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_absolute_path.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c_absolute_path C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c_and_cxx C CXX)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_absolute_path.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c_and_cxx_absolute_path C CXX)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_group.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c_and_cxx C CXX)
 
 set(srcs f.c)

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_relocatable_path.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c_and_cxx_relocatable_path C CXX)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_batch.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_group.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_c_relocatable_path.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c_relocatable_path C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_code_before_and_after_include.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_code_before_and_after_include C)
 
 set(src "${CMAKE_CURRENT_BINARY_DIR}/s1.c")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_cxx.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_cxx CXX)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_cxx_absolute_path.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_cxx_absolute_path CXX)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_cxx_group.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_cxx CXX)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_cxx_relocatable_path.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_cxx_relocatable_path CXX)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_default_batchsize.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_default_batchsize C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_order.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_order C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_relocatable_locations.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_relocatable_locations C)
 
 # Binary path relative source file

+ 2 - 0
Tests/RunCMake/UnityBuild/unitybuild_skip.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_skip C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/VS10Project/UnityBuildNative.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/VS10Project/UnityBuildNativeGrouped.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(unitybuild_c C)
 
 set(srcs "")

+ 2 - 0
Tests/RunCMake/VS10Project/UnityBuildPCH.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 add_library(UnityBuildPCH STATIC UnityBuildPCH.c)
 target_precompile_headers(UnityBuildPCH PRIVATE UnityBuildPCH.h)

+ 2 - 0
Tests/RunCMake/VS10Project/VsPrecompileHeaders.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 project(VsPrecompileHeaders CXX)
 
 add_library(tgt SHARED empty.cxx)

+ 2 - 0
Tests/RunCMake/add_test/TestLauncher.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 enable_testing()
 

+ 2 - 0
Tests/RunCMake/install/FILES-TARGET_OBJECTS.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 enable_language(C)
 add_library(objs OBJECT obj1.c obj2.c)
 install(FILES $<TARGET_OBJECTS:objs> DESTINATION objs)

+ 2 - 0
Tests/RunCMake/target_compile_options/Order.cmake

@@ -1,3 +1,5 @@
+set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE)
+
 get_property (isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(isMultiConfig)
   set(CMAKE_CONFIGURATION_TYPES "Custom" CACHE STRING "" FORCE)