File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed
Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change 11include_directories (${CMAKE_SOURCE_DIR} /3rdparty/libenvpp/include )
22include_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+
410include (ExternalProject)
511ExternalProject_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)
3337else ()
3438 set (PPC_ENVPP_LIB_NAME envpp)
3539endif ()
36-
37- add_compile_definitions (FMT_CONSTEVAL=inline)
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments