mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-06 07:09:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cxxmodules-depend-on-modmap-file'

Browse Source 
363300ace5 cxxmodules: depend on the modmap contents
940628d48d Tests/CXXModules: test that objects depend on their modmap files
681ee92030 Tests/CXXModules: support testing rebuild conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9248
This commit is contained in:
Brad King
2024-02-16 14:20:25 +00:00
committed by Kitware Robot
parent 369c69a7ab 363300ace5
commit f8eaf22182
7 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmNinjaTargetGenerator.cxx
View File

@@ -1639,7 +1639,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
// corresponding file path.
std::string ddModmapFile = cmStrCat(objectFileName, ".modmap");
vars["DYNDEP_MODULE_MAP_FILE"] = ddModmapFile;
objBuild.OrderOnlyDeps.push_back(ddModmapFile);
objBuild.ImplicitDeps.push_back(ddModmapFile);
scanningFiles.ModuleMapFile = std::move(ddModmapFile);
}

14
Tests/RunCMake/CXXModules/RunCMakeTest.cmake
View File

@@ -147,6 +147,12 @@ function (run_cxx_module_test directory)
if (NOT RunCMake_CXXModules_NO_TEST)
run_cmake_command("examples/${test_name}-test" "${CMAKE_CTEST_COMMAND}" -C Debug --output-on-failure)
endif ()
if (RunCMake_CXXModules_REBUILD)
execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
include("${RunCMake_TEST_SOURCE_DIR}/pre-rebuild.cmake")
execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
run_cmake_command("examples/${test_name}-rebuild" "${CMAKE_COMMAND}" --build . --config Debug)
endif ()
endfunction ()
function (run_cxx_module_test_target directory target)
@@ -155,6 +161,13 @@ function (run_cxx_module_test_target directory target)
run_cxx_module_test("${directory}" ${ARGN})
endfunction ()
function (run_cxx_module_test_rebuild directory)
set(RunCMake_CXXModules_INSTALL 0)
set(RunCMake_CXXModules_NO_TEST 1)
set(RunCMake_CXXModules_REBUILD 1)
run_cxx_module_test("${directory}" ${ARGN})
endfunction ()
string(REPLACE "," ";" CMake_TEST_MODULE_COMPILATION "${CMake_TEST_MODULE_COMPILATION}")
if (RunCMake_GENERATOR MATCHES "Ninja")
@@ -202,6 +215,7 @@ if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION)
set(RunCMake_CXXModules_NO_TEST 1)
run_cxx_module_test(req-private-other-target)
unset(RunCMake_CXXModules_NO_TEST)
run_cxx_module_test_rebuild(depchain-modmap)
endif ()
# Tests which use named modules in shared libraries.

11
Tests/RunCMake/CXXModules/examples/depchain-modmap-rebuild-check.cmake Normal file
View File

@@ -0,0 +1,11 @@
if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
set(object_path "CMakeFiles/depchain_modmap.dir/Debug/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
else ()
set(object_path "CMakeFiles/depchain_modmap.dir/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
endif ()
set(modmap_path "${object_path}.modmap")
if ("${RunCMake_TEST_BINARY_DIR}/${modmap_path}" IS_NEWER_THAN "${RunCMake_TEST_BINARY_DIR}/${object_path}")
list(APPEND RunCMake_TEST_FAILED
"Object '${object_path}' should have recompiled if '${modmap_path}' changed.")
endif ()

18
Tests/RunCMake/CXXModules/examples/depchain-modmap/CMakeLists.txt Normal file
View File

@@ -0,0 +1,18 @@
cmake_minimum_required(VERSION 3.28)
project(cxx_modules_depchain_modmap CXX)
include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake")
add_executable(depchain_modmap)
target_sources(depchain_modmap
PRIVATE
main.cxx
PRIVATE
FILE_SET CXX_MODULES
BASE_DIRS
"${CMAKE_CURRENT_SOURCE_DIR}"
FILES
importable.cxx)
target_compile_features(depchain_modmap PUBLIC cxx_std_20)
add_test(NAME depchain_modmap COMMAND depchain_modmap)

6
Tests/RunCMake/CXXModules/examples/depchain-modmap/importable.cxx Normal file
View File

@@ -0,0 +1,6 @@
export module importable;
export int from_import()
{
return 0;
}

6
Tests/RunCMake/CXXModules/examples/depchain-modmap/main.cxx Normal file
View File

@@ -0,0 +1,6 @@
import importable;
int main(int argc, char* argv[])
{
return from_import();
}

7
Tests/RunCMake/CXXModules/examples/depchain-modmap/pre-rebuild.cmake Normal file
View File

@@ -0,0 +1,7 @@
if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
set(modmap_path "CMakeFiles/depchain_modmap.dir/Debug/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}.modmap")
else ()
set(modmap_path "CMakeFiles/depchain_modmap.dir/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}.modmap")
endif ()
file(TOUCH_NOCREATE "${RunCMake_TEST_BINARY_DIR}/${modmap_path}")