From 99725ec17619dfed252f7bbb622966be5f88c7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Mon, 4 Nov 2019 09:58:24 +0100
Subject: [PATCH] cmake-things for installing
---
CMakeLists.txt | 2 +-
Findgnss_utils.cmake | 3 ++-
src/CMakeLists.txt | 14 +++++++-------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fdfa2d..b0da1a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ if(COMMAND cmake_policy)
endif(COMMAND cmake_policy)
# The project name and the type of project
-PROJECT(gnss-utils)
+PROJECT(gnss_utils)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
diff --git a/Findgnss_utils.cmake b/Findgnss_utils.cmake
index f10ba2b..ecb91c6 100644
--- a/Findgnss_utils.cmake
+++ b/Findgnss_utils.cmake
@@ -1,6 +1,7 @@
FIND_PATH(
gnss_utils_INCLUDE_DIRS
- PATHS /usr/local/include/gnss_utils)
+ NAMES gnss_utils.h
+ PATHS /usr/local/include/iri-algorithms/gnss_utils)
IF(gnss_utils_INCLUDE_DIRS)
MESSAGE("Found gnss_utils include dirs: ${gnss_utils_INCLUDE_DIRS}")
ELSE(gnss_utils_INCLUDE_DIRS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20326ea..de5d77d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,11 +50,11 @@ ADD_LIBRARY(gnss_utils SHARED ${SOURCES} ${RTKLIB_SRC})
TARGET_LINK_LIBRARIES(gnss_utils ${Boost_LIBRARIES})
# Installing
-INSTALL(TARGETS gnss_utils
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION /usr/local/lib
- ARCHIVE DESTINATION lib)
-INSTALL(FILES ${HEADERS} DESTINATION include/gnss_utils)
-# INSTALL(FILES ../gnss_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
-INSTALL(FILES ../Findgnss_utils.cmake DESTINATION lib/cmake/${PROJECT_NAME})
+INSTALL(TARGETS ${PROJECT_NAME}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib/iri-algorithms
+ ARCHIVE DESTINATION lib/iri-algorithms)
+INSTALL(FILES ${HEADERS} DESTINATION include/iri-algorithms/gnss_utils)
+INSTALL(FILES ../Findgnss_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
+
ADD_SUBDIRECTORY(examples)
--
GitLab