Skip to content

Commit

Permalink
[libc++][modules] Enable installation by default.
Browse files Browse the repository at this point in the history
This was suggested during the review of
#89413

This does not change the experimental state of modules.
  • Loading branch information
mordante committed Apr 28, 2024
1 parent 0a0f1f9 commit facc526
Show file tree
Hide file tree
Showing 15 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion libcxx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ set(LIBCXX_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING
option(LIBCXX_INSTALL_HEADERS "Install the libc++ headers." ON)
option(LIBCXX_INSTALL_LIBRARY "Install the libc++ library." ON)
option(LIBCXX_INSTALL_MODULES
"Install the libc++ C++20 module source files (experimental)." OFF
"Install the libc++ C++20 module source files (experimental)." ON
)
cmake_dependent_option(LIBCXX_INSTALL_STATIC_LIBRARY
"Install the static libc++ library." ON
Expand Down
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-cxx20.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_TEST_PARAMS "std=c++20" CACHE STRING "")
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-cxx23.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_TEST_PARAMS "std=c++23" CACHE STRING "")
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-cxx26.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_TEST_PARAMS "std=c++26" CACHE STRING "")
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-hardening-mode-extensive.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_HARDENING_MODE "extensive" CACHE STRING "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-exceptions.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
set(LIBCXXABI_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-experimental.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_TEST_PARAMS "enable_experimental=False" CACHE STRING "")
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-filesystem.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-localization.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_ENABLE_LOCALIZATION OFF CACHE BOOL "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-random_device.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_ENABLE_RANDOM_DEVICE OFF CACHE BOOL "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-threads.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_ENABLE_THREADS OFF CACHE BOOL "")
set(LIBCXXABI_ENABLE_THREADS OFF CACHE BOOL "")
set(LIBCXX_ENABLE_MONOTONIC_CLOCK OFF CACHE BOOL "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-unicode.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_ENABLE_UNICODE OFF CACHE BOOL "")
1 change: 0 additions & 1 deletion libcxx/cmake/caches/Generic-no-wide-characters.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
set(LIBCXX_INSTALL_MODULES ON CACHE BOOL "") # TODO MODULES Remove when enabled automatically.
set(LIBCXX_ENABLE_WIDE_CHARACTERS OFF CACHE BOOL "")
2 changes: 1 addition & 1 deletion libcxx/docs/BuildingLibcxx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ libc++ specific options

.. option:: LIBCXX_INSTALL_MODULES:BOOL

**Default**: ``OFF``
**Default**: ``ON``

Toggle the installation of the experimental libc++ module sources.

Expand Down
2 changes: 2 additions & 0 deletions libcxx/docs/ReleaseNotes/19.rst
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,5 @@ Build System Changes

- The Cmake variable ``LIBCXX_ENABLE_CLANG_TIDY`` has been removed. The build system has been changed
to automatically detect the presence of ``clang-tidy`` and the required ``Clang`` libraries.

- The CMake options ``LIBCXX_INSTALL_MODULES`` now defaults to ``ON``.

0 comments on commit facc526

Please sign in to comment.