Mentions légales du service

Skip to content
Snippets Groups Projects
Commit b876c8e8 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Fix issue #2

parent 23532682
No related branches found
No related tags found
1 merge request!12Enable CI
...@@ -77,8 +77,8 @@ if(PKG_CONFIG_EXECUTABLE AND NOT HQR_GIVEN_BY_USER) ...@@ -77,8 +77,8 @@ if(PKG_CONFIG_EXECUTABLE AND NOT HQR_GIVEN_BY_USER)
#endif() #endif()
else() else()
message(STATUS "${Magenta}Looking for HQR - not found using PkgConfig." message(STATUS "${Magenta}Looking for HQR - not found using PkgConfig."
"\n Perhaps you should add the directory containing hqr.pc to the" "\n Perhaps you should add the directory containing hqr.pc to the"
"\n PKG_CONFIG_PATH environment variable.${ColourReset}") "\n PKG_CONFIG_PATH environment variable.${ColourReset}")
endif() endif()
endif() endif()
...@@ -133,14 +133,14 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR ...@@ -133,14 +133,14 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR
if(HQR_DIR) if(HQR_DIR)
set(HQR_libhqr.h_DIRS "HQR_libhqr.h_DIRS-NOTFOUND") set(HQR_libhqr.h_DIRS "HQR_libhqr.h_DIRS-NOTFOUND")
find_path(HQR_libhqr.h_DIRS find_path(HQR_libhqr.h_DIRS
NAMES libhqr.h NAMES libhqr.h
HINTS ${HQR_DIR} HINTS ${HQR_DIR})
else() else()
set(HQR_libhqr.h_DIRS "HQR_libhqr.h_DIRS-NOTFOUND") set(HQR_libhqr.h_DIRS "HQR_libhqr.h_DIRS-NOTFOUND")
find_path(HQR_libhqr.h_DIRS find_path(HQR_libhqr.h_DIRS
NAMES libhqr.h NAMES libhqr.h
HINTS ${_inc_env} HINTS ${_inc_env}
PATH_SUFFIXES "hqr") PATH_SUFFIXES "hqr")
endif() endif()
endif() endif()
mark_as_advanced(HQR_libhqr.h_DIRS) mark_as_advanced(HQR_libhqr.h_DIRS)
...@@ -177,9 +177,9 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR ...@@ -177,9 +177,9 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR
string(REPLACE ":" ";" _lib_env "$ENV{LIB}") string(REPLACE ":" ";" _lib_env "$ENV{LIB}")
else() else()
if(APPLE) if(APPLE)
string(REPLACE ":" ";" _lib_env "$ENV{DYLD_LIBRARY_PATH}") string(REPLACE ":" ";" _lib_env "$ENV{DYLD_LIBRARY_PATH}")
else() else()
string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}") string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
endif() endif()
list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}") list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}") list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
...@@ -200,14 +200,14 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR ...@@ -200,14 +200,14 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR
if(HQR_DIR) if(HQR_DIR)
set(HQR_hqr_LIBRARY "HQR_hqr_LIBRARY-NOTFOUND") set(HQR_hqr_LIBRARY "HQR_hqr_LIBRARY-NOTFOUND")
find_library(HQR_hqr_LIBRARY find_library(HQR_hqr_LIBRARY
NAMES hqr NAMES hqr
HINTS ${HQR_DIR} HINTS ${HQR_DIR}
PATH_SUFFIXES lib lib32 lib64) PATH_SUFFIXES lib lib32 lib64)
else() else()
set(HQR_hqr_LIBRARY "HQR_hqr_LIBRARY-NOTFOUND") set(HQR_hqr_LIBRARY "HQR_hqr_LIBRARY-NOTFOUND")
find_library(HQR_hqr_LIBRARY find_library(HQR_hqr_LIBRARY
NAMES hqr NAMES hqr
HINTS ${_lib_env}) HINTS ${_lib_env})
endif() endif()
endif() endif()
mark_as_advanced(HQR_hqr_LIBRARY) mark_as_advanced(HQR_hqr_LIBRARY)
...@@ -259,15 +259,15 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR ...@@ -259,15 +259,15 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR
# test link # test link
unset(HQR_WORKS CACHE) unset(HQR_WORKS CACHE)
include(CheckFunctionExists) include(CheckFunctionExists)
check_function_exists(libhqr_hqr_init HQR_WORKS) check_function_exists(libhqr_init_hqr HQR_WORKS)
mark_as_advanced(HQR_WORKS) mark_as_advanced(HQR_WORKS)
if(NOT HQR_WORKS) if(NOT HQR_WORKS)
if(NOT HQR_FIND_QUIETLY) if(NOT HQR_FIND_QUIETLY)
message(STATUS "Looking for hqr : test of libhqr_hqr_init with hqr library fails") message(STATUS "Looking for hqr : test of libhqr_hqr_init with hqr library fails")
message(STATUS "CMAKE_REQUIRED_LIBRARIES: ${CMAKE_REQUIRED_LIBRARIES}") message(STATUS "CMAKE_REQUIRED_LIBRARIES: ${CMAKE_REQUIRED_LIBRARIES}")
message(STATUS "CMAKE_REQUIRED_INCLUDES: ${CMAKE_REQUIRED_INCLUDES}") message(STATUS "CMAKE_REQUIRED_INCLUDES: ${CMAKE_REQUIRED_INCLUDES}")
message(STATUS "Check in CMakeFiles/CMakeError.log to figure out why it fails") message(STATUS "Check in CMakeFiles/CMakeError.log to figure out why it fails")
endif() endif()
endif() endif()
set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_INCLUDES)
......
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