From 050f891d81f171a75d052d1f7ced5839913dffbc Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 27 May 2025 14:56:11 +0200 Subject: 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. --- Tests/Complex/CMakeLists.txt | 2 ++ Tests/ComplexOneConfig/CMakeLists.txt | 2 ++ Tests/FortranOnly/CMakeLists.txt | 2 ++ Tests/MakeClean/ToClean/CMakeLists.txt | 2 ++ Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt | 1 + Tests/RunCMake/AutoExportDll/AutoExport.cmake | 2 ++ .../BuildDepends/CustomCommandDepfile.cmake | 2 ++ .../CXXModules/ExportInstallCxxModules.cmake | 2 ++ Tests/RunCMake/CXXModules/InstallBMI.cmake | 2 ++ .../CXXModules/InstallBMIGenericArgs.cmake | 2 ++ .../CXXModules/NinjaDependInfoBMIInstall.cmake | 2 ++ .../NinjaDependInfoCompileDatabase.cmake | 2 ++ .../CXXModules/NinjaDependInfoExport.cmake | 2 ++ .../NinjaDependInfoExportFilesystemSafe.cmake | 2 ++ .../CXXModules/NinjaDependInfoFileSet.cmake | 2 ++ Tests/RunCMake/ClangTidy/ExportFixesDir.cmake | 2 ++ Tests/RunCMake/ClangTidy/ExportFixesDir2.cmake | 2 ++ .../AddTest-CMP0158-OLD.cmake | 2 ++ .../RunCMake/CrosscompilingEmulator/AddTest.cmake | 2 ++ .../ExternalProject/GNUMakeJobServerAware.cmake | 2 ++ .../FileAPI/codemodel-v2-data/directories/top.json | 26 +++++++++++----------- .../FileAPI/codemodel-v2-data/targets/c_exe.json | 6 ++--- .../FileAPI/codemodel-v2-data/targets/c_lib.json | 4 ++-- .../codemodel-v2-data/targets/c_shared_exe.json | 6 ++--- .../codemodel-v2-data/targets/c_shared_lib.json | 10 ++++----- .../codemodel-v2-data/targets/c_static_exe.json | 6 ++--- .../codemodel-v2-data/targets/c_static_lib.json | 4 ++-- .../codemodel-v2-data/targets/c_subdir.json | 2 +- .../FileAPI/codemodel-v2-data/targets/cxx_exe.json | 2 +- .../codemodel-v2-data/targets/cxx_shared_lib.json | 6 ++--- .../codemodel-v2-data/targets/interface_exe.json | 6 ++--- Tests/RunCMake/FileAPI/codemodel-v2.cmake | 2 ++ Tests/RunCMake/Make/GNUMakeJobServerAware.cmake | 2 ++ Tests/RunCMake/PrecompileHeaders/CXXnotC.cmake | 2 ++ Tests/RunCMake/PrecompileHeaders/DisabledPch.cmake | 2 ++ .../RunCMake/PrecompileHeaders/PchDebugGenex.cmake | 2 ++ .../PchIncludedAllLanguages.cmake | 2 ++ .../PrecompileHeaders/PchIncludedOneLanguage.cmake | 2 ++ .../RunCMake/PrecompileHeaders/PchInterface.cmake | 2 ++ .../PrecompileHeaders/PchInterfaceUnity.cmake | 2 ++ .../PrecompileHeaders/PchLibObjLibExe.cmake | 2 ++ .../PrecompileHeaders/PchMultilanguage.cmake | 2 ++ .../PrecompileHeaders/PchPrologueEpilogue.cmake | 2 ++ .../PchReuseFrom-CMP0141-common.cmake | 2 ++ .../PrecompileHeaders/PchReuseFromObjLib.cmake | 2 ++ .../PrecompileHeaders/PchReuseFromPrefixed.cmake | 2 ++ .../PrecompileHeaders/PchReuseFromSubdir.cmake | 2 ++ .../PrecompileHeaders/PchWarnInvalid.cmake | 2 ++ .../PrecompileHeaders/SkipPrecompileHeaders.cmake | 2 ++ Tests/RunCMake/UnityBuild/unitybuild_anon_ns.cmake | 2 ++ .../RunCMake/UnityBuild/unitybuild_batchsize.cmake | 2 ++ Tests/RunCMake/UnityBuild/unitybuild_c.cmake | 2 ++ .../UnityBuild/unitybuild_c_absolute_path.cmake | 2 ++ .../RunCMake/UnityBuild/unitybuild_c_and_cxx.cmake | 2 ++ .../unitybuild_c_and_cxx_absolute_path.cmake | 2 ++ .../UnityBuild/unitybuild_c_and_cxx_group.cmake | 2 ++ .../unitybuild_c_and_cxx_relocatable_path.cmake | 2 ++ Tests/RunCMake/UnityBuild/unitybuild_c_batch.cmake | 2 ++ Tests/RunCMake/UnityBuild/unitybuild_c_group.cmake | 2 ++ .../UnityBuild/unitybuild_c_relocatable_path.cmake | 2 ++ .../unitybuild_code_before_and_after_include.cmake | 2 ++ Tests/RunCMake/UnityBuild/unitybuild_cxx.cmake | 2 ++ .../UnityBuild/unitybuild_cxx_absolute_path.cmake | 2 ++ .../RunCMake/UnityBuild/unitybuild_cxx_group.cmake | 2 ++ .../unitybuild_cxx_relocatable_path.cmake | 2 ++ .../UnityBuild/unitybuild_default_batchsize.cmake | 2 ++ Tests/RunCMake/UnityBuild/unitybuild_order.cmake | 2 ++ .../unitybuild_relocatable_locations.cmake | 2 ++ Tests/RunCMake/UnityBuild/unitybuild_skip.cmake | 2 ++ Tests/RunCMake/VS10Project/UnityBuildNative.cmake | 2 ++ .../VS10Project/UnityBuildNativeGrouped.cmake | 2 ++ Tests/RunCMake/VS10Project/UnityBuildPCH.cmake | 2 ++ .../RunCMake/VS10Project/VsPrecompileHeaders.cmake | 2 ++ Tests/RunCMake/add_test/TestLauncher.cmake | 2 ++ Tests/RunCMake/install/FILES-TARGET_OBJECTS.cmake | 2 ++ Tests/RunCMake/target_compile_options/Order.cmake | 2 ++ 76 files changed, 168 insertions(+), 39 deletions(-) diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 0ea2970..8a064a4 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/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") diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index 3dc4eca..4b00e5d 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/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") diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt index d32c3bd..8643318 100644 --- a/Tests/FortranOnly/CMakeLists.txt +++ b/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") diff --git a/Tests/MakeClean/ToClean/CMakeLists.txt b/Tests/MakeClean/ToClean/CMakeLists.txt index a05c38b..3f43121 100644 --- a/Tests/MakeClean/ToClean/CMakeLists.txt +++ b/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}) diff --git a/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt b/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt index 5c70e43..78c317e 100644 --- a/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt +++ b/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) diff --git a/Tests/RunCMake/AutoExportDll/AutoExport.cmake b/Tests/RunCMake/AutoExportDll/AutoExport.cmake index 024c647..8abf7fd 100644 --- a/Tests/RunCMake/AutoExportDll/AutoExport.cmake +++ b/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) diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDepfile.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepfile.cmake index 331d21d..2429f3f 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDepfile.cmake +++ b/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) diff --git a/Tests/RunCMake/CXXModules/ExportInstallCxxModules.cmake b/Tests/RunCMake/CXXModules/ExportInstallCxxModules.cmake index 24a32a6..238cda5 100644 --- a/Tests/RunCMake/CXXModules/ExportInstallCxxModules.cmake +++ b/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 "") diff --git a/Tests/RunCMake/CXXModules/InstallBMI.cmake b/Tests/RunCMake/CXXModules/InstallBMI.cmake index f0947b4..d05d4ae 100644 --- a/Tests/RunCMake/CXXModules/InstallBMI.cmake +++ b/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) diff --git a/Tests/RunCMake/CXXModules/InstallBMIGenericArgs.cmake b/Tests/RunCMake/CXXModules/InstallBMIGenericArgs.cmake index 8f17143..08e8c37 100644 --- a/Tests/RunCMake/CXXModules/InstallBMIGenericArgs.cmake +++ b/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) diff --git a/Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall.cmake b/Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall.cmake index fd8fd25..7a6a46f 100644 --- a/Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall.cmake +++ b/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 "") diff --git a/Tests/RunCMake/CXXModules/NinjaDependInfoCompileDatabase.cmake b/Tests/RunCMake/CXXModules/NinjaDependInfoCompileDatabase.cmake index 27daba0..c481f59 100644 --- a/Tests/RunCMake/CXXModules/NinjaDependInfoCompileDatabase.cmake +++ b/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 "") diff --git a/Tests/RunCMake/CXXModules/NinjaDependInfoExport.cmake b/Tests/RunCMake/CXXModules/NinjaDependInfoExport.cmake index a224eca..22ff95f 100644 --- a/Tests/RunCMake/CXXModules/NinjaDependInfoExport.cmake +++ b/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 "") diff --git a/Tests/RunCMake/CXXModules/NinjaDependInfoExportFilesystemSafe.cmake b/Tests/RunCMake/CXXModules/NinjaDependInfoExportFilesystemSafe.cmake index 890b5e4..18e777d 100644 --- a/Tests/RunCMake/CXXModules/NinjaDependInfoExportFilesystemSafe.cmake +++ b/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 "") diff --git a/Tests/RunCMake/CXXModules/NinjaDependInfoFileSet.cmake b/Tests/RunCMake/CXXModules/NinjaDependInfoFileSet.cmake index 77351bf..a2c3fe9 100644 --- a/Tests/RunCMake/CXXModules/NinjaDependInfoFileSet.cmake +++ b/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 "") diff --git a/Tests/RunCMake/ClangTidy/ExportFixesDir.cmake b/Tests/RunCMake/ClangTidy/ExportFixesDir.cmake index 2b278da..30bade3 100644 --- a/Tests/RunCMake/ClangTidy/ExportFixesDir.cmake +++ b/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) diff --git a/Tests/RunCMake/ClangTidy/ExportFixesDir2.cmake b/Tests/RunCMake/ClangTidy/ExportFixesDir2.cmake index c81c49a..3fab637 100644 --- a/Tests/RunCMake/ClangTidy/ExportFixesDir2.cmake +++ b/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) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake index e85fd40..4df6298 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake +++ b/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) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake index 2d169dc..c5e42c8 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake +++ b/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) diff --git a/Tests/RunCMake/ExternalProject/GNUMakeJobServerAware.cmake b/Tests/RunCMake/ExternalProject/GNUMakeJobServerAware.cmake index 077b929..c468be3 100644 --- a/Tests/RunCMake/ExternalProject/GNUMakeJobServerAware.cmake +++ b/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 diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json index f535822..a72eb1d 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json index 34e1cbf..2defdaa 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json index 4a0a43d..04452c4 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json index ad34f88..a9350a1 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json index 9eee3dc..9bfa73b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json index badeeb2..f872b4c 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json index a05cf59..7d7ab8d 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json index 95c5e64..3ffdbac 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json index 68ec736..86d70d6 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json index 45894c0..5318b52 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json index e737de5..acd7d59 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json +++ b/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 }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2.cmake b/Tests/RunCMake/FileAPI/codemodel-v2.cmake index d2c3378..1c411f5 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2.cmake +++ b/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) diff --git a/Tests/RunCMake/Make/GNUMakeJobServerAware.cmake b/Tests/RunCMake/Make/GNUMakeJobServerAware.cmake index d92e842..997cf8e 100644 --- a/Tests/RunCMake/Make/GNUMakeJobServerAware.cmake +++ b/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" diff --git a/Tests/RunCMake/PrecompileHeaders/CXXnotC.cmake b/Tests/RunCMake/PrecompileHeaders/CXXnotC.cmake index 9ec1b36..1f5d633 100644 --- a/Tests/RunCMake/PrecompileHeaders/CXXnotC.cmake +++ b/Tests/RunCMake/PrecompileHeaders/CXXnotC.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_language(CXX) diff --git a/Tests/RunCMake/PrecompileHeaders/DisabledPch.cmake b/Tests/RunCMake/PrecompileHeaders/DisabledPch.cmake index 18b09c1..bd39193 100644 --- a/Tests/RunCMake/PrecompileHeaders/DisabledPch.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchDebugGenex.cmake b/Tests/RunCMake/PrecompileHeaders/PchDebugGenex.cmake index 039a546..19c875e 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchDebugGenex.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchIncludedAllLanguages.cmake b/Tests/RunCMake/PrecompileHeaders/PchIncludedAllLanguages.cmake index eef189a..160a4d5 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchIncludedAllLanguages.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchIncludedAllLanguages.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_language(CXX) diff --git a/Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake b/Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake index 6c5e89d..7a16147 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_language(CXX) diff --git a/Tests/RunCMake/PrecompileHeaders/PchInterface.cmake b/Tests/RunCMake/PrecompileHeaders/PchInterface.cmake index c031660..aebabc3 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchInterface.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake b/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake index 59c2523..2e40509 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchInterfaceUnity.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchLibObjLibExe.cmake b/Tests/RunCMake/PrecompileHeaders/PchLibObjLibExe.cmake index ad8a328..6fc0797 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchLibObjLibExe.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchMultilanguage.cmake b/Tests/RunCMake/PrecompileHeaders/PchMultilanguage.cmake index d8abf8e..9993778 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchMultilanguage.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchMultilanguage.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_language(CXX) diff --git a/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue.cmake b/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue.cmake index 988c4c6..60c1d04 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchPrologueEpilogue.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_language(CXX) diff --git a/Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-common.cmake b/Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-common.cmake index 8d5e945..ad9d2be 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchReuseFrom-CMP0141-common.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchReuseFromObjLib.cmake b/Tests/RunCMake/PrecompileHeaders/PchReuseFromObjLib.cmake index 510877f..6257fdc 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchReuseFromObjLib.cmake +++ b/Tests/RunCMake/PrecompileHeaders/PchReuseFromObjLib.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_language(CXX) diff --git a/Tests/RunCMake/PrecompileHeaders/PchReuseFromPrefixed.cmake b/Tests/RunCMake/PrecompileHeaders/PchReuseFromPrefixed.cmake index 14703e3..22ee46b 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchReuseFromPrefixed.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchReuseFromSubdir.cmake b/Tests/RunCMake/PrecompileHeaders/PchReuseFromSubdir.cmake index fefb4ee..76be41f 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchReuseFromSubdir.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/PchWarnInvalid.cmake b/Tests/RunCMake/PrecompileHeaders/PchWarnInvalid.cmake index 4525664..d70d4a4 100644 --- a/Tests/RunCMake/PrecompileHeaders/PchWarnInvalid.cmake +++ b/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) diff --git a/Tests/RunCMake/PrecompileHeaders/SkipPrecompileHeaders.cmake b/Tests/RunCMake/PrecompileHeaders/SkipPrecompileHeaders.cmake index 7405e65..60a93a0 100644 --- a/Tests/RunCMake/PrecompileHeaders/SkipPrecompileHeaders.cmake +++ b/Tests/RunCMake/PrecompileHeaders/SkipPrecompileHeaders.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_language(CXX) diff --git a/Tests/RunCMake/UnityBuild/unitybuild_anon_ns.cmake b/Tests/RunCMake/UnityBuild/unitybuild_anon_ns.cmake index e05863d..8f406b4 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_anon_ns.cmake +++ b/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) diff --git a/Tests/RunCMake/UnityBuild/unitybuild_batchsize.cmake b/Tests/RunCMake/UnityBuild/unitybuild_batchsize.cmake index 7caf251..43d5e25 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_batchsize.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c.cmake index 77a09cb..68d5a7f 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_absolute_path.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_absolute_path.cmake index 0fe6fbf..7d0b7d8 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_absolute_path.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx.cmake index 073aff2..f8e3b1b 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_absolute_path.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_absolute_path.cmake index 9c6b0e4..172186b 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_absolute_path.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_group.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_group.cmake index 7bf3f4b..145c62b 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_group.cmake +++ b/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) diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_relocatable_path.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_relocatable_path.cmake index 21257f4..c2dc7fd 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx_relocatable_path.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_batch.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_batch.cmake index 33873b6..5169a99 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_batch.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_group.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_group.cmake index 1fa17f3..b0719c6 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_group.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_c_relocatable_path.cmake b/Tests/RunCMake/UnityBuild/unitybuild_c_relocatable_path.cmake index e6046e6..8f9d4e1 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_c_relocatable_path.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_code_before_and_after_include.cmake b/Tests/RunCMake/UnityBuild/unitybuild_code_before_and_after_include.cmake index cc9cc28..38e945b 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_code_before_and_after_include.cmake +++ b/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") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_cxx.cmake b/Tests/RunCMake/UnityBuild/unitybuild_cxx.cmake index be800d7..92ee5a7 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_cxx.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_cxx_absolute_path.cmake b/Tests/RunCMake/UnityBuild/unitybuild_cxx_absolute_path.cmake index 07543f4..94af79a 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_cxx_absolute_path.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_cxx_group.cmake b/Tests/RunCMake/UnityBuild/unitybuild_cxx_group.cmake index 9804289..726cf76 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_cxx_group.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_cxx_relocatable_path.cmake b/Tests/RunCMake/UnityBuild/unitybuild_cxx_relocatable_path.cmake index abf672d..20c649d 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_cxx_relocatable_path.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_default_batchsize.cmake b/Tests/RunCMake/UnityBuild/unitybuild_default_batchsize.cmake index 60b9875..e547571 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_default_batchsize.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_order.cmake b/Tests/RunCMake/UnityBuild/unitybuild_order.cmake index 819603d..08490cb 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_order.cmake +++ b/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 "") diff --git a/Tests/RunCMake/UnityBuild/unitybuild_relocatable_locations.cmake b/Tests/RunCMake/UnityBuild/unitybuild_relocatable_locations.cmake index a28d89e..5b267fc 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_relocatable_locations.cmake +++ b/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 diff --git a/Tests/RunCMake/UnityBuild/unitybuild_skip.cmake b/Tests/RunCMake/UnityBuild/unitybuild_skip.cmake index 94e5aa3..fe1089a 100644 --- a/Tests/RunCMake/UnityBuild/unitybuild_skip.cmake +++ b/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 "") diff --git a/Tests/RunCMake/VS10Project/UnityBuildNative.cmake b/Tests/RunCMake/VS10Project/UnityBuildNative.cmake index 77a09cb..68d5a7f 100644 --- a/Tests/RunCMake/VS10Project/UnityBuildNative.cmake +++ b/Tests/RunCMake/VS10Project/UnityBuildNative.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + project(unitybuild_c C) set(srcs "") diff --git a/Tests/RunCMake/VS10Project/UnityBuildNativeGrouped.cmake b/Tests/RunCMake/VS10Project/UnityBuildNativeGrouped.cmake index b740e3b..5a5ea02 100644 --- a/Tests/RunCMake/VS10Project/UnityBuildNativeGrouped.cmake +++ b/Tests/RunCMake/VS10Project/UnityBuildNativeGrouped.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + project(unitybuild_c C) set(srcs "") diff --git a/Tests/RunCMake/VS10Project/UnityBuildPCH.cmake b/Tests/RunCMake/VS10Project/UnityBuildPCH.cmake index 875ffec..8fcd5da 100644 --- a/Tests/RunCMake/VS10Project/UnityBuildPCH.cmake +++ b/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) diff --git a/Tests/RunCMake/VS10Project/VsPrecompileHeaders.cmake b/Tests/RunCMake/VS10Project/VsPrecompileHeaders.cmake index 6d208c9..5c88c96 100644 --- a/Tests/RunCMake/VS10Project/VsPrecompileHeaders.cmake +++ b/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) diff --git a/Tests/RunCMake/add_test/TestLauncher.cmake b/Tests/RunCMake/add_test/TestLauncher.cmake index bef441d..fb43930 100644 --- a/Tests/RunCMake/add_test/TestLauncher.cmake +++ b/Tests/RunCMake/add_test/TestLauncher.cmake @@ -1,3 +1,5 @@ +set(CMAKE_INTERMEDIATE_DIR_STRATEGY FULL CACHE STRING "" FORCE) + enable_language(C) enable_testing() diff --git a/Tests/RunCMake/install/FILES-TARGET_OBJECTS.cmake b/Tests/RunCMake/install/FILES-TARGET_OBJECTS.cmake index 40c58ad..a462a8b 100644 --- a/Tests/RunCMake/install/FILES-TARGET_OBJECTS.cmake +++ b/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 $ DESTINATION objs) diff --git a/Tests/RunCMake/target_compile_options/Order.cmake b/Tests/RunCMake/target_compile_options/Order.cmake index 3d59b16..f6168fb 100644 --- a/Tests/RunCMake/target_compile_options/Order.cmake +++ b/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) -- cgit v0.12