[cmake-commits] alex committed KDE3Macros.cmake 1.7 1.8 FindKDE3.cmake 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv30652

Modified Files:
	KDE3Macros.cmake FindKDE3.cmake 
Log Message:

ENH: don't hardcode the /lib/kde3/ directory for the libtool files, but make
it adjustable and detect if libkdecore.so is a 64bit library

Alex


Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FindKDE3.cmake	20 Feb 2007 21:02:51 -0000	1.9
+++ FindKDE3.cmake	17 Jul 2007 12:41:20 -0000	1.10
@@ -76,8 +76,6 @@
 FIND_PACKAGE(X11 REQUIRED)
 
 
-SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} kdecore)
-
 #add some KDE specific stuff
 SET(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -D_GNU_SOURCE)
 
@@ -168,8 +166,18 @@
 
 FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore)
 
+SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
+
 GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
 
+IF(NOT KDE3_LIBTOOL_DIR)
+   IF(KDE3_KDECORE_LIBRARY MATCHES lib64)
+     SET(KDE3_LIBTOOL_DIR /lib64/kde3)
+   ELSE(KDE3_KDECORE_LIBRARY MATCHES lib64)
+     SET(KDE3_LIBTOOL_DIR /lib/kde3)
+   ENDIF(KDE3_KDECORE_LIBRARY MATCHES lib64)
+ENDIF(NOT KDE3_LIBTOOL_DIR)
+
 #now search for the dcop utilities
 FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl PATHS
   $ENV{KDEDIR}/bin

Index: KDE3Macros.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/KDE3Macros.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- KDE3Macros.cmake	20 Feb 2007 21:02:51 -0000	1.7
+++ KDE3Macros.cmake	17 Jul 2007 12:41:19 -0000	1.8
@@ -321,7 +321,7 @@
    FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
    FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
 
-   INSTALL_FILES(/lib/kde3 FILES ${_laname})
+   INSTALL_FILES(${KDE3_LIBTOOL_DIR} FILES ${_laname})
 ENDMACRO(KDE3_INSTALL_LIBTOOL_FILE)