|
 |
08c45a3 |
From 44be2c83f8f7cd285ee0fd946853b98ffed6bd14 Mon Sep 17 00:00:00 2001
|
|
|
08c45a3 |
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
08c45a3 |
Date: Sat, 7 Nov 2015 14:13:47 +0100
|
|
|
08c45a3 |
Subject: [PATCH 1/2] install cmake files in private directory
|
|
|
08c45a3 |
|
|
|
08c45a3 |
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
08c45a3 |
---
|
|
|
08c45a3 |
CMakeLists.txt | 5 +++--
|
|
|
08c45a3 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
08c45a3 |
|
|
|
08c45a3 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
08c45a3 |
index fcf1bb4..349ee66 100644
|
|
|
08c45a3 |
--- a/CMakeLists.txt
|
|
|
08c45a3 |
+++ b/CMakeLists.txt
|
|
|
08c45a3 |
@@ -50,6 +50,7 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
|
|
|
08c45a3 |
SET (LIBMINC_EXPORTED_TARGETS "LIBMINC-targets")
|
|
|
08c45a3 |
SET (LIBMINC_INSTALL_BIN_DIR bin)
|
|
|
08c45a3 |
SET (LIBMINC_INSTALL_LIB_DIR lib${LIB_SUFFIX})
|
|
|
08c45a3 |
+ SET (LIBMINC_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/LIBMINC)
|
|
|
08c45a3 |
SET (LIBMINC_INSTALL_INCLUDE_DIR include)
|
|
|
08c45a3 |
SET (LIBMINC_INSTALL_DATA_DIR share)
|
|
|
08c45a3 |
|
|
|
08c45a3 |
@@ -419,7 +420,7 @@ configure_file(UseLIBMINC.cmake.in
|
|
|
08c45a3 |
${CMAKE_CURRENT_BINARY_DIR}/UseLIBMINC.cmake @ONLY)
|
|
|
08c45a3 |
|
|
|
08c45a3 |
# config for install dir
|
|
|
08c45a3 |
-SET(LIBMINC_USE_FILE_CONFIG "${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_LIB_DIR}/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake")
|
|
|
08c45a3 |
+SET(LIBMINC_USE_FILE_CONFIG "${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_CMAKE_DIR}/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake")
|
|
|
08c45a3 |
SET(LIBMINC_INCLUDE_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_INCLUDE_DIR} )
|
|
|
08c45a3 |
SET(LIBMINC_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/${LIBMINC_INSTALL_LIB_DIR})
|
|
|
08c45a3 |
SET(LIBMINC_STATIC_LIBRARIES_CONFIG "")
|
|
|
08c45a3 |
@@ -452,7 +453,7 @@ IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
|
|
|
08c45a3 |
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake
|
|
|
08c45a3 |
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake
|
|
|
08c45a3 |
DESTINATION
|
|
|
08c45a3 |
- ${LIBMINC_INSTALL_LIB_DIR}
|
|
|
08c45a3 |
+ ${LIBMINC_INSTALL_CMAKE_DIR}
|
|
|
08c45a3 |
COMPONENT Development)
|
|
|
08c45a3 |
|
|
|
08c45a3 |
ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
|
|
|
08c45a3 |
--
|
|
|
08c45a3 |
2.6.2
|
|
|
08c45a3 |
|