mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 16:50:06 +02:00
77 lines
2.6 KiB
Plaintext
77 lines
2.6 KiB
Plaintext
From dfccc71cc750359a41d2274ddaa4c716da8c67d6 Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Mon, 18 Dec 2017 19:51:10 +0300
|
|
Subject: Fix INCLUDE_INSTALL_DIR
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 20edcdc..e5c138e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -80,6 +80,9 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
|
|
|
|
set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
|
|
set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
|
|
+if (HAIKU)
|
|
+set (INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/develop/headers CACHE PATH "Installation prefix for C header files" FORCE)
|
|
+endif (HAIKU)
|
|
|
|
# set up RPATH/install_name_dir
|
|
set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
|
|
diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
|
|
index 5058481..1336270 100644
|
|
--- a/templates/lib/CMakeLists.txt
|
|
+++ b/templates/lib/CMakeLists.txt
|
|
@@ -125,7 +125,8 @@ install(TARGETS Grantlee_Templates EXPORT grantlee_targets
|
|
RUNTIME DESTINATION bin COMPONENT Templates
|
|
LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
|
|
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
|
|
- INCLUDES DESTINATION include
|
|
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR}
|
|
+
|
|
)
|
|
|
|
install(FILES
|
|
@@ -152,10 +153,10 @@ install(FILES
|
|
token.h
|
|
util.h
|
|
variable.h
|
|
- DESTINATION include/grantlee COMPONENT Templates
|
|
+ DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT Templates
|
|
)
|
|
|
|
install(FILES
|
|
grantlee_templates.h
|
|
- DESTINATION include COMPONENT Templates
|
|
+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Templates
|
|
)
|
|
diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
|
|
index 2c5a96f..2f122e3 100644
|
|
--- a/textdocument/lib/CMakeLists.txt
|
|
+++ b/textdocument/lib/CMakeLists.txt
|
|
@@ -48,7 +48,7 @@ install(TARGETS Grantlee_TextDocument EXPORT grantlee_targets
|
|
RUNTIME DESTINATION bin COMPONENT TextDocument
|
|
LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
|
|
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
|
|
- INCLUDES DESTINATION include
|
|
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR}
|
|
)
|
|
|
|
install(FILES
|
|
@@ -59,10 +59,10 @@ install(FILES
|
|
texthtmlbuilder.h
|
|
mediawikimarkupbuilder.h
|
|
${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h
|
|
- DESTINATION include/grantlee COMPONENT TextDocument
|
|
+ DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT TextDocument
|
|
)
|
|
|
|
install(FILES
|
|
grantlee_textdocument.h
|
|
- DESTINATION include COMPONENT TextDocument
|
|
+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT TextDocument
|
|
)
|
|
--
|
|
2.30.0
|
|
|