Skip to content

Commit a463a30

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 a463a30

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

cmake/libenvpp.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ ExternalProject_Add(ppc_libenvpp
1212
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
1313
-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
1414
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
15-
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
1615
-DCMAKE_CXX_STANDARD_REQUIRED=ON
1716
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
18-
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/libenvpp_toolchain.cmake
19-
-DCMAKE_CXX_STANDARD=20
17+
-DCMAKE_CXX_FLAGS=-DFMT_CONSTEVAL=inline
2018
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config ${CMAKE_BUILD_TYPE} --parallel
2119
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install"
2220
)
@@ -33,5 +31,3 @@ if(WIN32)
3331
else()
3432
set(PPC_ENVPP_LIB_NAME envpp)
3533
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)