File tree 4 files changed +8
-9
lines changed
4 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -428,7 +428,7 @@ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE STRING
428
428
"Path where target-agnostic libc++ headers should be installed." )
429
429
set (LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR} " CACHE STRING
430
430
"Path where built libc++ runtime libraries should be installed." )
431
- set (LIBCXX_INSTALL_MODULE_DIR "${CMAKE_INSTALL_INCLUDEDIR} /../modules/c ++/v1" CACHE STRING
431
+ set (LIBCXX_INSTALL_MODULE_DIR "usr/share/libc ++/v1" CACHE STRING
432
432
"Path where target-agnostic libc++ modules should be installed." )
433
433
434
434
set (LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared libc++ runtime library." )
Original file line number Diff line number Diff line change @@ -215,11 +215,11 @@ add_custom_target(generate-cxx-modules
215
215
# file. This allows moving the entire installation to a different to a
216
216
# different location.
217
217
file (RELATIVE_PATH LIBCXX_MODULE_RELATIVE_PATH
218
- ${CMAKE_INSTALL_PREFIX} /${LIBCXX_INSTALL_LIBRARY_DIR}
219
- ${CMAKE_INSTALL_PREFIX} /${LIBCXX_INSTALL_MODULE_DIR} )
218
+ ${CMAKE_INSTALL_PREFIX} /${LIBCXX_INSTALL_LIBRARY_DIR}
219
+ ${CMAKE_INSTALL_PREFIX} /${LIBCXX_INSTALL_MODULE_DIR} )
220
220
configure_file (
221
221
"modules.json.in"
222
- "${LIBCXX_LIBRARY_DIR} /modules.json"
222
+ "${LIBCXX_LIBRARY_DIR} /libc++. modules.json"
223
223
@ONLY
224
224
)
225
225
@@ -248,7 +248,7 @@ if (LIBCXX_INSTALL_MODULES)
248
248
249
249
# Install the module manifest.
250
250
install (FILES
251
- "${LIBCXX_LIBRARY_DIR} /modules.json"
251
+ "${LIBCXX_LIBRARY_DIR} /libc++. modules.json"
252
252
DESTINATION "${LIBCXX_INSTALL_LIBRARY_DIR} "
253
253
COMPONENT cxx-modules
254
254
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
Original file line number Diff line number Diff line change 8
8
"is-standard-library": true,
9
9
"local-arguments": {
10
10
"system-include-directories": [
11
- "@LIBCXX_MODULE_RELATIVE_PATH@/std "
11
+ "@LIBCXX_MODULE_RELATIVE_PATH@"
12
12
]
13
13
}
14
14
},
18
18
"is-std-library": true,
19
19
"local-arguments": {
20
20
"system-include-directories": [
21
- "@LIBCXX_MODULE_RELATIVE_PATH@/std",
22
- "@LIBCXX_MODULE_RELATIVE_PATH@/std.compat"
21
+ "@LIBCXX_MODULE_RELATIVE_PATH@"
23
22
]
24
23
}
25
24
}
Original file line number Diff line number Diff line change @@ -397,7 +397,7 @@ if (NOT CMAKE_CONFIGURATION_TYPES)
397
397
if (LIBCXX_INSTALL_HEADERS)
398
398
set (header_install_target install -cxx-headers)
399
399
endif ()
400
- if (LIBCXX_INSTALL_MODULES)
400
+ if (LIBCXX_INSTALL_MODULES)
401
401
set (header_install_target install -cxx-modules)
402
402
endif ()
403
403
add_custom_target (install -cxx
You can’t perform that action at this time.
0 commit comments