diff --git a/CMakeLists.txt b/CMakeLists.txt index 479fe24bf0800c5d846573db410a7b5fd31a33ef..d36785ffb82b26bbff6e5be422c1e9a0c5c17f35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,8 +157,8 @@ endif() # Installing INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/iri-algorithms - ARCHIVE DESTINATION lib/iri-algorithms) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) INSTALL(DIRECTORY include/gnss_utils DESTINATION include/iri-algorithms) INSTALL(FILES ${RTKLIB_SRC_DIR}/rtklib.h DESTINATION include/iri-algorithms/gnss_utils) INSTALL(FILES Findgnss_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/) diff --git a/Findgnss_utils.cmake b/Findgnss_utils.cmake index 527f8629f07a15331cdc41dfda2a402f4f31783d..35655c81dd7c60b01b63ba98cd8d973f743b8b9a 100644 --- a/Findgnss_utils.cmake +++ b/Findgnss_utils.cmake @@ -1,7 +1,7 @@ FIND_PATH( gnss_utils_INCLUDE_DIRS NAMES gnss_utils.h - PATHS /usr/local/include/iri-algorithms/gnss_utils) + PATHS /usr/local/include/iri-algorithms/gnss_utils /usr/local/lib/iri-algorithms/gnss_utils) #change INCLUDE_DIRS to its parent directory (to force includes with libname in front get_filename_component(gnss_utils_INCLUDE_DIRS ${gnss_utils_INCLUDE_DIRS} DIRECTORY) IF(gnss_utils_INCLUDE_DIRS) @@ -22,6 +22,8 @@ ENDIF(gnss_utils_LIBRARIES) IF (gnss_utils_INCLUDE_DIRS AND gnss_utils_LIBRARIES) SET(gnss_utils_FOUND TRUE) + SET(gnss_utils_INCLUDE_DIR ${gnss_utils_INCLUDE_DIRS}) + SET(gnss_utils_LIBRARY ${gnss_utils_LIBRARIES}) ELSE(gnss_utils_INCLUDE_DIRS AND gnss_utils_LIBRARIES) set(gnss_utils_FOUND FALSE) ENDIF (gnss_utils_INCLUDE_DIRS AND gnss_utils_LIBRARIES)