Skip to content

Refactory cmake code #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ClausKlein wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Refactory cmake code #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 7 additions & 67 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,6 @@ cmake_minimum_required(VERSION 3.30...4.3)

include(cmake/prelude.cmake)

option(
CMAKE_CXX_SCAN_FOR_MODULES
"Whether to scan C++ source files for module dependencies"
ON
)
option(BUILD_SHARED_LIBS "Build using shared libraries" NO)

# Set experimental flag to enable `import std` support from CMake.
# This must be enabled before C++ language support.
if(CMAKE_CXX_SCAN_FOR_MODULES)
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
"d0edc3af-4c50-42ea-a356-e2862fe7a444"
)
endif()

#==================================================
project(
fmt
Expand All @@ -28,70 +13,25 @@ project(
)
#==================================================

include(cmake/variables.cmake)
include(cmake/cxx-modules-rules.cmake)

set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_EXTENSIONS ON)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
option(BUILD_SHARED_LIBS "Build using shared libraries" NO)

set(CMAKE_DEBUG_POSTFIX D)
set(CMAKE_SKIP_TEST_ALL_DEPENDENCY OFF)
include(cmake/variables.cmake)

# FIXME: to prevent -Winclude-angled-in-module-purview in fmt/os.h
# see /Users/clausklein/.cache/CPM/fmt/6226dc0d560c5dca8bcd81db09f7e2752ccb8cef/include/fmt/os.h:33
set(CPPdefinitions FMT_USE_FCNTL=0)

option(FMT_SEPARATE_COMPILATION "build fmt lib too" ${PROJECT_IS_TOP_LEVEL})
option(
FMT_USE_MODULES
"Export a CXX_MODULE fmt if possible"
${CMAKE_CXX_SCAN_FOR_MODULES}
)
option(FMT_IMPORT_STD "Import the module std" ${FMT_USE_MODULES})

#XXX option(FMT_USE_MODULES "Export a CXX_MODULE fmt if possible" ${CMAKE_CXX_SCAN_FOR_MODULES})
option(FMT_IMPORT_STD "Import the module std" ${CMAKE_CXX_MODULE_STD})

if(CMAKE_GENERATOR STREQUAL "Ninja" AND FMT_USE_MODULES)
list(APPEND CPPdefinitions FMT_MODULE)
# FIXME: NO! list(APPEND CPPdefinitions FMT_ATTACH_TO_GLOBAL_MODULE)

if(
CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0
)
if(APPLE)
execute_process(
OUTPUT_VARIABLE LLVM_PREFIX
COMMAND brew --prefix llvm
COMMAND_ECHO STDOUT
)
string(STRIP ${LLVM_PREFIX} LLVM_PREFIX)
elseif(LINUX)
set(LLVM_PREFIX $ENV{LLVM_DIR})
endif()

# # /usr/local/opt/llvm/share/libc++/v1/std.cppm
# # or /usr/lib/llvm-19/share/libc++/v1/std.cppm
# set(LLVM_LIBC_SOURCE ${LLVM_PREFIX}/share/libc++/v1 CACHE PATH "")
# file(REAL_PATH ${LLVM_PREFIX} LLVM_DIR)
# set(LLVM_DIR ${LLVM_DIR} CACHE PATH "")
# message(STATUS "LLVM_DIR=${LLVM_DIR}")

# add_compile_options(-fexperimental-library)
# add_link_options(-L${LLVM_DIR}/lib/c++ -lc++experimental)
add_compile_options(-stdlib=libc++)
add_link_options(-stdlib=libc++)
elseif(
CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0
)
add_compile_options(-stdlib=libstdc++)
add_link_options(-stdlib=libstdc++)
endif()

