[Cmake-commits] CMake branch, master, updated. bbd9392bc354deaf441b5f4381d202c3a810619e
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Apr 16 06:07:54 EDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via bbd9392bc354deaf441b5f4381d202c3a810619e (commit)
via d4a9ce31ba28bdf50a531c36bfc3d7ea4d6d2118 (commit)
via d62d1fd73da998d02c3c02d2539731dc3de59451 (commit)
via d5b85448eb3470025a3ae8def4df9b461dd6ac68 (commit)
via 8981fa35d817b99c45c208799b2c8893567746ee (commit)
via 0f57a51f75a9a39d60b138bcbefcaa1001d8238e (commit)
via 1f8a67b2eeac1917e27440102d0696e69102058a (commit)
via 32a3b1fb40c8d1f473d934f045d59b5372f8266d (commit)
via 810d9a30eff731e0f36a3e0efe090037a8736626 (commit)
via 99313f4fe99302c9688874ec7a36ef657e9a12b7 (commit)
from 8df8fd8868f50df7a3e5b02ba5d6b070933039a5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbd9392bc354deaf441b5f4381d202c3a810619e
commit bbd9392bc354deaf441b5f4381d202c3a810619e
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 12:03:02 2010 +0200
FindMPEG: mark variables in cache as advanced
diff --git a/Modules/FindMPEG.cmake b/Modules/FindMPEG.cmake
index d66cbf0..0c06c94 100644
--- a/Modules/FindMPEG.cmake
+++ b/Modules/FindMPEG.cmake
@@ -40,3 +40,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_L
IF(MPEG_FOUND)
SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
ENDIF(MPEG_FOUND)
+
+MARK_AS_ADVANCED(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4a9ce31ba28bdf50a531c36bfc3d7ea4d6d2118
commit d4a9ce31ba28bdf50a531c36bfc3d7ea4d6d2118
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 11:26:25 2010 +0200
FindMPEG: also check if MPEG_vo_LIBRARY is valid
diff --git a/Modules/FindMPEG.cmake b/Modules/FindMPEG.cmake
index a19f73e..d66cbf0 100644
--- a/Modules/FindMPEG.cmake
+++ b/Modules/FindMPEG.cmake
@@ -35,7 +35,7 @@ FIND_LIBRARY( MPEG_vo_LIBRARY vo
# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
IF(MPEG_FOUND)
SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d62d1fd73da998d02c3c02d2539731dc3de59451
commit d62d1fd73da998d02c3c02d2539731dc3de59451
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 11:04:23 2010 +0200
FindEXPAT: else() not needed
diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake
index 1c4c163..22743b1 100644
--- a/Modules/FindEXPAT.cmake
+++ b/Modules/FindEXPAT.cmake
@@ -33,9 +33,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT DEFAULT_MSG EXPAT_LIBRARY EXPAT_INCLUDE_
IF(EXPAT_FOUND)
SET(EXPAT_LIBRARIES ${EXPAT_LIBRARY})
SET(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR})
-ELSE(EXPAT_FOUND)
- SET(EXPAT_LIBRARIES)
- SET(EXPAT_INCLUDE_DIRS)
ENDIF(EXPAT_FOUND)
MARK_AS_ADVANCED(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5b85448eb3470025a3ae8def4df9b461dd6ac68
commit d5b85448eb3470025a3ae8def4df9b461dd6ac68
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 11:01:05 2010 +0200
FindJasper: don't put JASPER_LIBRARIES into cache
This means that the user no longer sees this value _but_ this is backwards compatible because setting JASPER_LIBRARIES had no effect previously because we would override it using set()
diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake
index 5522242..4f8ccb7 100644
--- a/Modules/FindJasper.cmake
+++ b/Modules/FindJasper.cmake
@@ -34,4 +34,4 @@ IF (JASPER_FOUND)
SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
ENDIF (JASPER_FOUND)
-MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES JASPER_LIBRARY)
+MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8981fa35d817b99c45c208799b2c8893567746ee
commit 8981fa35d817b99c45c208799b2c8893567746ee
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 10:45:32 2010 +0200
FindJasper: don't set JASPER_LIBRARIES twice
diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake
index 1a28f63..5522242 100644
--- a/Modules/FindJasper.cmake
+++ b/Modules/FindJasper.cmake
@@ -25,10 +25,6 @@ FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
-IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES)
- SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
-ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARY AND JPEG_LIBRARIES)
-
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f57a51f75a9a39d60b138bcbefcaa1001d8238e
commit 0f57a51f75a9a39d60b138bcbefcaa1001d8238e
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 10:38:15 2010 +0200
FindJasper: no need to set QUIETLY explicitly
diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake
index 553654e..1a28f63 100644
--- a/Modules/FindJasper.cmake
+++ b/Modules/FindJasper.cmake
@@ -21,11 +21,6 @@
FIND_PACKAGE(JPEG)
-IF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
- # Already in cache, be silent
- SET(Jasper_FIND_QUIETLY TRUE)
-ENDIF (JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES)
-
FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f8a67b2eeac1917e27440102d0696e69102058a
commit 1f8a67b2eeac1917e27440102d0696e69102058a
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 10:30:33 2010 +0200
FindASPELL: no need to set QUIETLY explicitly
diff --git a/Modules/FindASPELL.cmake b/Modules/FindASPELL.cmake
index c11c2e3..a211ab0 100644
--- a/Modules/FindASPELL.cmake
+++ b/Modules/FindASPELL.cmake
@@ -20,11 +20,6 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
-IF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
- # Already in cache, be silent
- SET(ASPELL_FIND_QUIETLY TRUE)
-ENDIF (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
-
FIND_PATH(ASPELL_INCLUDE_DIR aspell.h )
FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15 libaspell-15 libaspell)
@@ -34,5 +29,4 @@ FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15 libaspell-15 libaspell)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASPELL DEFAULT_MSG ASPELL_LIBRARIES ASPELL_INCLUDE_DIR)
-
MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32a3b1fb40c8d1f473d934f045d59b5372f8266d
commit 32a3b1fb40c8d1f473d934f045d59b5372f8266d
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 10:26:31 2010 +0200
FindHSPELL: capitalize Hspell properly
diff --git a/Modules/FindHSPELL.cmake b/Modules/FindHSPELL.cmake
index 6b6f21f..21bc5fd 100644
--- a/Modules/FindHSPELL.cmake
+++ b/Modules/FindHSPELL.cmake
@@ -1,10 +1,10 @@
-# - Try to find HSPELL
+# - Try to find Hspell
# Once done this will define
#
-# HSPELL_FOUND - system has HSPELL
-# HSPELL_INCLUDE_DIR - the HSPELL include directory
-# HSPELL_LIBRARIES - The libraries needed to use HSPELL
-# HSPELL_DEFINITIONS - Compiler switches required for using HSPELL
+# HSPELL_FOUND - system has Hspell
+# HSPELL_INCLUDE_DIR - the Hspell include directory
+# HSPELL_LIBRARIES - The libraries needed to use Hspell
+# HSPELL_DEFINITIONS - Compiler switches required for using Hspell
#
# HSPELL_VERSION_STRING - The version of Hspell found (x.y)
# HSPELL_MAJOR_VERSION - the major version of Hspell
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=810d9a30eff731e0f36a3e0efe090037a8736626
commit 810d9a30eff731e0f36a3e0efe090037a8736626
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 10:25:02 2010 +0200
FindHSPELL: add version support
diff --git a/Modules/FindHSPELL.cmake b/Modules/FindHSPELL.cmake
index 8942b25..6b6f21f 100644
--- a/Modules/FindHSPELL.cmake
+++ b/Modules/FindHSPELL.cmake
@@ -5,6 +5,10 @@
# HSPELL_INCLUDE_DIR - the HSPELL include directory
# HSPELL_LIBRARIES - The libraries needed to use HSPELL
# HSPELL_DEFINITIONS - Compiler switches required for using HSPELL
+#
+# HSPELL_VERSION_STRING - The version of Hspell found (x.y)
+# HSPELL_MAJOR_VERSION - the major version of Hspell
+# HSPELL_MINOR_VERSION - The minor version of Hspell
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
@@ -24,6 +28,12 @@ FIND_PATH(HSPELL_INCLUDE_DIR hspell.h)
FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell)
+IF (HSPELL_INCLUDE_DIR)
+ FILE(READ "${HSPELL_INCLUDE_DIR}/hspell.h" HSPELL_H)
+ STRING(REGEX REPLACE ".*#define HSPELL_VERSION_MAJOR ([0-9]+).*" "\\1" HSPELL_VERSION_MAJOR "${HSPELL_H}")
+ STRING(REGEX REPLACE ".*#define HSPELL_VERSION_MINOR ([0-9]+).*" "\\1" HSPELL_VERSION_MINOR "${HSPELL_H}")
+ENDIF()
+
# handle the QUIETLY and REQUIRED arguments and set HSPELL_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99313f4fe99302c9688874ec7a36ef657e9a12b7
commit 99313f4fe99302c9688874ec7a36ef657e9a12b7
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Fri Apr 16 10:09:07 2010 +0200
FindHSPELL: no need to set QUIETLY explicitly
diff --git a/Modules/FindHSPELL.cmake b/Modules/FindHSPELL.cmake
index 9ae4a52..8942b25 100644
--- a/Modules/FindHSPELL.cmake
+++ b/Modules/FindHSPELL.cmake
@@ -20,21 +20,14 @@
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
-IF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
- # Already in cache, be silent
- SET(HSPELL_FIND_QUIETLY TRUE)
-ENDIF (HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
+FIND_PATH(HSPELL_INCLUDE_DIR hspell.h)
-
-FIND_PATH(HSPELL_INCLUDE_DIR hspell.h )
-
-FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell )
+FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell)
# handle the QUIETLY and REQUIRED arguments and set HSPELL_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(HSPELL DEFAULT_MSG HSPELL_LIBRARIES HSPELL_INCLUDE_DIR)
-
MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindASPELL.cmake | 6 ------
Modules/FindEXPAT.cmake | 3 ---
Modules/FindHSPELL.cmake | 29 ++++++++++++++++-------------
Modules/FindJasper.cmake | 11 +----------
Modules/FindMPEG.cmake | 4 +++-
5 files changed, 20 insertions(+), 33 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list