Skip to content

Commit 68f6b42

Browse files
committed
Remove redundant libenvpp_toolchain.cmake and inline FMT_CONSTEVAL definitions directly in libenvpp.cmake. Simplify and clean up CMake configuration.
1 parent 4136a79 commit 68f6b42

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

cmake/libenvpp.cmake

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/include)
22
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/external/fmt/include)
33

4+
if(WIN32)
5+
set(PPC_FMT_DISABLE_CONSTEVAL "/DFMT_CONSTEVAL=inline")
6+
else()
7+
set(PPC_FMT_DISABLE_CONSTEVAL "-DFMT_CONSTEVAL=inline")
8+
endif()
9+
410
include(ExternalProject)
511
ExternalProject_Add(ppc_libenvpp
612
SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/libenvpp"
@@ -12,11 +18,9 @@ ExternalProject_Add(ppc_libenvpp
1218
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
1319
-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
1420
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
15-
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
1621
-DCMAKE_CXX_STANDARD_REQUIRED=ON
1722
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
18-
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/libenvpp_toolchain.cmake
19-
-DCMAKE_CXX_STANDARD=20
23+
-DCMAKE_CXX_FLAGS=${PPC_FMT_DISABLE_CONSTEVAL}
2024
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config ${CMAKE_BUILD_TYPE} --parallel
2125
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install"
2226
)
@@ -33,5 +37,3 @@ if(WIN32)
3337
else()
3438
set(PPC_ENVPP_LIB_NAME envpp)
3539
endif()
36-
37-
add_compile_definitions(FMT_CONSTEVAL=inline)

cmake/libenvpp_toolchain.cmake

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

0 commit comments

Comments
 (0)