File tree Expand file tree Collapse file tree 5 files changed +3
-11
lines changed Expand file tree Collapse file tree 5 files changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ sure you don't forget anything:
156
156
- Did you add all new named declarations to the ``std `` module?
157
157
- If you added a header:
158
158
159
- - Did you add it to ``include/module.modulemap.in ``?
159
+ - Did you add it to ``include/module.modulemap ``?
160
160
- Did you add it to ``include/CMakeLists.txt ``?
161
161
- If it's a public header, did you update ``utils/libcxx/header_information.py ``?
162
162
Original file line number Diff line number Diff line change @@ -968,6 +968,7 @@ set(files
968
968
mdspan
969
969
memory
970
970
memory_resource
971
+ module.modulemap
971
972
mutex
972
973
new
973
974
numbers
@@ -1021,18 +1022,10 @@ set(files
1021
1022
wctype.h
1022
1023
)
1023
1024
1024
- foreach (feature LIBCXX_ENABLE_FILESYSTEM LIBCXX_ENABLE_LOCALIZATION LIBCXX_ENABLE_THREADS LIBCXX_ENABLE_WIDE_CHARACTERS )
1025
- if (NOT ${${feature}} )
1026
- set (requires_${feature} "requires LIBCXX_CONFIGURED_WITHOUT_SUPPORT_FOR_THIS_HEADER" )
1027
- endif ()
1028
- endforeach ()
1029
-
1030
1025
configure_file ("__config_site.in" "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR} /__config_site" @ONLY )
1031
- configure_file ("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR} /module.modulemap" @ONLY )
1032
1026
configure_file ("${LIBCXX_ASSERTION_HANDLER_FILE} " "${LIBCXX_GENERATED_INCLUDE_DIR} /__assertion_handler" COPYONLY )
1033
1027
1034
1028
set (_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR} /__config_site"
1035
- "${LIBCXX_GENERATED_INCLUDE_DIR} /module.modulemap"
1036
1029
"${LIBCXX_GENERATED_INCLUDE_DIR} /__assertion_handler" )
1037
1030
foreach (f ${files} )
1038
1031
set (src "${CMAKE_CURRENT_SOURCE_DIR} /${f} " )
File renamed without changes.
Original file line number Diff line number Diff line change 11
11
def exclude_from_consideration (path ):
12
12
return (
13
13
path .endswith (".txt" )
14
- or path .endswith (".modulemap.in " )
14
+ or path .endswith (".modulemap" )
15
15
or os .path .basename (path ) == "__config"
16
16
or os .path .basename (path ) == "__config_site.in"
17
17
or os .path .basename (path ) == "libcxx.imp"
Original file line number Diff line number Diff line change 155
155
def is_header (file ):
156
156
"""Returns whether the given file is a header (i.e. not a directory or the modulemap file)."""
157
157
return not file .is_dir () and not file .name in [
158
- "module.modulemap.in" ,
159
158
"module.modulemap" ,
160
159
"CMakeLists.txt" ,
161
160
"libcxx.imp" ,
You can’t perform that action at this time.
0 commit comments