[Cmake-commits] [cmake-commits] king committed CMakeDetermineJavaCompiler.cmake 1.14.4.1 1.14.4.2 CPackDeb.cmake 1.14.2.1 1.14.2.2 FindHDF5.cmake 1.4.2.1 1.4.2.2 FindJNI.cmake 1.41.2.2 1.41.2.3 FindOpenSSL.cmake 1.3.2.1 1.3.2.2 FindZLIB.cmake 1.11.4.1 1.11.4.2 UseSWIG.cmake 1.17.4.1 1.17.4.2 readme.txt 1.16.2.1 1.16.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Nov 3 17:25:04 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14310/Modules
Modified Files:
Tag: CMake-2-8
CMakeDetermineJavaCompiler.cmake CPackDeb.cmake FindHDF5.cmake
FindJNI.cmake FindOpenSSL.cmake FindZLIB.cmake UseSWIG.cmake
readme.txt
Log Message:
CMake 2.8.0-rc5
Index: FindOpenSSL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenSSL.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** FindOpenSSL.cmake 1 Oct 2009 21:20:32 -0000 1.3.2.1
--- FindOpenSSL.cmake 3 Nov 2009 22:25:02 -0000 1.3.2.2
***************
*** 9,12 ****
--- 9,13 ----
# Copyright 2006-2009 Kitware, Inc.
# Copyright 2006 Alexander Neundorf <neundorf at kde.org>
+ # Copyright 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
#
# Distributed under the OSI-approved BSD License (the "License");
***************
*** 28,32 ****
ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h )
IF(WIN32 AND MSVC)
--- 29,36 ----
ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! # http://www.slproweb.com/products/Win32OpenSSL.html
! FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/include"
! )
IF(WIN32 AND MSVC)
***************
*** 35,44 ****
# use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
! FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32)
! FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32)
IF(MSVC_IDE)
IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG})
ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
SET(OPENSSL_LIBRARIES NOTFOUND)
--- 39,58 ----
# use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
! FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
! )
! FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
! )
! FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
! )
! FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
! )
IF(MSVC_IDE)
IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} debug ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG})
ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
SET(OPENSSL_LIBRARIES NOTFOUND)
***************
*** 48,60 ****
STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG})
ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE})
ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
ENDIF(MSVC_IDE)
MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
ELSE(WIN32 AND MSVC)
! FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD )
ENDIF(WIN32 AND MSVC)
--- 62,79 ----
STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG})
ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE})
ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
ENDIF(MSVC_IDE)
MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
+ MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
ELSE(WIN32 AND MSVC)
! FIND_LIBRARY(OPENSSL_SSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD)
! FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto)
! MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
!
! SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
ENDIF(WIN32 AND MSVC)
Index: CMakeDetermineJavaCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineJavaCompiler.cmake,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C 2 -d -r1.14.4.1 -r1.14.4.2
*** CMakeDetermineJavaCompiler.cmake 1 Oct 2009 21:20:18 -0000 1.14.4.1
--- CMakeDetermineJavaCompiler.cmake 3 Nov 2009 22:25:02 -0000 1.14.4.2
***************
*** 52,55 ****
--- 52,56 ----
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+ $ENV{JAVA_HOME}/bin
/usr/bin
/usr/lib/java/bin
***************
*** 57,63 ****
--- 58,67 ----
/usr/local/bin
/usr/local/java/bin
+ /usr/local/java/share/bin
/usr/java/j2sdk1.4.2_04
/usr/lib/j2sdk1.4-sun/bin
+ /usr/java/j2sdk1.4.2_09/bin
/usr/lib/j2sdk1.5-sun/bin
+ /opt/sun-jdk-1.5.0.04/bin
)
# if no compiler has been specified yet, then look for one
Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.41.2.2
retrieving revision 1.41.2.3
diff -C 2 -d -r1.41.2.2 -r1.41.2.3
*** FindJNI.cmake 28 Oct 2009 16:14:56 -0000 1.41.2.2
--- FindJNI.cmake 3 Nov 2009 22:25:02 -0000 1.41.2.3
***************
*** 196,207 ****
FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
! ${JAVA_AWT_INCLUDE_DIRECTORIES}
${JAVA_INCLUDE_PATH}/win32
${JAVA_INCLUDE_PATH}/linux
${JAVA_INCLUDE_PATH}/freebsd
)
FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
- ${JAVA_AWT_INCLUDE_DIRECTORIES}
${JAVA_INCLUDE_PATH}
)
--- 196,207 ----
FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
! ${JAVA_INCLUDE_PATH}
${JAVA_INCLUDE_PATH}/win32
${JAVA_INCLUDE_PATH}/linux
${JAVA_INCLUDE_PATH}/freebsd
+ ${JAVA_INCLUDE_PATH}/solaris
)
FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
${JAVA_INCLUDE_PATH}
)
Index: FindZLIB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindZLIB.cmake,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -C 2 -d -r1.11.4.1 -r1.11.4.2
*** FindZLIB.cmake 1 Oct 2009 21:20:33 -0000 1.11.4.1
--- FindZLIB.cmake 3 Nov 2009 22:25:02 -0000 1.11.4.2
***************
*** 2,8 ****
# Find the native ZLIB includes and library
#
! # ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
! # ZLIB_LIBRARIES - List of libraries when using zlib.
! # ZLIB_FOUND - True if zlib found.
#=============================================================================
--- 2,8 ----
# Find the native ZLIB includes and library
#
! # ZLIB_INCLUDE_DIRS - where to find zlib.h, etc.
! # ZLIB_LIBRARIES - List of libraries when using zlib.
! # ZLIB_FOUND - True if zlib found.
#=============================================================================
***************
*** 28,42 ****
SET(ZLIB_NAMES z zlib zdll)
FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )
# 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_LIBRARY ZLIB_INCLUDE_DIR)
!
! IF(ZLIB_FOUND)
! SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
! ELSE(ZLIB_FOUND)
! SET( ZLIB_LIBRARIES )
! ENDIF(ZLIB_FOUND)
- MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
--- 28,40 ----
SET(ZLIB_NAMES z zlib zdll)
FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )
+ MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+
+ # 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)
Index: UseSWIG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseSWIG.cmake,v
retrieving revision 1.17.4.1
retrieving revision 1.17.4.2
diff -C 2 -d -r1.17.4.1 -r1.17.4.2
*** UseSWIG.cmake 1 Oct 2009 21:20:34 -0000 1.17.4.1
--- UseSWIG.cmake 3 Nov 2009 22:25:02 -0000 1.17.4.2
***************
*** 7,11 ****
# All other macros are for internal use only.
# To get the actual name of the swig module,
! # use: ${SWIG_MODULE_name_REAL_NAME}.
# Set Source files properties such as CPLUSPLUS and SWIG_FLAGS to specify
# special behavior of SWIG. Also global CMAKE_SWIG_FLAGS can be used to add
--- 7,11 ----
# All other macros are for internal use only.
# To get the actual name of the swig module,
! # use: ${SWIG_MODULE_${name}_REAL_NAME}.
# Set Source files properties such as CPLUSPLUS and SWIG_FLAGS to specify
# special behavior of SWIG. Also global CMAKE_SWIG_FLAGS can be used to add
***************
*** 15,21 ****
--- 15,26 ----
# The name-specific variable SWIG_MODULE_<name>_EXTRA_DEPS may be used
# to specify extra dependencies for the generated modules.
+ # If the source file generated by swig need some special flag you can use
+ # SET_SOURCE_FILES_PROPERTIES( ${swig_generated_file_fullname}
+ # PROPERTIES COMPILE_FLAGS "-bla")
+
#=============================================================================
# Copyright 2004-2009 Kitware, Inc.
+ # Copyright 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
#
# Distributed under the OSI-approved BSD License (the "License");
***************
*** 49,52 ****
--- 54,60 ----
SET(SWIG_MODULE_${name}_REAL_NAME "${name}")
IF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
+ # when swig is used without the -interface it will produce in the module.py
+ # a 'import _modulename' statement, which implies having a corresponding
+ # _modulename.so (*NIX), _modulename.pyd (Win32).
SET(SWIG_MODULE_${name}_REAL_NAME "_${name}")
ENDIF("x${SWIG_MODULE_${name}_LANGUAGE}x" MATCHES "^xPYTHONx$")
***************
*** 118,121 ****
--- 126,131 ----
IF(CMAKE_SWIG_OUTDIR)
SET(swig_outdir ${CMAKE_SWIG_OUTDIR})
+ # it may not exist, so create it:
+ file(MAKE_DIRECTORY ${CMAKE_SWIG_OUTDIR})
ELSE(CMAKE_SWIG_OUTDIR)
SET(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
***************
*** 204,209 ****
${swig_generated_sources}
${swig_other_sources})
! SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME}
! PROPERTIES PREFIX "")
ENDMACRO(SWIG_ADD_MODULE)
--- 214,244 ----
${swig_generated_sources}
${swig_other_sources})
! STRING(TOLOWER "${language}" swig_lowercase_language)
! IF ("${swig_lowercase_language}" STREQUAL "java")
! IF (APPLE)
! # In java you want:
! # System.loadLibrary("LIBRARY");
! # then JNI will look for a library whose name is platform dependent, namely
! # MacOS : libLIBRARY.jnilib
! # Windows: LIBRARY.dll
! # Linux : libLIBRARY.so
! SET_TARGET_PROPERTIES (${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".jnilib")
! ENDIF (APPLE)
! ENDIF ("${swig_lowercase_language}" STREQUAL "java")
! IF ("${swig_lowercase_language}" STREQUAL "python")
! # this is only needed for the python case where a _modulename.so is generated
! SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
! # Python extension modules on Windows must have the extension ".pyd"
! # instead of ".dll" as of Python 2.5. Older python versions do support
! # this suffix.
! # http://docs.python.org/whatsnew/ports.html#SECTION0001510000000000000000
! # <quote>
! # Windows: .dll is no longer supported as a filename extension for extension modules.
! # .pyd is now the only filename extension that will be searched for.
! # </quote>
! IF(WIN32 AND NOT CYGWIN)
! SET_TARGET_PROPERTIES(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES SUFFIX ".pyd")
! ENDIF(WIN32 AND NOT CYGWIN)
! ENDIF ("${swig_lowercase_language}" STREQUAL "python")
ENDMACRO(SWIG_ADD_MODULE)
Index: CPackDeb.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackDeb.cmake,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C 2 -d -r1.14.2.1 -r1.14.2.2
*** CPackDeb.cmake 1 Oct 2009 21:20:22 -0000 1.14.2.1
--- CPackDeb.cmake 3 Nov 2009 22:25:02 -0000 1.14.2.2
***************
*** 1,5 ****
--- 1,49 ----
+ # - The builtin (binary) CPack Deb generator (Unix only)
+ # CPackDeb may be used to create Deb package using CPack.
+ # CPackDeb is a CPack generator thus it uses the CPACK_XXX variables
+ # used by CPack : http://www.cmake.org/Wiki/CMake:CPackConfiguration
+ #
+ # However CPackRPM has specific features which are controlled by
+ # the specifics CPACK_RPM_XXX variables.You'll find a detailed usage on
+ # the wiki:
+ # http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29
+ # However as a handy reminder here comes the list of specific variables:
+ #
+ # CPACK_DEBIAN_PACKAGE_NAME
+ # Mandatory : YES
+ # Default : CPACK_PACKAGE_NAME (lower case)
+ # The debian package summary
+ # CPACK_DEBIAN_PACKAGE_VERSION
+ # Mandatory : YES
+ # Default : CPACK_PACKAGE_VERSION
+ # The debian package version
+ # CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ # Mandatory : YES
+ # Default : Output of dpkg --print-architecture or i386
+ # The debian package architecture
+ # CPACK_DEBIAN_PACKAGE_DEPENDS
+ # Mandatory : NO
+ # Default : -
+ # May be used to set deb dependencies.
+ # CPACK_DEBIAN_PACKAGE_MAINTAINER
+ # Mandatory : YES
+ # Default : CPACK_PACKAGE_CONTACT
+ # The debian package maintainer
+ # CPACK_DEBIAN_PACKAGE_DESCRIPTION
+ # Mandatory : YES
+ # Default : CPACK_PACKAGE_DESCRIPTION_SUMMARY
+ # The debian package description
+ # CPACK_DEBIAN_PACKAGE_SECTION
+ # Mandatory : YES
+ # Default : 'devel'
+ # The debian package section
+ # CPACK_DEBIAN_PACKAGE_PRIORITY
+ # Mandatory : YES
+ # Default : 'optional'
+ # The debian package priority
#=============================================================================
# Copyright 2007-2009 Kitware, Inc.
+ # Copyright 2007-2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
#
# Distributed under the OSI-approved BSD License (the "License");
Index: FindHDF5.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindHDF5.cmake,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C 2 -d -r1.4.2.1 -r1.4.2.2
*** FindHDF5.cmake 1 Oct 2009 21:20:29 -0000 1.4.2.1
--- FindHDF5.cmake 3 Nov 2009 22:25:02 -0000 1.4.2.2
***************
*** 292,303 ****
# If the HDF5 include directory was found, open H5pubconf.h to determine if
# HDF5 was compiled with parallel IO support
if( HDF5_INCLUDE_DIR )
! file( STRINGS "${HDF5_INCLUDE_DIR}/H5pubconf.h"
! HDF5_HAVE_PARALLEL_DEFINE
! REGEX "HAVE_PARALLEL 1" )
! if( HDF5_HAVE_PARALLEL_DEFINE )
! set( HDF5_IS_PARALLEL TRUE )
! else()
! set( HDF5_IS_PARALLEL FALSE )
endif()
endif()
--- 292,304 ----
# If the HDF5 include directory was found, open H5pubconf.h to determine if
# HDF5 was compiled with parallel IO support
+ set( HDF5_IS_PARALLEL FALSE )
if( HDF5_INCLUDE_DIR )
! if( EXISTS "${HDF5_INCLUDE_DIR}/h5pubconf.h" )
! file( STRINGS "${HDF5_INCLUDE_DIR}/H5pubconf.h"
! HDF5_HAVE_PARALLEL_DEFINE
! REGEX "HAVE_PARALLEL 1" )
! if( HDF5_HAVE_PARALLEL_DEFINE )
! set( HDF5_IS_PARALLEL TRUE )
! endif()
endif()
endif()
Index: readme.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/readme.txt,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C 2 -d -r1.16.2.1 -r1.16.2.2
*** readme.txt 1 Oct 2009 21:20:34 -0000 1.16.2.1
--- readme.txt 3 Nov 2009 22:25:02 -0000 1.16.2.2
***************
*** 89,93 ****
compatible version of the package cannot be found the module should
not report success. The version of the package found should be stored
! in "XXX_VERSION..." version variables docmented by the module.
If the QUIET option is given to the command it will set the variable
--- 89,93 ----
compatible version of the package cannot be found the module should
not report success. The version of the package found should be stored
! in "XXX_VERSION..." version variables documented by the module.
If the QUIET option is given to the command it will set the variable
***************
*** 111,112 ****
--- 111,115 ----
macro, as an example see FindJPEG.cmake.
+ For internal implementation, it's a generally accepted convention that variables starting with
+ underscore are for temporary use only. (variable starting with an underscore
+ are not intended as a reserved prefix).
More information about the Cmake-commits
mailing list