Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ add_subdirectory(src/beman/execution)

#===============================================================================
# NOTE: this must be done before tests! CK
include(./cmake/beman-install-library.cmake)
include(infra/cmake/beman-install-library.cmake)
beman_install_library(${BEMAN_EXECUTION_TARGET_PREFIX} TARGETS ${BEMAN_EXECUTION_TARGET_NAME} ${BEMAN_EXECUTION_TARGET_PREFIX}
DEPENDENCIES Threads
)
Expand Down
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"_debug-base"
],
"cacheVariables": {
"BEMAN_USE_STD_MODULE": false,
"BEMAN_USE_STD_MODULE": true,
"CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-libc++-toolchain.cmake"
},
"environment": {
Expand Down
15 changes: 12 additions & 3 deletions cmake/prelude.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,42 @@ endif()

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})

# gersemi: off
# ---------------------------------------------------------------------------
# The CMAKE_EXPERIMENTAL_CXX_IMPORT_STD is not longer needed except for OSX
# ---------------------------------------------------------------------------
if(NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.3)
if(NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.4)
if(NOT APPLE)
return()
endif()
endif()
# ---------------------------------------------------------------------------

# gersemi: off
# ---------------------------------------------------------------------------
# check if import std; is supported by CMAKE_CXX_COMPILER
# ---------------------------------------------------------------------------
if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.3)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.4)
if(PROJECT_NAME)
message(
WARNING
"This CMake file has to be included before first project() command call!"
)
endif()
endif()

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

# ---------------------------------------------------------------------------
# TODO(CK): Do we need this HACK still for linux too?
# ---------------------------------------------------------------------------
if(NOT APPLE)
return()
endif()
Expand Down
44 changes: 0 additions & 44 deletions etc/ci-clang-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/clang-16-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/clang-17-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/clang-18-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/clang-19-toolchain.cmake

This file was deleted.

41 changes: 0 additions & 41 deletions etc/clang-flags.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/clang-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/gcc-11-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/gcc-12-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/gcc-13-toolchain.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions etc/gcc-14-toolchain.cmake

This file was deleted.

36 changes: 0 additions & 36 deletions etc/gcc-flags.cmake

This file was deleted.

43 changes: 0 additions & 43 deletions etc/gcc-toolchain.cmake

This file was deleted.

44 changes: 0 additions & 44 deletions etc/llvm-16-toolchain.cmake

This file was deleted.

51 changes: 0 additions & 51 deletions etc/llvm-master-toolchain.cmake

This file was deleted.

Loading
Loading