Skip to content
Snippets Groups Projects
Commit 8b1067ed authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

deprececated exec_programm replaced by execute_process, except in...

deprececated exec_programm replaced by execute_process, except in UseLATEX.cmake. Good enough to resolve #1684.
parent 63898c49
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
#----Test if clang setup works---------------------------------------------------------------------- #----Test if clang setup works----------------------------------------------------------------------
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
exec_program(${CMAKE_C_COMPILER} ARGS "-v" OUTPUT_VARIABLE _clang_version_info) execute_process(COMMAND ${CMAKE_C_COMPILER} -v
OUTPUT_VARIABLE _clang_version_info
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX REPLACE "^.*[ ]([0-9]+)\\.[0-9].*$" "\\1" CLANG_MAJOR "${_clang_version_info}") string(REGEX REPLACE "^.*[ ]([0-9]+)\\.[0-9].*$" "\\1" CLANG_MAJOR "${_clang_version_info}")
string(REGEX REPLACE "^.*[ ][0-9]+\\.([0-9]).*$" "\\1" CLANG_MINOR "${_clang_version_info}") string(REGEX REPLACE "^.*[ ][0-9]+\\.([0-9]).*$" "\\1" CLANG_MINOR "${_clang_version_info}")
else() else()
...@@ -14,7 +16,9 @@ endif() ...@@ -14,7 +16,9 @@ endif()
#---Obtain the major and minor version of the GNU compiler------------------------------------------ #---Obtain the major and minor version of the GNU compiler------------------------------------------
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
exec_program(${CMAKE_C_COMPILER} ARGS "-dumpversion" OUTPUT_VARIABLE _gcc_version_info) execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
OUTPUT_VARIABLE _gcc_version_info
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX REPLACE "^([0-9]+).*$" "\\1" GCC_MAJOR ${_gcc_version_info}) string(REGEX REPLACE "^([0-9]+).*$" "\\1" GCC_MAJOR ${_gcc_version_info})
string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*$" "\\1" GCC_MINOR ${_gcc_version_info}) string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*$" "\\1" GCC_MINOR ${_gcc_version_info})
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" GCC_PATCH ${_gcc_version_info}) string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" GCC_PATCH ${_gcc_version_info})
......
...@@ -9,26 +9,28 @@ if (NUMPY_INCLUDE_DIR) ...@@ -9,26 +9,28 @@ if (NUMPY_INCLUDE_DIR)
endif (NUMPY_INCLUDE_DIR) endif (NUMPY_INCLUDE_DIR)
if(NOT Numpy_FIND_QUIETLY) if(NOT Numpy_FIND_QUIETLY)
EXEC_PROGRAM ("${PYTHON_EXECUTABLE}" execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print(numpy.get_include())"
ARGS "-c \"import numpy; print(numpy.get_include())\"" OUTPUT_VARIABLE NUMPY_INCLUDE_DIR
OUTPUT_VARIABLE NUMPY_INCLUDE_DIR RESULT_VARIABLE NUMPY_NOT_FOUND
RETURN_VALUE NUMPY_NOT_FOUND) OUTPUT_STRIP_TRAILING_WHITESPACE)
endif() endif()
if (NUMPY_INCLUDE_DIR MATCHES "Traceback") if (NUMPY_INCLUDE_DIR MATCHES "Traceback")
# Did not successfully include numpy # Did not successfully include numpy
message(ERROR "Unexpected NUMPY_INCLUDE_DIR='${NUMPY_INCLUDE_DIR}'.")
set(NUMPY_FOUND FALSE) set(NUMPY_FOUND FALSE)
else() else()
# successful # successful
message(STATUS "Found NUMPY_INCLUDE_DIR='${NUMPY_INCLUDE_DIR}'.")
if(NOT EXISTS ${NUMPY_INCLUDE_DIR}/numpy/arrayobject.h) if(NOT EXISTS ${NUMPY_INCLUDE_DIR}/numpy/arrayobject.h)
message(STATUS "Can't find numpy/arrayobject.h, please install python-numpy-devel package") message(STATUS "Can't find numpy/arrayobject.h, please install python-numpy-devel package")
else() else()
set (NUMPY_FOUND TRUE) set (NUMPY_FOUND TRUE)
set (NUMPY_INCLUDE_DIR ${NUMPY_INCLUDE_DIR} CACHE STRING "Numpy include path") set (NUMPY_INCLUDE_DIR ${NUMPY_INCLUDE_DIR} CACHE STRING "Numpy include path")
EXEC_PROGRAM ("${PYTHON_EXECUTABLE}" execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print(numpy.__version__)"
ARGS "-c \"import numpy; print(numpy.__version__)\"" OUTPUT_VARIABLE numpy_version_number
OUTPUT_VARIABLE numpy_version_number RESULT_VARIABLE numpy_return_value
RETURN_VALUE numpy_return_value) OUTPUT_STRIP_TRAILING_WHITESPACE)
endif() endif()
endif() endif()
......
# Find the python-yaml module. # Find the python-yaml module.
# This module defines PYYAML_FOUND. # This module defines PYYAML_FOUND.
exec_program ("${PYTHON_EXECUTABLE}" execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import yaml; print(yaml.__version__)"
ARGS "-c 'import yaml; print(yaml.__version__)'"
OUTPUT_VARIABLE pyyaml_version_number OUTPUT_VARIABLE pyyaml_version_number
RETURN_VALUE PYYAML_NOT_FOUND) ERROR_VARIABLE pyyaml_err_msg
RESULT_VARIABLE PYYAML_NOT_FOUND
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE)
if (PYYAML_NOT_FOUND) if (PYYAML_NOT_FOUND)
message(FATAL_ERROR "python-yaml not found (ret='${PYYAML_NOT_FOUND}', out='${pyyaml_version_number}')") message(FATAL_ERROR "python-yaml not found (ret='${PYYAML_NOT_FOUND}', "
"out='${pyyaml_version_number}', "
"err='${pyyaml_err_msg}')")
set(PYYAML_FOUND FALSE) set(PYYAML_FOUND FALSE)
else() else()
message (STATUS "Found python module yaml, version ${pyyaml_version_number}.") message (STATUS "Found python module yaml, version ${pyyaml_version_number}.")
......
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