Skip to content

Copy the stl.cppmap modulemap now during configuration time. #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vgvassilev merged 1 commit into from
Mar 17, 2017
Merged

Copy the stl.cppmap modulemap now during configuration time. #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Copy the stl.cppmap modulemap now during configuration time. 
The current builds fail because without a valid modulemap the setresuid test
failed during configuration time.
  • Loading branch information
@Teemperor
Teemperor committed Mar 15, 2017
commit e7738cb0c8ee68f465062007a4c1aec94ab6501d
7 changes: 1 addition & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,7 @@ if(cxxmodules)

configure_file(${CMAKE_SOURCE_DIR}/build/unix/modulemap.overlay.yaml.in ${CMAKE_BINARY_DIR}/include/modulemap.overlay.yaml @ONLY)

add_custom_target(copystlmodulemap
DEPENDS build/unix/module.modulemap
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/unix/stl.cppmap ${CMAKE_BINARY_DIR}/include/stl.cppmap
)

add_dependencies(copymodulemap copystlmodulemap)
configure_file(${CMAKE_SOURCE_DIR}/build/unix/stl.cppmap ${CMAKE_BINARY_DIR}/include/stl.cppmap)
endif()

# These vars are useful when we want to compile things without cxxmodules.
Expand Down