# Tell CMake that we explicitly want `import std`.
# This will initialize the property on all targets declared after this to 1
if(${CMAKE_CXX_STANDARD} IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
set(CMAKE_CXX_MODULE_STD ON)
endif()

if(CMAKE_CXX_MODULE_STD)
list(APPEND CPPdefinitions FMT_IMPORT_STD)
endif()
Expand Down
13 changes: 7 additions & 6 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ MAKEFLAGS+= --no-builtin-rules # Disable the built-in implicit rules.
export hostSystemName=$(shell uname)

ifeq (${hostSystemName},Darwin)
export LLVM_PREFIX=$(shell brew --prefix llvm)
export LLVM_DIR=$(shell realpath ${LLVM_PREFIX})
export LLVM_PREFIX:=$(shell brew --prefix llvm)
export LLVM_DIR:=$(shell realpath ${LLVM_PREFIX})
export PATH:=${LLVM_DIR}/bin:${PATH}

export CMAKE_CXX_STDLIB_MODULES_JSON=${LLVM_DIR}/lib/c++/libc++.modules.json
Expand All @@ -19,8 +19,8 @@ ifeq (${hostSystemName},Darwin)
export GCOV="llvm-cov gcov"

### TODO: to test g++-15:
export GCC_PREFIX=$(shell brew --prefix gcc)
export GCC_DIR=$(shell realpath ${GCC_PREFIX})
export GCC_PREFIX:=$(shell brew --prefix gcc)
export GCC_DIR:=$(shell realpath ${GCC_PREFIX})

# export CMAKE_CXX_STDLIB_MODULES_JSON=${GCC_DIR}/lib/gcc/current/libstdc++.modules.json
# export CXX:=g++-15
Expand Down Expand Up @@ -55,7 +55,7 @@ example:

.init: requirements.txt .CMakeUserPresets.json CMakeLists.txt GNUmakefile
perl -p -e 's/<hostSystemName>/${hostSystemName}/;' .CMakeUserPresets.json > CMakeUserPresets.json
-pip3 install --user --upgrade -r requirements.txt
-pip3 install --upgrade -r requirements.txt
cmake --preset dev --fresh --log-level=VERBOSE
ln -sf build/dev/compile_commands.json .
touch .init
Expand All @@ -68,7 +68,8 @@ format:
pre-commit run --all

distclean: clean
rm -rf stagedir .init CMakeUserPresets.json tags
rm -rf stagedir .init CMakeUserPresets.json tags compile_commands.json
find . -name '*~' -delete
# XXX NO! git clean -xdf

GNUmakefile :: ;
Expand Down
155 changes: 155 additions & 0 deletions cmake/cxx-modules-rules.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#
# A CMake language file to be included as the last step of all project() command calls.
# This file must be included/used as CMAKE_PROJECT_INCLUDE -> after project()
#

# ---- The include guard applies within the current directory and below ----
include_guard(DIRECTORY)

if(NOT PROJECT_NAME)
message(
FATAL_ERROR
"This CMake file has to be included as the last step of all project() command calls!"
)
endif()

# Use modules? default NO!
if(NOT DEFINED CMAKE_CXX_SCAN_FOR_MODULES)
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
endif()

# Control whether the test target depends on the all target.
set(CMAKE_SKIP_TEST_ALL_DEPENDENCY OFF)

# gersemi: off
option(CMAKE_EXPORT_COMPILE_COMMANDS "Prepare run-clang-tidy" ${PROJECT_IS_TOP_LEVEL})
if(CMAKE_EXPORT_COMPILE_COMMANDS)
message(
STATUS
"CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}"
)
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
endif()
# gersemi: on

# Ensure non-empty default build type for single-config
get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(NOT isMultiConfig)
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type")
endif()
set(CMAKE_DEBUG_POSTFIX _d)

# ------------------------------------------------------------------------------
# This property setting also needs to be consistent between the installed shared
# library and its consumer, otherwise most toolchains will once again reject the
# consumer's generated BMI.
# ------------------------------------------------------------------------------
if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 23)
endif()

# Neither of these two are technically needed, but they make the expectation clear
set(CMAKE_CXX_EXTENSIONS ON)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

# NOTE: only with Ninja generator install of bmi files works yet!
if(CMAKE_GENERATOR MATCHES "Ninja")
if(
CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0
)
set(CMAKE_CXX_SCAN_FOR_MODULES ON)

if(NOT LINUX)
string(APPEND CMAKE_CXX_MODULE_MAP_FLAG " -fmodules-reduced-bmi")
endif()

add_compile_options($ENV{CXXFLAGS})
add_link_options($ENV{CXXFLAGS})
elseif(
CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0
)
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
else()
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
endif()
endif()

if(CMAKE_CXX_STDLIB_MODULES_JSON)
message(
STATUS
"CMAKE_CXX_STDLIB_MODULES_JSON=${CMAKE_CXX_STDLIB_MODULES_JSON}"
)
endif()

if(NOT DEFINED CMAKE_CXX_MODULE_STD)
set(CMAKE_CXX_MODULE_STD OFF)
endif()

if(CMAKE_CXX_STANDARD GREATER_EQUAL 20)
option(FMT_USE_MODULES "Build CXX_MODULES" ${CMAKE_CXX_SCAN_FOR_MODULES})
endif()
message(STATUS "FMT_USE_MODULES=${FMT_USE_MODULES}")

option(
FMT_USE_STD_MODULE
"Check if 'import std;' is possible with the toolchain?"
ON
)
message(STATUS "FMT_USE_STD_MODULE=${FMT_USE_STD_MODULE}")

if(FMT_USE_MODULES AND FMT_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_STANDARD} IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
set(CMAKE_CXX_MODULE_STD ON)
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
option(
FMT_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()
message(STATUS "FMT_HAS_IMPORT_STD=${FMT_HAS_IMPORT_STD}")
endif()

if(NOT FMT_USE_MODULES)
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
endif()
message(STATUS "CMAKE_CXX_SCAN_FOR_MODULES=${CMAKE_CXX_SCAN_FOR_MODULES}")

# ------------------------------------------------------------------------------
# Avoid creating CMAKE_..._OUTPUT_DIRECTORY as cache variables, they should not
# be under the control of the developer. They should be controlled by the
# project because parts of the project may make assumptions about the relative
# layout of the binaries. More importantly, leaving them as ordinary variables
# also means they can be unset within subdirectories where test executables are
# defined, allowing them to avoid being collected with the other main binaries
# and cluttering up that area.
# ------------------------------------------------------------------------------
set(stageDir ${CMAKE_CURRENT_BINARY_DIR}/stagedir)
include(GNUInstallDirs)

if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${stageDir}/${CMAKE_INSTALL_BINDIR})
endif()
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${stageDir}/${CMAKE_INSTALL_LIBDIR})
endif()
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${stageDir}/${CMAKE_INSTALL_LIBDIR})
endif()
Loading
Loading