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

List:       kde-commits
Subject:    KDE/kdebase/cmake/modules
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2006-03-08 22:15:14
Message-ID: 1141856114.942167.29279.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 516857 by neundorf:

-also look in cmake_install_prefix for kde-config

Alex



 M  +14 -19    FindKDE4.cmake  


--- trunk/KDE/kdebase/cmake/modules/FindKDE4.cmake #516856:516857
@@ -1,18 +1,16 @@
-# first try to find kde-config
-# then ask kde-config for the kde data dirs
-# then check the data dirs for FindKDE4.cmake
+# Find KDE4 and provide all necessary variables and macros to compile software for it.
+#
+# Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information.
+# They are installed with the KDE 4 libraries in $KDEDIR/share/apps/cmake/modules/.
+#
+# Author: Alexander Neundorf <neundorf@kde.org>
 
-MACRO(_MACRO_GETENV_WIN_PATH var name)
-   set(${var} $ENV{${name}})
-   STRING( REGEX REPLACE "\\\\" "/" ${var} "${${var}}" )
-ENDMACRO(_MACRO_GETENV_WIN_PATH)
 
-_MACRO_GETENV_WIN_PATH(ENV_KDEDIR KDEDIR)
-
-
+# First try to find kde-config
 FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config
    PATHS
-   ${ENV_KDEDIR}/bin
+   ${CMAKE_INSTALL_PREFIX}/bin
+   $ENV{KDEDIR}/bin
    /opt/kde4/bin
    /opt/kde
    )
@@ -20,17 +18,16 @@
 
 IF (KDE4_KDECONFIG_EXECUTABLE)
 
+   # then ask kde-config for the kde data dirs
    EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
 
    # replace the ":" with ";" so that it becomes a valid cmake list
    STRING(REGEX REPLACE ":" ";" _data_DIR "${_data_DIR}")
 
-   MESSAGE(STATUS "datadir: ${_data_DIR}")
+   # then check the data dirs for FindKDE4Internal.cmake
+   FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
 
-   FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake 
-      ${_data_DIR}
-   )
-
+   # if it has been found...
    IF (KDE4_DATA_DIR)
 
       SET(CMAKE_MODULE_PATH  ${KDE4_DATA_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
@@ -43,11 +40,11 @@
          SET(_req REQUIRED)
       ENDIF (KDE4_FIND_REQUIRED)
 
+      # use FindKDE4Internal.cmake to do the rest
       FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
 
    ENDIF (KDE4_DATA_DIR)
 
-
 ENDIF (KDE4_KDECONFIG_EXECUTABLE)
 
 
@@ -55,5 +52,3 @@
    MESSAGE(FATAL_ERROR "Could not find KDE4")
 ENDIF (KDE4_FIND_REQUIRED AND NOT KDE4_FOUND)
 
-
-
[prev in list] [next in list] [prev in thread] [next in thread]