Skip to content

Commit 78eb3a0

Browse files
committed
Refactor CMake scripts to replace CONFIGURE_COMMAND with CMAKE_ARGS for better clarity and maintainability.
1 parent fcc3413 commit 78eb3a0

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cmake/libenvpp.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ExternalProject_Add(ppc_libenvpp
1515
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
1616
-DCMAKE_CXX_STANDARD_REQUIRED=ON
1717
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
18-
-DFMT_CONSTEVAL=inline
18+
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/libenvpp_toolchain.cmake
1919
BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config ${CMAKE_BUILD_TYPE} --parallel
2020
INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install"
2121
)
@@ -27,10 +27,10 @@ else()
2727
set(PPC_FMT_LIB_NAME fmt)
2828
endif()
2929

30-
if(MSVC)
30+
if(WIN32)
3131
set(PPC_ENVPP_LIB_NAME libenvpp)
3232
else()
3333
set(PPC_ENVPP_LIB_NAME envpp)
34-
endif ()
34+
endif()
3535

3636
add_compile_definitions(FMT_CONSTEVAL=inline)

cmake/libenvpp_toolchain.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# libenvpp_toolchain.cmake
2+
set(CMAKE_CXX_FLAGS_INIT "-DFMT_CONSTEVAL=inline")
3+
set(CMAKE_C_FLAGS_INIT "-DFMT_CONSTEVAL=inline")

0 commit comments

Comments
 (0)