[cmake-commits] hoffman committed CPack.cmake 1.17.2.6 1.17.2.7
FindKDE4.cmake 1.3.2.3 1.3.2.4 FindXMLRPC.cmake 1.1.2.1 1.1.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Feb 5 13:21:34 EST 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv30870/Modules
Modified Files:
Tag: CMake-2-4
CPack.cmake FindKDE4.cmake FindXMLRPC.cmake
Log Message:
ENH: merge in changes from branch
Index: FindXMLRPC.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindXMLRPC.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- FindXMLRPC.cmake 27 Oct 2006 20:04:02 -0000 1.1.2.1
+++ FindXMLRPC.cmake 5 Feb 2007 18:21:32 -0000 1.1.2.2
@@ -104,6 +104,7 @@
PATHS ${XMLRPC_LIBRARY_DIRS}
NO_DEFAULT_PATH
)
+ FIND_LIBRARY(XMLRPC_${name}_LIBRARY NAMES ${name})
MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY)
# If any library is not found then the whole package is not found.
Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -u -d -r1.17.2.6 -r1.17.2.7
--- CPack.cmake 27 Oct 2006 20:01:46 -0000 1.17.2.6
+++ CPack.cmake 5 Feb 2007 18:21:32 -0000 1.17.2.7
@@ -99,6 +99,10 @@
SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
ENDIF(APPLE)
SET(CPACK_SOURCE_GENERATOR "TGZ;TZ")
+ IF(CYGWIN)
+ SET(CPACK_SOURCE_GENERATOR "CygwinSource")
+ SET(CPACK_GENERATOR "CygwinBinary")
+ ENDIF(CYGWIN)
ELSE(UNIX)
SET(CPACK_GENERATOR "NSIS;ZIP")
SET(CPACK_SOURCE_GENERATOR "ZIP")
Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- FindKDE4.cmake 28 Nov 2006 19:19:44 -0000 1.3.2.3
+++ FindKDE4.cmake 5 Feb 2007 18:21:32 -0000 1.3.2.4
@@ -1,12 +1,12 @@
# Find KDE4 and provide all necessary variables and macros to compile software for it.
# It looks for KDE 4 in the following directories in the given order:
# - CMAKE_INSTALL_PREFIX
-# - KDEDIR
+# - KDEDIRS
# - /opt/kde4
# - /opt/kde
#
# 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/.
+# They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/.
#
# Author: Alexander Neundorf <neundorf at kde.org>
More information about the Cmake-commits
mailing list