Skip to content
Snippets Groups Projects
Commit a8b7cad5 authored by Administrator's avatar Administrator
Browse files

Fix several CMake warnings

The exec_program fuction is deprecated use execute_process instead.
Use the FindBoost config file which is installed by Boost instead of the CMake
module.
Fix one cmake_minimum_required version by defining also a maximum version.
parent 08ed1568
No related branches found
No related tags found
1 merge request!2062Fix several CMake warnings
Pipeline #33470 passed
......@@ -142,7 +142,9 @@ endif()
#Searching for Boost Package
find_package(Boost COMPONENTS serialization regex filesystem log log_setup container program_options thread iostreams system)
find_package(Boost CONFIG
COMPONENTS serialization regex filesystem log log_setup container program_options thread iostreams system
)
if(Boost_FOUND)
list(APPEND packages Boost)
endif()
......@@ -246,7 +248,7 @@ If(DEFINED ENV{OMP_NUM_THREADS} )
endif()
set(CBMLIBDIR ${CMAKE_BINARY_DIR}/lib)
set(LD_LIBRARY_PATH ${CBMLIBDIR} ${Boost_LIBRARY_DIRS} ${LD_LIBRARY_PATH} ${FAIRROOT_LIBRARY_DIR})
set(LD_LIBRARY_PATH ${CBMLIBDIR} ${SIMPATH}/lib ${LD_LIBRARY_PATH} ${FAIRROOT_LIBRARY_DIR})
set(ROOT_INCLUDE_PATH ${FAIRROOT_INCLUDE_DIR})
# Recurse into the given subdirectories. This does not actually
......
......@@ -187,7 +187,10 @@ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
if (CMAKE_SYSTEM_NAME MATCHES Darwin)
EXEC_PROGRAM("sw_vers -productVersion | cut -d . -f 1-2" OUTPUT_VARIABLE MAC_OS_VERSION)
execute_process(COMMAND sw_vers -productVersion
COMMAND cut -d . -f 1-2
OUTPUT_VARIABLE MAC_OS_VERSION
)
MESSAGE("-- Found a Mac OS X System ${MAC_OS_VERSION}")
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
MESSAGE("-- Found GNU compiler collection")
......
# Distributed under the OSI-approved MIT License. See accompanying
# file LICENSE or https://github.com/Crascit/DownloadProject for details.
cmake_minimum_required(VERSION 2.8.2)
cmake_minimum_required(VERSION 2.8.2...3.31)
project(${DL_ARGS_PROJ}-download NONE)
......
......@@ -278,8 +278,9 @@ MACRO (GENERATE_TEST_SCRIPT SCRIPT_FULL_NAME)
Write_Geant4Data_Variables_sh()
configure_file(${PROJECT_SOURCE_DIR}/cmake/scripts/set_env.sh.in
${new_path}/${shell_script_name}
# FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ WORLD_READ
)
EXEC_PROGRAM(/bin/chmod ARGS "u+x ${new_path}/${shell_script_name}" OUTPUT_VARIABLE tmp)
execute_process(COMMAND /bin/chmod u+x ${new_path}/${shell_script_name})
ENDMACRO (GENERATE_TEST_SCRIPT)
################################################################################
......@@ -299,7 +300,6 @@ Macro(Generate_Exe_Script _Path _ExeName)
set(new_path ${_Path})
endif()
# Message("PATH: ${_Path}")
# Message("ExeName: ${_ExeName}")
# Message("shell_script_name: ${shell_script_name}")
......@@ -308,10 +308,10 @@ Macro(Generate_Exe_Script _Path _ExeName)
set(my_exe_name ${EXECUTABLE_OUTPUT_PATH}/${_ExeName})
Write_Geant4Data_Variables_sh()
configure_file(${PROJECT_SOURCE_DIR}/cmake/scripts/run_binary.sh.in
${new_path}/${shell_script_name}
)
EXEC_PROGRAM(/bin/chmod ARGS "u+x ${new_path}/${shell_script_name}" OUTPUT_VARIABLE tmp )
${new_path}/${shell_script_name}
# FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ WORLD_READ
)
execute_process(COMMAND /bin/chmod u+x ${new_path}/${shell_script_name})
EndMacro(Generate_Exe_Script)
################################################################################
......
......@@ -9,11 +9,15 @@
# the project is compiled.
If(CMAKE_SYSTEM_NAME MATCHES Linux)
Exec_Program(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
execute_process(COMMAND cat /proc/cpuinfo
OUTPUT_VARIABLE CPUINFO
)
String(REGEX REPLACE "^.*(sse).*$" "\\1" SSE_THERE "${CPUINFO}")
String(COMPARE EQUAL "sse" "${SSE_THERE}" SSE_TRUE)
ElseIf(CMAKE_SYSTEM_NAME MATCHES Darwin)
Exec_Program("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE CPUINFO)
execute_process(COMMAND /usr/sbin/sysctl -n machdep.cpu.features
OUTPUT_VARIABLE CPUINFO
)
String(REGEX REPLACE "^.*(SSE).*$" "\\1" SSE_THERE "${CPUINFO}")
String(COMPARE EQUAL "SSE" "${SSE_THERE}" SSE_TRUE)
EndIf(CMAKE_SYSTEM_NAME MATCHES Linux)
......
......@@ -25,7 +25,7 @@ Else()
Set(EXTRA_ARGS "")
EndIf()
execute_process(COMMAND gsl-config --prefix OUTPUT_VARIABLE GSLPATH OUTPUT_STRIP_TRAILING_WHITESPACE)
message(WARNING "GSL PATH ${GSLPATH}")
#message(WARNING "GSL PATH ${GSLPATH}")
ExternalProject_Add(HAL
BUILD_IN_SOURCE 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment