From 608fb15d40d7957bd8123994c3e4b081f4b0ea61 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 25 Sep 2022 12:18:05 +0200 Subject: [PATCH] CMske: move define 'BOOST_NO_CXX98_FUNCTION_BASE' to CompilerChecksAndSetups macro and support CMake < 3.12 --- cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake | 3 +++ cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake index 313165fe52..d4ac3ca4f7 100644 --- a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake +++ b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake @@ -100,4 +100,7 @@ macro(CompilerChecksAndSetups) add_definitions(-DBOOST_PP_VARIADICS=1) message(STATUS "Force BOOST_PP_VARIADICS=1 for clang") endif() + + add_definitions(-DBOOST_NO_CXX98_FUNCTION_BASE) + endmacro(CompilerChecksAndSetups) diff --git a/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake b/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake index 834d2a7206..708bad0697 100644 --- a/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake +++ b/cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake @@ -34,7 +34,4 @@ macro(ConfigureCMakeVariables) message(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}") message(STATUS "libdir: ${CMAKE_INSTALL_LIBDIR}") message(STATUS "cmake: ${CMAKE_VERSION}") - - add_compile_definitions(BOOST_NO_CXX98_FUNCTION_BASE) - endmacro(ConfigureCMakeVariables)