OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3087 from akva2/small_buildsys_fixes

Browse Source 
Small buildsystem fixes
This commit is contained in:
Markus Blatt 2022-07-28 09:03:48 +02:00 committed by GitHub
commit 26886bf4fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -184,7 +184,7 @@ if (OPM_ENABLE_PYTHON)
endif() endif()
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
set(Python3_LIBRARIES ${PYTHON_LIBRARIES}) set(Python3_LIBRARIES ${PYTHON_LIBRARIES})
set(Python3_VERSION "${PYTHON_VERSION_STRING}"}) set(Python3_VERSION "${PYTHON_VERSION_STRING}")
set(Python3_VERSION_MINOR ${PYTHON_VERSION_MINOR}) set(Python3_VERSION_MINOR ${PYTHON_VERSION_MINOR})
else() else()
# Be backwards compatible. # Be backwards compatible.

7
cmake/Modules/FindValgrind.cmake
View File

@ -3,13 +3,10 @@
# This module defines: # This module defines:
# VALGRIND_INCLUDE_DIR, where to find valgrind/memcheck.h, etc. # VALGRIND_INCLUDE_DIR, where to find valgrind/memcheck.h, etc.
# VALGRIND_PROGRAM, the valgrind executable. # VALGRIND_PROGRAM, the valgrind executable.
# VALGRIND_FOUND, If false, do not try to use valgrind. # Valgrind_FOUND, If false, do not try to use valgrind.
# #
# If you have valgrind installed in a non-standard place, you can define # If you have valgrind installed in a non-standard place, you can define
# VALGRIND_ROOT to tell cmake where it is. # VALGRIND_ROOT to tell cmake where it is.
if (VALGRIND_FOUND)
return()
endif()
find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h
/usr/include /usr/local/include ${VALGRIND_ROOT}/include) /usr/include /usr/local/include ${VALGRIND_ROOT}/include)
@ -18,7 +15,7 @@ find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h
# path, but this does not hurt... # path, but this does not hurt...
find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin) find_program(VALGRIND_PROGRAM NAMES valgrind PATH ${VALGRIND_ROOT}/bin)
find_package_handle_standard_args(VALGRIND DEFAULT_MSG find_package_handle_standard_args(Valgrind DEFAULT_MSG
VALGRIND_INCLUDE_DIR VALGRIND_INCLUDE_DIR
VALGRIND_PROGRAM) VALGRIND_PROGRAM)