[Cmake-commits] CMake branch, master, updated. 3ca474955865457cc1e3674fb34240e3788277bb
cmake-commits at cmake.org
cmake-commits at cmake.org
Sat Apr 17 05:11:03 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 3ca474955865457cc1e3674fb34240e3788277bb (commit)
via 293d8aee07fb6390224244d1d874e9d01e79032f (commit)
via 172e93bd963848db88a58625d5104f1102c78312 (commit)
via 962944361660ccc0cd0075ff4a94c82eb207265e (commit)
via 5abed16cc23501c35fd679a87905c04ffd9ae6c4 (commit)
via 7c9e72ad235a550673421a004eeea775320c36a2 (commit)
via db3134d2a175266d1b05b03737e7b323c2c832ba (commit)
from c178660d96502e699c08dc142d8fae770f0c042c (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=3ca474955865457cc1e3674fb34240e3788277bb
commit 3ca474955865457cc1e3674fb34240e3788277bb
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Sat Apr 17 10:05:44 2010 +0200
FindLibXslt: move include statement + misc whitespace cleanup
diff --git a/Modules/FindLibXslt.cmake b/Modules/FindLibXslt.cmake
index d16d1ff..a03aa7c 100644
--- a/Modules/FindLibXslt.cmake
+++ b/Modules/FindLibXslt.cmake
@@ -26,9 +26,8 @@ FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_LIBXSLT libxslt)
SET(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER})
-
FIND_PATH(LIBXSLT_INCLUDE_DIR NAMES libxslt/xslt.h
- HINTS
+ HINTS
${PC_LIBXSLT_INCLUDEDIR}
${PC_LIBXSLT_INCLUDE_DIRS}
)
@@ -39,12 +38,10 @@ FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
${PC_LIBXSLT_LIBRARY_DIRS}
)
-INCLUDE(FindPackageHandleStandardArgs)
-
# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if
# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXslt DEFAULT_MSG LIBXSLT_LIBRARIES LIBXSLT_INCLUDE_DIR)
-
MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=293d8aee07fb6390224244d1d874e9d01e79032f
commit 293d8aee07fb6390224244d1d874e9d01e79032f
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Sat Apr 17 09:44:02 2010 +0200
FindAVIFile: use find_package_handle_standard_args()
diff --git a/Modules/FindAVIFile.cmake b/Modules/FindAVIFile.cmake
index ff140f6..7272ba6 100644
--- a/Modules/FindAVIFile.cmake
+++ b/Modules/FindAVIFile.cmake
@@ -35,16 +35,14 @@ IF (UNIX)
ENDIF (UNIX)
-SET (AVIFILE_FOUND "NO")
-
-IF(AVIFILE_INCLUDE_DIR)
- IF(AVIFILE_AVIPLAY_LIBRARY)
- SET( AVIFILE_LIBRARIES ${AVIFILE_AVIPLAY_LIBRARY} )
- SET( AVIFILE_FOUND "YES" )
- SET( AVIFILE_DEFINITIONS "")
-
- ENDIF(AVIFILE_AVIPLAY_LIBRARY)
-ENDIF(AVIFILE_INCLUDE_DIR)
-
+# handle the QUIETLY and REQUIRED arguments and set AVIFILE_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(AVIFile DEFAULT_MSG AVIFILE_INCLUDE_DIR AVIFILE_AVIPLAY_LIBRARY)
+
+IF (AVIFILE_FOUND)
+ SET(AVIFILE_LIBRARIES ${AVIFILE_AVIPLAY_LIBRARY})
+ SET(AVIFILE_DEFINITIONS "")
+ENDIF()
MARK_AS_ADVANCED(AVIFILE_INCLUDE_DIR AVIFILE_AVIPLAY_LIBRARY)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=172e93bd963848db88a58625d5104f1102c78312
commit 172e93bd963848db88a58625d5104f1102c78312
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Sat Apr 17 08:38:15 2010 +0200
FindPhysFS: use find_package_handle_standard_args()
diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake
index 4775a8e..98bebe6 100644
--- a/Modules/FindPhysFS.cmake
+++ b/Modules/FindPhysFS.cmake
@@ -54,8 +54,8 @@ FIND_LIBRARY(PHYSFS_LIBRARY
/opt
)
-SET(PHYSFS_FOUND "NO")
-IF(PHYSFS_LIBRARY AND PHYSFS_INCLUDE_DIR)
- SET(PHYSFS_FOUND "YES")
-ENDIF(PHYSFS_LIBRARY AND PHYSFS_INCLUDE_DIR)
+# handle the QUIETLY and REQUIRED arguments and set PHYSFS_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=962944361660ccc0cd0075ff4a94c82eb207265e
commit 962944361660ccc0cd0075ff4a94c82eb207265e
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Sat Apr 17 08:32:19 2010 +0200
FindQuickTime: use find_package_handle_standard_args()
diff --git a/Modules/FindQuickTime.cmake b/Modules/FindQuickTime.cmake
index aa13ae9..f693543 100644
--- a/Modules/FindQuickTime.cmake
+++ b/Modules/FindQuickTime.cmake
@@ -41,9 +41,7 @@ ELSE(APPLE)
)
ENDIF(APPLE)
-SET(QUICKTIME_FOUND "NO")
-IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)
- SET(QUICKTIME_FOUND "YES")
-ENDIF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)
-
-
+# handle the QUIETLY and REQUIRED arguments and set QUICKTIME_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QuickTime DEFAULT_MSG QUICKTIME_LIBRARY QUICKTIME_INCLUDE_DIR)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5abed16cc23501c35fd679a87905c04ffd9ae6c4
commit 5abed16cc23501c35fd679a87905c04ffd9ae6c4
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Sat Apr 17 09:13:37 2010 +0200
FindZLIB: only set INCLUDE_DIRECTORIES/LIBRARIES if zlib is found
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index 1dac67a..499ae77 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -41,12 +41,13 @@ IF (ZLIB_INCLUDE_DIR)
STRING(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*" "\\1.\\2.\\3" ZLIB_VERSION_STRING "${ZLIB_H}")
ENDIF()
-# Per-recommendation
-SET(ZLIB_INCLUDE_DIRS "${ZLIB_INCLUDE_DIR}")
-SET(ZLIB_LIBRARIES "${ZLIB_LIBRARY}")
-
# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_INCLUDE_DIR ZLIB_LIBRARY)
+
+IF (ZLIB_FOUND)
+ SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
+ SET(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+ENDIF()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c9e72ad235a550673421a004eeea775320c36a2
commit 7c9e72ad235a550673421a004eeea775320c36a2
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Sat Apr 17 08:31:26 2010 +0200
FindLibXml2: move include statement
diff --git a/Modules/FindLibXml2.cmake b/Modules/FindLibXml2.cmake
index 9139aad..e18dc2e 100644
--- a/Modules/FindLibXml2.cmake
+++ b/Modules/FindLibXml2.cmake
@@ -44,10 +44,9 @@ FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint)
# for backwards compat. with KDE 4.0.x:
SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}")
-INCLUDE(FindPackageHandleStandardArgs)
-
# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if
# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db3134d2a175266d1b05b03737e7b323c2c832ba
commit db3134d2a175266d1b05b03737e7b323c2c832ba
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Sat Apr 17 07:48:02 2010 +0200
Make VERBOSE_FLAG appear as first statement for consistency
diff --git a/Modules/Compiler/SunPro-C.cmake b/Modules/Compiler/SunPro-C.cmake
index 4ac918e..656eea6 100644
--- a/Modules/Compiler/SunPro-C.cmake
+++ b/Modules/Compiler/SunPro-C.cmake
@@ -1,11 +1,11 @@
+SET(CMAKE_C_VERBOSE_FLAG "-#")
+
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-KPIC")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-R")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h")
-SET(CMAKE_C_VERBOSE_FLAG "-#")
-
SET(CMAKE_C_FLAGS_INIT "")
SET(CMAKE_C_FLAGS_DEBUG_INIT "-g")
SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "-xO2 -xspace -DNDEBUG")
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index fe549d6..3e07e8e 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -1,11 +1,11 @@
+SET(CMAKE_CXX_VERBOSE_FLAG "-v")
+
SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-KPIC")
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-G")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-R")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h")
-SET(CMAKE_CXX_VERBOSE_FLAG "-v")
-
SET(CMAKE_CXX_FLAGS_INIT "")
SET(CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-xO2 -xspace -DNDEBUG")
diff --git a/Modules/Compiler/SunPro-Fortran.cmake b/Modules/Compiler/SunPro-Fortran.cmake
index ae38f86..a41b454 100644
--- a/Modules/Compiler/SunPro-Fortran.cmake
+++ b/Modules/Compiler/SunPro-Fortran.cmake
@@ -1,3 +1,5 @@
+SET(CMAKE_Fortran_VERBOSE_FLAG "-v")
+
SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-KPIC")
SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-G")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-R")
@@ -12,4 +14,3 @@ SET(CMAKE_Fortran_FLAGS_RELEASE_INIT "-xO3 -DNDEBUG")
SET(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-g -xO2")
SET(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
SET(CMAKE_Fortran_MODPATH_FLAG "-M")
-SET(CMAKE_Fortran_VERBOSE_FLAG "-v")
diff --git a/Modules/Compiler/XL-Fortran.cmake b/Modules/Compiler/XL-Fortran.cmake
index 6133f56..cf9b2b6 100644
--- a/Modules/Compiler/XL-Fortran.cmake
+++ b/Modules/Compiler/XL-Fortran.cmake
@@ -1,4 +1,5 @@
SET(CMAKE_Fortran_VERBOSE_FLAG "-V")
+
SET(CMAKE_Fortran_DEFINE_FLAG "-WF,-D")
SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "-g")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/SunPro-C.cmake | 4 ++--
Modules/Compiler/SunPro-CXX.cmake | 4 ++--
Modules/Compiler/SunPro-Fortran.cmake | 3 ++-
Modules/Compiler/XL-Fortran.cmake | 1 +
Modules/FindAVIFile.cmake | 20 +++++++++-----------
Modules/FindLibXml2.cmake | 3 +--
Modules/FindLibXslt.cmake | 7 ++-----
Modules/FindPhysFS.cmake | 8 ++++----
Modules/FindQuickTime.cmake | 10 ++++------
Modules/FindZLIB.cmake | 11 ++++++-----
10 files changed, 33 insertions(+), 38 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list