From d4dd1b52ef1f6c673e6c9d07977748ebfbedc331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Mon, 16 Jun 2014 15:04:44 +0200 Subject: [PATCH] Modifications on eoserial/src/CMakeLists.txt file (most of the time for module paths). --- eoserial/src/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eoserial/src/CMakeLists.txt b/eoserial/src/CMakeLists.txt index efc9f42e2..a3c6ff19a 100644 --- a/eoserial/src/CMakeLists.txt +++ b/eoserial/src/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ### 2) Define the eoserial target ###################################################################################### -set(EOSERIAL_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib) +set(EOSERIAL_LIB_OUTPUT_PATH ${EOSERIAL_BIN_DIR}/lib) set(LIBRARY_OUTPUT_PATH ${EOSERIAL_LIB_OUTPUT_PATH}) set(EOSERIAL_SOURCES @@ -20,13 +20,17 @@ set(EOSERIAL_SOURCES ) add_library(eoserial STATIC ${EOSERIAL_SOURCES}) -install(TARGETS eoserial ARCHIVE DESTINATION lib COMPONENT libraries) - -file(GLOB HDRS *.h) -install(FILES ${HDRS} DESTINATION include/eo/serial COMPONENT headers) +install(TARGETS eoserial ARCHIVE DESTINATION ${LIB} COMPONENT libraries) ###################################################################################### -### 3) Optionnal +### 4) Look for headers +###################################################################################### + +file(GLOB HDRS *.h) +install(FILES ${HDRS} DESTINATION ${INSTALL_SUB_DIR}/eoserial COMPONENT headers) + +###################################################################################### +### 5) Optionnal ###################################################################################### set(EOSERIAL_VERSION ${GLOBAL_VERSION})