diff --git a/cmake/modules/RoottestCTest.cmake b/cmake/modules/RoottestCTest.cmake index 33c6d59592..a2cdd9d92b 100644 --- a/cmake/modules/RoottestCTest.cmake +++ b/cmake/modules/RoottestCTest.cmake @@ -66,6 +66,10 @@ if(APPLE) set(ROOTTEST_OS_VERSION ${osvers}) elseif(WIN32) set(ROOTTEST_OS_ID Windows) +elseif(${CMAKE_SYSTEM} MATCHES FreeBSD) + execute_process(COMMAND freebsd-version OUTPUT_VARIABLE osvers OUTPUT_STRIP_TRAILING_WHITESPACE) + set(ROOTTEST_OS_ID FreeBSD) + set(ROOTTEST_OS_VERSION ${osvers}) else() execute_process(COMMAND lsb_release -is OUTPUT_VARIABLE osid OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND lsb_release -rs OUTPUT_VARIABLE osvers OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/cmake/modules/RoottestMacros.cmake b/cmake/modules/RoottestMacros.cmake index b3446ab0ac..8ade9d5477 100644 --- a/cmake/modules/RoottestMacros.cmake +++ b/cmake/modules/RoottestMacros.cmake @@ -198,6 +198,7 @@ macro(ROOTTEST_COMPILE_MACRO filename) -e "gROOT->SetMacroPath(\"${CMAKE_CURRENT_SOURCE_DIR}\")" -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")" -e "gSystem->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")" + -e "gSystem->AddIncludePath(\"-I/usr/local/include\")" ${RootMacroDirDefines}) set(root_compile_macro ${ROOT_root_CMD} ${RootMacroBuildDefines} -q -l -b) @@ -588,6 +589,7 @@ macro(ROOTTEST_SETUP_MACROTEST) -e "gROOT->SetMacroPath(\"${CMAKE_CURRENT_SOURCE_DIR}\")" -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")" -e "gSystem->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")" + -e "gSystem->AddIncludePath(\"-I/usr/local/include\")" ${RootExternalIncludes} ${RootExeOptions} -q -l -b)