[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    [kactivities] /: Set, export and use KACTIVITIES_ONTOLOGIES_DIR.
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2012-03-26 20:07:07
Message-ID: 20120326200707.1C45CA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit da70cd0cebb89f7ba18537977d5207497dc2fc49 by Michael Jansen.
Committed on 26/03/2012 at 22:06.
Pushed by mjansen into branch 'master'.

Set, export and use KACTIVITIES_ONTOLOGIES_DIR.

The directory where our ontologies will be installed into.

CCMAIL: kde-buildsystem@kde.org
CCMAIL: plasma-devel@kde.org

M  +4    -0    CMakeLists.txt
M  +1    -0    lib/KActivitiesConfig.cmake.in
M  +1    -1    ontologies/CMakeLists.txt

http://commits.kde.org/kactivities/da70cd0cebb89f7ba18537977d5207497dc2fc49

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e7c3f..71c6e2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,10 @@ INCLUDE(FindPackageHandleStandardArgs)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules \
${CMAKE_MODULE_PATH})  
+# Installation directory for ontologies.  Needed here because used in both ontology/ \
and lib/ sub +# directories.
+set(KACTIVITIES_ONTOLOGIES_DIR ${CMAKE_INSTALL_PREFIX}/share/ontology/kde)
+
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 
 add_subdirectory(lib)
diff --git a/lib/KActivitiesConfig.cmake.in b/lib/KActivitiesConfig.cmake.in
index 8edc65a..f70e798 100644
--- a/lib/KActivitiesConfig.cmake.in
+++ b/lib/KActivitiesConfig.cmake.in
@@ -12,6 +12,7 @@ set(KACTIVITIES_VERSION_STRING \
"@KACTIVITIES_LIB_MAJOR_VERSION@.@KACTIVITIES_LIB  # we have _DIRS for compat with \
existing usage  SET(KACTIVITIES_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" \
"@INCLUDE_INSTALL_DIR@/KDE" CACHE PATH "Include path for the KActivities library")  \
set(KACTIVITIES_INCLUDES "${rootDir}/@INCLUDE_INSTALL_DIR@" \
"@INCLUDE_INSTALL_DIR@/KDE") +set(KACTIVITIES_ONTOLOGIES_DIR \
"@KACTIVITIES_ONTOLOGIES_DIR@")  
 # import the exported targets
 include(${myDir}/KActivitiesLibraryTargets.cmake)
diff --git a/ontologies/CMakeLists.txt b/ontologies/CMakeLists.txt
index 03cd5ab..87c5783 100644
--- a/ontologies/CMakeLists.txt
+++ b/ontologies/CMakeLists.txt
@@ -5,5 +5,5 @@ install (
     kao.trig
     ${CMAKE_CURRENT_BINARY_DIR}/kao.ontology
   DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/share/ontology/kde
+    ${KACTIVITIES_ONTOLOGIES_DIR}
 )
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel


[prev in list] [next in list] [prev in thread] [next in thread]