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

List:       kde-core-devel
Subject:    KDE/kdelibs/cmake/modules
From:       Allen Winter <winter () kde ! org>
Date:       2006-03-19 22:23:27
Message-ID: 1142807007.754900.30324.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 520422 by winterz:

Support the KDEDIR environment variable for the installation prefix.
So you don't have to add -DCMAKE_INSTALL_PREFIX to the cmake command line
if you'd rather use good old reliable $KDEDIR.

Now to document this on the wiki.

CCMAIL: kde-core-devel@kde.org


 M  +7 -1      FindKDE4Internal.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #520421:520422
@@ -152,7 +152,7 @@
 # _KDE4_PLATFORM_DEFINITIONS is used only internally
 
 
-cmake_minimum_required(VERSION 2.3.3)
+cmake_minimum_required(VERSION 2.3.4)
 
 #this line includes FindQt.cmake, which searches the Qt library and headers
 find_package(Qt4 REQUIRED)                                      
@@ -163,7 +163,13 @@
 
 #add some KDE specific stuff
 
+# set CMAKE_INSTALL_PREFIX to $KDEDIR, 
+if ($ENV{KDEDIR} MATCHES "[:print:]")
+   set(CMAKE_INSTALL_PREFIX  $ENV{KDEDIR})
+endif ($ENV{KDEDIR} MATCHES "[:print:]")
+message(STATUS "Setting installation dir: ${CMAKE_INSTALL_PREFIX}")
 
+
 # the following are directories where stuff will be installed to
 set(CONFIG_INSTALL_DIR       /share/config              CACHE STRING "The config \
file install dir")  set(DATA_INSTALL_DIR         /share/apps                CACHE \
STRING "The parent directory where applications can install their data")


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