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
16 changes: 11 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# gersemi: on

cmake_minimum_required(VERSION 3.30...4.4)
cmake_minimum_required(VERSION 3.30...4.5)

include(./cmake/prelude.cmake)

Expand Down Expand Up @@ -69,14 +69,20 @@ else()
endif()

if(BEMAN_USE_MODULES AND BEMAN_HAS_IMPORT_STD)
if(
CMAKE_CXX_STDLIB_MODULES_JSON
AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.5.0"
)
else()
set_target_properties(
${BEMAN_EXECUTION_TARGET_PREFIX}
PROPERTIES CXX_MODULE_STD ON
)
endif()
target_compile_definitions(
${BEMAN_EXECUTION_TARGET_PREFIX}
PUBLIC BEMAN_HAS_IMPORT_STD
)
set_target_properties(
${BEMAN_EXECUTION_TARGET_PREFIX}
PROPERTIES CXX_MODULE_STD ON
)
elseif(BEMAN_USE_MODULES)
message(WARNING "Missing or disabled support for CMAKE_CXX_MODULE_STD!")
endif()
Expand Down
13 changes: 8 additions & 5 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ MAKEFLAGS+= --warn-undefined-variables # Warn when an undefined variable is ref
##################################################

ifeq ($(origin CXX),default)
CXX:= clang++-23
CC:= clang-23
export CXX:= clang++-23
export CC:= clang-23
export CXXFLAGS:= -stdlib=libc++ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
endif

PRESET?=release
IMAGE?=ghcr.io/bemanproject/infra-containers-clang:latest
IMAGE?=ghcr.io/bemanproject/infra-containers-clang:23

_build_path:=build/$(PRESET)

Expand All @@ -24,6 +25,7 @@ all: .init compile_commands.json ## Make all with cmake workflow preset
cmake --workflow --preset $(PRESET)

.init: CMakeUserPresets.json CMakePresets.json CMakeLists.txt ## Configure cmake preset in VERBOSE mode
cmake --version
cmake --preset $(PRESET) --fresh --log-level=VERBOSE
touch $@

Expand All @@ -37,7 +39,7 @@ compile_commands.json: $(_build_path)/compile_commands.json
fi

CMakeUserPresets.json:: cmake/CMakeUserPresets.json
ln -fs $< $@
-ln -fs $< $@

distclean: ## Remove all build artifacts
rm -rf build .cache
Expand All @@ -51,7 +53,7 @@ format: distclean ## Format all files with pre-commit
pre-commit run --all

dockerbuild: ## Start docker image interactive
docker run -it -v $(CURDIR):/home/builder/workdir $(IMAGE)
docker run -it -v $(CURDIR):/src $(IMAGE)

# Helper targets
.PHONY: env info
Expand All @@ -66,6 +68,7 @@ info: ## Show this help.
# Prerequisite 'GNUmakefile' is newer than target '.init'.
# -> Must remake target '.init'.
# NOTE: impizit handled by gmake! GNUmakefile :: ;
# NO if exists TODO(CK): cmake/CMakeUserPresets.json :: ;

# Anything we don't know how to build will use this rule.
% ::
Expand Down
43 changes: 25 additions & 18 deletions cmake/cxx-modules-rules.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -109,26 +109,33 @@ if(CMAKE_CXX_STANDARD GREATER_EQUAL 23)
endif()

if(BEMAN_USE_MODULES AND BEMAN_USE_STD_MODULE)
# -------------------------------------------------------------------------
# Tell CMake that we explicitly want `import std`.
# This will initialize the property on all targets declared after this to 1
# -------------------------------------------------------------------------
message(
STATUS
"CMAKE_CXX_COMPILER_IMPORT_STD=${CMAKE_CXX_COMPILER_IMPORT_STD}"
if(
CMAKE_CXX_STDLIB_MODULES_JSON
AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.5.0"
)
if(${CMAKE_CXX_STANDARD} IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
set(CMAKE_CXX_MODULE_STD ON)
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
option(
BEMAN_HAS_IMPORT_STD
"Build with import std; is possible and used!"
${CMAKE_CXX_MODULE_STD}
)
message(STATUS "CMAKE_CXX_MODULE_STD=${CMAKE_CXX_MODULE_STD}")
set(BEMAN_HAS_IMPORT_STD ON)
else()
set(CMAKE_CXX_MODULE_STD OFF)
message(WARNING "CMAKE_CXX_MODULE_STD=${CMAKE_CXX_MODULE_STD}")
# -------------------------------------------------------------------------
# Tell CMake that we explicitly want `import std`.
# This will initialize the property on all targets declared after this to 1
# -------------------------------------------------------------------------
message(
STATUS
"CMAKE_CXX_COMPILER_IMPORT_STD=${CMAKE_CXX_COMPILER_IMPORT_STD}"
)
if(${CMAKE_CXX_STANDARD} IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
set(CMAKE_CXX_MODULE_STD ON)
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
option(
BEMAN_HAS_IMPORT_STD
"Build with import std; is possible and used!"
${CMAKE_CXX_MODULE_STD}
)
message(STATUS "CMAKE_CXX_MODULE_STD=${CMAKE_CXX_MODULE_STD}")
else()
set(CMAKE_CXX_MODULE_STD OFF)
message(WARNING "CMAKE_CXX_MODULE_STD=${CMAKE_CXX_MODULE_STD}")
endif()
endif()
message(STATUS "BEMAN_HAS_IMPORT_STD=${BEMAN_HAS_IMPORT_STD}")
endif()
Expand Down
Loading