Skip to content

Commit 09d5a5c

Browse files
authored
Delete not longer needed etc subdirectory (#240)
* Delete not longer needed etc subdirectory beman-submodule update ... * Quickfix: disable import std; for llmv Release build
1 parent ff9cbc8 commit 09d5a5c

25 files changed

+44
-594
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ add_subdirectory(src/beman/execution)
108108

109109
#===============================================================================
110110
# NOTE: this must be done before tests! CK
111-
include(./cmake/beman-install-library.cmake)
111+
include(infra/cmake/beman-install-library.cmake)
112112
beman_install_library(${BEMAN_EXECUTION_TARGET_PREFIX} TARGETS ${BEMAN_EXECUTION_TARGET_NAME} ${BEMAN_EXECUTION_TARGET_PREFIX}
113113
DEPENDENCIES Threads
114114
)

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"_debug-base"
7575
],
7676
"cacheVariables": {
77-
"BEMAN_USE_STD_MODULE": false,
77+
"BEMAN_USE_STD_MODULE": true,
7878
"CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-libc++-toolchain.cmake"
7979
},
8080
"environment": {

cmake/prelude.cmake

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,42 @@ endif()
1717

1818
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
1919

20+
# gersemi: off
2021
# ---------------------------------------------------------------------------
2122
# The CMAKE_EXPERIMENTAL_CXX_IMPORT_STD is not longer needed except for OSX
2223
# ---------------------------------------------------------------------------
23-
if(NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.3)
24+
if(NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.4)
2425
if(NOT APPLE)
2526
return()
2627
endif()
2728
endif()
2829
# ---------------------------------------------------------------------------
2930

30-
# gersemi: off
3131
# ---------------------------------------------------------------------------
3232
# check if import std; is supported by CMAKE_CXX_COMPILER
3333
# ---------------------------------------------------------------------------
34-
if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.3)
34+
if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.4)
3535
if(PROJECT_NAME)
3636
message(
3737
WARNING
3838
"This CMake file has to be included before first project() command call!"
3939
)
4040
endif()
41+
endif()
4142

43+
# ---------------------------------------------------------------------------
44+
# check if import std; is supported by CMAKE_CXX_COMPILER
45+
# ---------------------------------------------------------------------------
46+
if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.3 AND CMAKE_VERSION VERSION_LESS 4.4)
47+
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "451f2fe2-a8a2-47c3-bc32-94786d8fc91b")
48+
elseif(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.3)
4249
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "d0edc3af-4c50-42ea-a356-e2862fe7a444")
4350
endif()
4451
# gersemi: on
4552

53+
# ---------------------------------------------------------------------------
4654
# TODO(CK): Do we need this HACK still for linux too?
55+
# ---------------------------------------------------------------------------
4756
if(NOT APPLE)
4857
return()
4958
endif()

etc/ci-clang-toolchain.cmake

Lines changed: 0 additions & 44 deletions
This file was deleted.

etc/clang-16-toolchain.cmake

Lines changed: 0 additions & 6 deletions
This file was deleted.

etc/clang-17-toolchain.cmake

Lines changed: 0 additions & 6 deletions
This file was deleted.

etc/clang-18-toolchain.cmake

Lines changed: 0 additions & 6 deletions
This file was deleted.

etc/clang-19-toolchain.cmake

Lines changed: 0 additions & 6 deletions
This file was deleted.

etc/clang-flags.cmake

Lines changed: 0 additions & 41 deletions
This file was deleted.

etc/clang-toolchain.cmake

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)