Merge topic 'unity-lang-filename'

274a6f3699 Unity Build: include language in generated source file name

Acked-by: Kitware Robot <[email protected]>
Merge-request: !4223

Source/cmLocalGenerator.cxx

@@ -2627,7 +2627,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target)
       chunk = std::min(itemsLeft, batchSize);
 
       std::string filename = cmStrCat(filename_base, "unity_", batch,
-                                      (lang == "C") ? ".c" : ".cxx");
+                                      (lang == "C") ? "_c.c" : "_cxx.cxx");
 
       const std::string filename_tmp = cmStrCat(filename, ".tmp");
       {

Tests/RunCMake/UnityBuild/unitybuild_batchsize-check.cmake

@@ -1,5 +1,5 @@
-set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
-set(unitybuild_c1 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_1.c")
+set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
+set(unitybuild_c1 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_1_c.c")
 if(NOT EXISTS "${unitybuild_c0}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_c0} does not exist.")
   return()

Tests/RunCMake/UnityBuild/unitybuild_c-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 if(NOT EXISTS "${unitybuild_c}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_c} does not exist.")
   return()

Tests/RunCMake/UnityBuild/unitybuild_c_and_cxx-check.cmake

@@ -1,10 +1,10 @@
-set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 if(NOT EXISTS "${unitybuild_c}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_c} does not exist.")
   return()
 endif()
 
-set(unitybuild_cxx "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.cxx")
+set(unitybuild_cxx "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_cxx.cxx")
 if(NOT EXISTS "${unitybuild_cxx}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_cxx} does not exist.")
   return()

Tests/RunCMake/UnityBuild/unitybuild_c_no_unity_build-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 if(EXISTS "${unitybuild_c}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_c} should not exist.")
   return()

Tests/RunCMake/UnityBuild/unitybuild_code_before_and_after_include-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 file(STRINGS ${unitybuild_c} unitybuild_c_strings)
 string(REGEX MATCH "#define NOMINMAX.*#include.*s1.c.*#undef NOMINMAX" matched_code ${unitybuild_c_strings})
 if(NOT matched_code)

Tests/RunCMake/UnityBuild/unitybuild_cxx-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_cxx "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.cxx")
+set(unitybuild_cxx "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_cxx.cxx")
 if(NOT EXISTS "${unitybuild_cxx}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_cxx} does not exist.")
   return()

Tests/RunCMake/UnityBuild/unitybuild_default_batchsize-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 file(STRINGS ${unitybuild_c0} unitybuild_c_strings REGEX "/s[0-9]+.c\"$" )
 list(LENGTH unitybuild_c_strings number_of_includes)
 if(NOT number_of_includes EQUAL 8)

Tests/RunCMake/UnityBuild/unitybuild_order-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 file(STRINGS ${unitybuild_c} unitybuild_c_strings)
 string(REGEX MATCH ".*#include.*s3.c.*#include.*s1.c.*#include.*s2.c.*" matched_code ${unitybuild_c_strings})
 if(NOT matched_code)

Tests/RunCMake/UnityBuild/unitybuild_skip-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 file(STRINGS ${unitybuild_c} unitybuild_c_strings)
 
 string(REGEX MATCH "\\/s[1-6].c" matched_files_1_6 ${unitybuild_c_strings})

Tests/RunCMake/VS10Project/UnityBuildNative-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 if(NOT EXISTS "${unitybuild_c0}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_c0} does not exist.")
   return()
@@ -32,7 +32,7 @@ if (NOT have_unity_support)
 endif()
 
 string(REPLACE "\\" "/" unity_source_line "${unity_source_line}")
-string(FIND "${unity_source_line}" "CMakeFiles/tgt.dir/Unity/unity_0.c" unity_source_file_position)
+string(FIND "${unity_source_line}" "CMakeFiles/tgt.dir/Unity/unity_0_c.c" unity_source_file_position)
 if (unity_source_file_position EQUAL "-1")
   set(RunCMake_TEST_FAILED "Generated project should include the generated unity source file.")
   return()

Tests/RunCMake/VS10Project/UnityBuildPre2017-check.cmake

@@ -1,4 +1,4 @@
-set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0.c")
+set(unitybuild_c0 "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/tgt.dir/Unity/unity_0_c.c")
 if(NOT EXISTS "${unitybuild_c0}")
   set(RunCMake_TEST_FAILED "Generated unity source files ${unitybuild_c0} does not exist.")
   return()
@@ -28,7 +28,7 @@ foreach(line IN LISTS tgt_projects_strings)
 endforeach()
 
 string(REPLACE "\\" "/" unity_source_line ${unity_source_line})
-string(FIND "${unity_source_line}" "CMakeFiles/tgt.dir/Unity/unity_0.c" unity_source_file_position)
+string(FIND "${unity_source_line}" "CMakeFiles/tgt.dir/Unity/unity_0_c.c" unity_source_file_position)
 if (unity_source_file_position EQUAL "-1")
   set(RunCMake_TEST_FAILED "Generated project should include the generated unity source file.")
   return()