[Cmake-commits] [cmake-commits] king committed CMakeBackwardCompatibilityC.cmake 1.16.16.1 1.16.16.2 CMakeCCompiler.cmake.in 1.22 1.22.2.1 CMakeCCompilerId.c.in 1.6 1.6.2.1 CMakeCXXCompiler.cmake.in 1.22 1.22.2.1 CMakeCXXCompilerId.cpp.in 1.5 1.5.2.1 CMakeCXXInformation.cmake 1.28.2.2 1.28.2.3 CMakeDetermineCCompiler.cmake 1.56.2.1 1.56.2.2 CMakeDetermineCXXCompiler.cmake 1.48.2.1 1.48.2.2 CMakeDetermineCompilerId.cmake 1.19.4.1 1.19.4.2 CMakeDetermineFortranCompiler.cmake 1.26.2.1 1.26.2.2 CMakeForceCompiler.cmake 1.9.4.1 1.9.4.2 CMakeFortranCompiler.cmake.in 1.14 1.14.2.1 CMakeFortranCompilerABI.F 1.1 1.1.2.1 CMakeFortranCompilerId.F.in 1.4.2.1 1.4.2.2 CMakeFortranInformation.cmake 1.23.2.2 1.23.2.3 CMakeGenericSystem.cmake 1.22.2.1 1.22.2.2 CMakeJOMFindMake.cmake NONE 1.1.2.2 CMakePlatformId.h.in 1.3 1.3.2.1 CMakeSystemSpecificInformation.cmake 1.44.2.1 1.44.2.2 CPack.cmake 1.45.2.2 1.45.2.3 CPackRPM.cmake 1.13.2.2 1.13.2.3 CTest.cmake 1.19.2.1 1.19.2.2 CheckTypeSize.c.in NONE 1.5.2.2 CheckTypeSize.cmake 1.32.2.1 1.32.2.2 CheckTypeSizeC.c.in 1.4 NONE CheckTypeSizeMap.cmake.in NONE 1.1.2.2 DartConfiguration.tcl.in 1.11.2.1 1.11.2.2 ExternalProject.cmake 1.11.2.1 1.11.2.2 FindBoost.cmake 1.45.2.3 1.45.2.4 FindCUDA.cmake 1.2.2.4 1.2.2.5 FindCURL.cmake 1.4.4.1 1.4.4.2 FindDCMTK.cmake 1.5.4.1 1.5.4.2 FindGTK2.cmake 1.2.2.1 1.2.2.2 FindGTest.cmake 1.1.2.1 1.1.2.2 FindHDF5.cmake 1.4.2.2 1.4.2.3 FindJNI.cmake 1.41.2.3 1.41.2.4 FindJava.cmake 1.16.14.1 1.16.14.2 FindLibXml2.cmake 1.6.2.1 1.6.2.2 FindLibXslt.cmake 1.3.4.1 1.3.4.2 FindMPI.cmake 1.23.2.2 1.23.2.3 FindOpenSSL.cmake 1.3.2.2 1.3.2.3 FindPythonLibs.cmake 1.43.2.2 1.43.2.3 FindQt4.cmake 1.166.2.4 1.166.2.5 FindRuby.cmake 1.11.2.1 1.11.2.2 FindTclsh.cmake 1.24.2.1 1.24.2.2 FindX11.cmake 1.34.2.1 1.34.2.2 FortranCInterface.cmake 1.19.2.1 1.19.2.2 GetPrerequisites.cmake 1.7.2.1 1.7.2.2 InstallRequiredSystemLibraries.cmake 1.14.2.1 1.14.2.2 KDE3Macros.cmake 1.8.4.1 1.8.4.2 NSIS.template.in 1.38.2.2 1.38.2.3 Qt4ConfigDependentSettings.cmake NONE 1.5.2.2 Qt4Macros.cmake NONE 1.1.2.2 SystemInformation.in 1.2 1.2.14.1 UseQt4.cmake 1.21.2.1 1.21.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 28 16:47:45 EST 2010
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv23913/Modules
Modified Files:
Tag: CMake-2-8
CMakeBackwardCompatibilityC.cmake CMakeCCompiler.cmake.in
CMakeCCompilerId.c.in CMakeCXXCompiler.cmake.in
CMakeCXXCompilerId.cpp.in CMakeCXXInformation.cmake
CMakeDetermineCCompiler.cmake CMakeDetermineCXXCompiler.cmake
CMakeDetermineCompilerId.cmake
CMakeDetermineFortranCompiler.cmake CMakeForceCompiler.cmake
CMakeFortranCompiler.cmake.in CMakeFortranCompilerABI.F
CMakeFortranCompilerId.F.in CMakeFortranInformation.cmake
CMakeGenericSystem.cmake CMakePlatformId.h.in
CMakeSystemSpecificInformation.cmake CPack.cmake
CPackRPM.cmake CTest.cmake CheckTypeSize.cmake
DartConfiguration.tcl.in ExternalProject.cmake FindBoost.cmake
FindCUDA.cmake FindCURL.cmake FindDCMTK.cmake FindGTK2.cmake
FindGTest.cmake FindHDF5.cmake FindJNI.cmake FindJava.cmake
FindLibXml2.cmake FindLibXslt.cmake FindMPI.cmake
FindOpenSSL.cmake FindPythonLibs.cmake FindQt4.cmake
FindRuby.cmake FindTclsh.cmake FindX11.cmake
FortranCInterface.cmake GetPrerequisites.cmake
InstallRequiredSystemLibraries.cmake KDE3Macros.cmake
NSIS.template.in SystemInformation.in UseQt4.cmake
Added Files:
Tag: CMake-2-8
CMakeJOMFindMake.cmake CheckTypeSize.c.in
CheckTypeSizeMap.cmake.in Qt4ConfigDependentSettings.cmake
Qt4Macros.cmake
Removed Files:
Tag: CMake-2-8
CheckTypeSizeC.c.in
Log Message:
CMake 2.8.1-rc1
Index: FindLibXml2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXml2.cmake,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** FindLibXml2.cmake 1 Oct 2009 21:20:30 -0000 1.6.2.1
--- FindLibXml2.cmake 28 Jan 2010 21:47:37 -0000 1.6.2.2
***************
*** 1,3 ****
! # - Try to find LibXml2
# Once done this will define
#
--- 1,3 ----
! # - Try to find the LibXml2 xml processing library
# Once done this will define
#
***************
*** 22,39 ****
# License text for the above reference.)
! IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
! # in cache already
! SET(LibXml2_FIND_QUIETLY TRUE)
! ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
!
! IF (NOT WIN32)
! # use pkg-config to get the directories and then use these values
! # in the FIND_PATH() and FIND_LIBRARY() calls
! FIND_PACKAGE(PkgConfig)
! PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
! SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
! ENDIF (NOT WIN32)
! FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
HINTS
${PC_LIBXML_INCLUDEDIR}
--- 22,32 ----
# License text for the above reference.)
! # use pkg-config to get the directories and then use these values
! # in the FIND_PATH() and FIND_LIBRARY() calls
! FIND_PACKAGE(PkgConfig)
! PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
! SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
! FIND_PATH(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
HINTS
${PC_LIBXML_INCLUDEDIR}
Index: CMakeCXXCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompiler.cmake.in,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C 2 -d -r1.22 -r1.22.2.1
*** CMakeCXXCompiler.cmake.in 19 Sep 2009 14:14:29 -0000 1.22
--- CMakeCXXCompiler.cmake.in 28 Jan 2010 21:47:34 -0000 1.22.2.1
***************
*** 3,8 ****
--- 3,10 ----
SET(CMAKE_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@")
SET(CMAKE_CXX_PLATFORM_ID "@CMAKE_CXX_PLATFORM_ID@")
+ @SET_MSVC_CXX_ARCHITECTURE_ID@
SET(CMAKE_AR "@CMAKE_AR@")
SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
+ SET(CMAKE_LINKER "@CMAKE_LINKER@")
SET(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@)
SET(CMAKE_CXX_COMPILER_LOADED 1)
Index: CMakeGenericSystem.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeGenericSystem.cmake,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C 2 -d -r1.22.2.1 -r1.22.2.2
*** CMakeGenericSystem.cmake 1 Oct 2009 21:20:20 -0000 1.22.2.1
--- CMakeGenericSystem.cmake 28 Jan 2010 21:47:34 -0000 1.22.2.2
***************
*** 89,93 ****
CMAKE_VERBOSE_MAKEFILE
)
-
- # always include the gcc compiler information
- INCLUDE(Platform/gcc)
--- 89,90 ----
Index: CMakeFortranCompilerId.F.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerId.F.in,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
*** CMakeFortranCompilerId.F.in 28 Oct 2009 16:14:54 -0000 1.4.2.1
--- CMakeFortranCompilerId.F.in 28 Jan 2010 21:47:34 -0000 1.4.2.2
***************
*** 9,12 ****
--- 9,14 ----
#elif defined(__G95__)
PRINT *, 'INFO:compiler[G95]'
+ #elif defined(__PATHSCALE__)
+ PRINT *, 'INFO:compiler[PathScale]'
#elif defined(__GNUC__)
PRINT *, 'INFO:compiler[GNU]'
Index: InstallRequiredSystemLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/InstallRequiredSystemLibraries.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
*** InstallRequiredSystemLibraries.cmake 1 Oct 2009 21:20:34 -0000 1.14.2.1
--- InstallRequiredSystemLibraries.cmake 28 Jan 2010 21:47:42 -0000 1.14.2.2
***************
*** 2,10 ****
# will be installed with INSTALL_PROGRAMS into /bin for WIN32 and /lib
# for non-win32. If CMAKE_SKIP_INSTALL_RULES is set to TRUE before including
! # this file, then the INSTALL command is not called. The use can use
# the variable CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS to use a custom install
# command and install them into any directory they want.
# If it is the MSVC compiler, then the microsoft run
! # time libraries will be found add automatically added to the
# CMAKE_INSTALL_DEBUG_LIBRARIES, and installed.
# If CMAKE_INSTALL_DEBUG_LIBRARIES is set and it is the MSVC
--- 2,10 ----
# will be installed with INSTALL_PROGRAMS into /bin for WIN32 and /lib
# for non-win32. If CMAKE_SKIP_INSTALL_RULES is set to TRUE before including
! # this file, then the INSTALL command is not called. The user can use
# the variable CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS to use a custom install
# command and install them into any directory they want.
# If it is the MSVC compiler, then the microsoft run
! # time libraries will be found and automatically added to the
# CMAKE_INSTALL_DEBUG_LIBRARIES, and installed.
# If CMAKE_INSTALL_DEBUG_LIBRARIES is set and it is the MSVC
***************
*** 115,118 ****
--- 115,146 ----
ENDIF(MSVC90)
+ IF(MSVC10)
+ # Find the runtime library redistribution directory.
+ FIND_PATH(MSVC10_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC100.CRT
+ PATHS
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]/../../VC/redist"
+ "${base_dir}/VC/redist"
+ )
+ MARK_AS_ADVANCED(MSVC10_REDIST_DIR)
+ SET(MSVC10_CRT_DIR "${MSVC10_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC100.CRT")
+
+ # Install the manifest that allows DLLs to be loaded from the
+ # directory containing the executable.
+ SET(__install__libs
+ "${MSVC10_CRT_DIR}/Microsoft.VC100.CRT.manifest"
+ "${MSVC10_CRT_DIR}/msvcp100.dll"
+ "${MSVC10_CRT_DIR}/msvcr100.dll"
+ )
+ IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+ SET(MSVC10_CRT_DIR
+ "${MSVC10_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugCRT")
+ SET(__install__libs ${__install__libs}
+ "${MSVC10_CRT_DIR}/Microsoft.VC100.DebugCRT.manifest"
+ "${MSVC10_CRT_DIR}/msvcp100d.dll"
+ "${MSVC10_CRT_DIR}/msvcr100d.dll"
+ )
+ ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+ ENDIF(MSVC10)
+
IF(CMAKE_INSTALL_MFC_LIBRARIES)
IF(MSVC70)
***************
*** 208,211 ****
--- 236,280 ----
ENDIF(MSVC90)
+ IF(MSVC10)
+ IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+ SET(MSVC10_MFC_DIR
+ "${MSVC10_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC100.DebugMFC")
+ SET(__install__libs ${__install__libs}
+ "${MSVC10_MFC_DIR}/Microsoft.VC100.DebugMFC.manifest"
+ "${MSVC10_MFC_DIR}/mfc100d.dll"
+ "${MSVC10_MFC_DIR}/mfc100ud.dll"
+ "${MSVC10_MFC_DIR}/mfcm100d.dll"
+ "${MSVC10_MFC_DIR}/mfcm100ud.dll"
+ )
+ ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
+
+ SET(MSVC10_MFC_DIR "${MSVC10_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC100.MFC")
+ # Install the manifest that allows DLLs to be loaded from the
+ # directory containing the executable.
+ SET(__install__libs ${__install__libs}
+ "${MSVC10_MFC_DIR}/Microsoft.VC100.MFC.manifest"
+ "${MSVC10_MFC_DIR}/mfc100.dll"
+ "${MSVC10_MFC_DIR}/mfc100u.dll"
+ "${MSVC10_MFC_DIR}/mfcm100.dll"
+ "${MSVC10_MFC_DIR}/mfcm100u.dll"
+ )
+ # include the language dll's for vs10 as well as the actuall dll's
+ SET(MSVC10_MFCLOC_DIR "${MSVC10_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC100.MFCLOC")
+ # Install the manifest that allows DLLs to be loaded from the
+ # directory containing the executable.
+ SET(__install__libs ${__install__libs}
+ "${MSVC10_MFCLOC_DIR}/Microsoft.VC100.MFCLOC.manifest"
+ "${MSVC10_MFCLOC_DIR}/mfc100chs.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100cht.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100enu.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100esp.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100deu.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100fra.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100ita.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100jpn.dll"
+ "${MSVC10_MFCLOC_DIR}/mfc100kor.dll"
+ )
+ ENDIF(MSVC10)
+
ENDIF(CMAKE_INSTALL_MFC_LIBRARIES)
Index: ExternalProject.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/ExternalProject.cmake,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C 2 -d -r1.11.2.1 -r1.11.2.2
*** ExternalProject.cmake 1 Oct 2009 21:20:23 -0000 1.11.2.1
--- ExternalProject.cmake 28 Jan 2010 21:47:34 -0000 1.11.2.2
***************
*** 18,21 ****
--- 18,22 ----
# [SVN_REVISION rev] # Revision to checkout from Subversion repo
# [URL /.../src.tgz] # Full path or URL of source
+ # [TIMEOUT seconds] # Time allowed for file download operations
# #--Update/Patch step----------
# [UPDATE_COMMAND cmd...] # Source work-tree update command
***************
*** 204,209 ****
function(_ep_write_downloadfile_script script_filename remote local timeout)
! if(NOT timeout)
! set(timeout 30)
endif()
--- 205,214 ----
function(_ep_write_downloadfile_script script_filename remote local timeout)
! if(timeout)
! set(timeout_args TIMEOUT ${timeout})
! set(timeout_msg "${timeout} seconds")
! else()
! set(timeout_args "# no TIMEOUT")
! set(timeout_msg "none")
endif()
***************
*** 211,220 ****
"message(STATUS \"downloading...
src='${remote}'
! dst='${local}'\")
file(DOWNLOAD
\"${remote}\"
\"${local}\"
! TIMEOUT ${timeout}
STATUS status
LOG log)
--- 216,226 ----
"message(STATUS \"downloading...
src='${remote}'
! dst='${local}'
! timeout='${timeout_msg}'\")
file(DOWNLOAD
\"${remote}\"
\"${local}\"
! ${timeout_args}
STATUS status
LOG log)
***************
*** 695,699 ****
endif()
set(file ${download_dir}/${fname})
! _ep_write_downloadfile_script("${stamp_dir}/download-${name}.cmake" "${url}" "${file}" "")
set(cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-${name}.cmake
COMMAND)
--- 701,706 ----
endif()
set(file ${download_dir}/${fname})
! get_property(timeout TARGET ${name} PROPERTY _EP_TIMEOUT)
! _ep_write_downloadfile_script("${stamp_dir}/download-${name}.cmake" "${url}" "${file}" "${timeout}")
set(cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-${name}.cmake
COMMAND)
Index: CMakePlatformId.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakePlatformId.h.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** CMakePlatformId.h.in 15 Sep 2008 21:53:27 -0000 1.3
--- CMakePlatformId.h.in 28 Jan 2010 21:47:34 -0000 1.3.2.1
***************
*** 83,86 ****
--- 83,109 ----
#endif
+ /* For windows compilers MSVC and Intel we can determine
+ the architecture of the compiler being used. This is becase
+ the compilers do not have flags that can change the architecture,
+ but rather depend on which compiler is being used
+ */
+ #if defined(_WIN32) && defined(_MSC_VER)
+ # if defined(_M_IA64)
+ # define ARCHITECTURE_ID "IA64"
+
+ # elif defined(_M_X64) || defined(_M_AMD64)
+ # define ARCHITECTURE_ID "x64"
+
+ # elif defined(_M_IX86)
+ # define ARCHITECTURE_ID "X86"
+
+ # else /* unknown architecture */
+ # define ARCHITECTURE_ID ""
+ # endif
+
+ #else
+ # define ARCHITECTURE_ID ""
+ #endif
+
/* Construct the string literal in pieces to prevent the source from
getting matched. Store it in a pointer rather than an array
***************
*** 88,89 ****
--- 111,114 ----
array rather than assigning a pointer to a static array. */
char* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]";
+ char* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
+
Index: CMakeForceCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeForceCompiler.cmake,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -C 2 -d -r1.9.4.1 -r1.9.4.2
*** CMakeForceCompiler.cmake 1 Oct 2009 21:20:20 -0000 1.9.4.1
--- CMakeForceCompiler.cmake 28 Jan 2010 21:47:34 -0000 1.9.4.2
***************
*** 17,20 ****
--- 17,27 ----
# information tests.
#
+ # Macro CMAKE_FORCE_Fortran_COMPILER has the following signature:
+ # CMAKE_FORCE_Fortran_COMPILER(<compiler> <compiler-id>)
+ # It sets CMAKE_Fortran_COMPILER to the given compiler and the cmake
+ # internal variable CMAKE_Fortran_COMPILER_ID to the given compiler-id.
+ # It also bypasses the check for working compiler and basic compiler
+ # information tests.
+ #
# So a simple toolchain file could look like this:
# INCLUDE (CMakeForceCompiler)
***************
*** 61,62 ****
--- 68,82 ----
ENDIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
ENDMACRO(CMAKE_FORCE_CXX_COMPILER)
+
+ MACRO(CMAKE_FORCE_Fortran_COMPILER compiler id)
+ SET(CMAKE_Fortran_COMPILER "${compiler}")
+ SET(CMAKE_Fortran_COMPILER_ID_RUN TRUE)
+ SET(CMAKE_Fortran_COMPILER_ID ${id})
+ SET(CMAKE_Fortran_COMPILER_WORKS TRUE)
+ SET(CMAKE_Fortran_COMPILER_FORCED TRUE)
+
+ # Set old compiler id variables.
+ IF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+ SET(CMAKE_COMPILER_IS_GNUG77 1)
+ ENDIF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+ ENDMACRO(CMAKE_FORCE_Fortran_COMPILER)
Index: SystemInformation.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/SystemInformation.in,v
retrieving revision 1.2
retrieving revision 1.2.14.1
diff -C 2 -d -r1.2 -r1.2.14.1
*** SystemInformation.in 27 Feb 2007 14:43:34 -0000 1.2
--- SystemInformation.in 28 Jan 2010 21:47:42 -0000 1.2.14.1
***************
*** 35,40 ****
CMAKE_SHARED_MODULE_C_FLAGS == "${CMAKE_SHARED_MODULE_C_FLAGS}"
CMAKE_SHARED_MODULE_CREATE_C_FLAGS == "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}"
- CMAKE_SHARED_MODULE_RUNTIME_FLAG == "${CMAKE_SHARED_MODULE_RUNTIME_FLAG}"
- CMAKE_SHARED_MODULE_RUNTIME_FLAG_SEP == "${CMAKE_SHARED_MODULE_RUNTIME_FLAG_SEP}"
CMAKE_SHARED_MODULE_LINK_STATIC_C_FLAGS == "${CMAKE_SHARED_MODULE_LINK_STATIC_C_FLAGS}"
CMAKE_SHARED_MODULE_LINK_DYNAMIC_C_FLAGS == "${CMAKE_SHARED_MODULE_LINK_DYNAMIC_C_FLAGS}"
--- 35,38 ----
***************
*** 56,61 ****
CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS == "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS}"
CMAKE_SHARED_MODULE_CXX_FLAGS == "${CMAKE_SHARED_MODULE_CXX_FLAGS}"
- CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG == "${CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG}"
- CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG_SEP == "${CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG_SEP}"
CMAKE_SHARED_MODULE_LINK_STATIC_CXX_FLAGS == "${CMAKE_SHARED_MODULE_LINK_STATIC_CXX_FLAGS}"
CMAKE_SHARED_MODULE_LINK_DYNAMIC_CXX_FLAGS == "${CMAKE_SHARED_MODULE_LINK_DYNAMIC_CXX_FLAGS}"
--- 54,57 ----
Index: FindX11.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindX11.cmake,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -C 2 -d -r1.34.2.1 -r1.34.2.2
*** FindX11.cmake 1 Oct 2009 21:20:33 -0000 1.34.2.1
--- FindX11.cmake 28 Jan 2010 21:47:38 -0000 1.34.2.2
***************
*** 7,10 ****
--- 7,11 ----
# and also the following more fine grained variables:
# Include paths: X11_ICE_INCLUDE_PATH, X11_ICE_LIB, X11_ICE_FOUND
+ # X11_X11_INCLUDE_PATH, X11_X11_LIB
# X11_Xaccessrules_INCLUDE_PATH, X11_Xaccess_FOUND
# X11_Xaccessstr_INCLUDE_PATH, X11_Xaccess_FOUND
Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -C 2 -d -r1.28.2.2 -r1.28.2.3
*** CMakeCXXInformation.cmake 9 Oct 2009 20:11:10 -0000 1.28.2.2
--- CMakeCXXInformation.cmake 28 Jan 2010 21:47:34 -0000 1.28.2.3
***************
*** 115,118 ****
--- 115,126 ----
ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG)
+ IF(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
+ SET(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
+ ENDIF()
+
+ IF(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG)
+ SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
+ ENDIF()
+
IF(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG)
SET(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
***************
*** 148,159 ****
ENDIF(NOT CMAKE_SHARED_MODULE_CXX_FLAGS)
- IF(NOT CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG)
- SET(CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_FLAG})
- ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG)
-
- IF(NOT CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG_SEP)
- SET(CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_FLAG_SEP})
- ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_CXX_FLAG_SEP)
-
# Initialize CXX link type selection flags from C versions.
FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
--- 156,159 ----
Index: CMakeFortranCompilerABI.F
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerABI.F,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** CMakeFortranCompilerABI.F 13 Jul 2009 15:24:01 -0000 1.1
--- CMakeFortranCompilerABI.F 28 Jan 2010 21:47:34 -0000 1.1.2.1
***************
*** 1,3 ****
! PROGRAM CMakeFortranCompilerId
! PRINT *, 'ABI Detection Binary'
END
--- 1,33 ----
! PROGRAM CMakeFortranCompilerABI
! #if 0
! ! Address Size
! #endif
! #if defined(_LP64)
! PRINT *, 'INFO:sizeof_dptr[8]'
! #elif defined(_M_IA64)
! PRINT *, 'INFO:sizeof_dptr[8]'
! #elif defined(_M_X64)
! PRINT *, 'INFO:sizeof_dptr[8]'
! #elif defined(_M_AMD64)
! PRINT *, 'INFO:sizeof_dptr[8]'
!
! #elif defined(_ILP32)
! PRINT *, 'INFO:sizeof_dptr[4]'
! #elif defined(_M_IX86)
! PRINT *, 'INFO:sizeof_dptr[4]'
! #endif
!
! #if 0
! ! Application Binary Interface
! #endif
! #if defined(__sgi) && defined(_ABIO32)
! PRINT *, 'INFO:abi[ELF O32]'
! #elif defined(__sgi) && defined(_ABIN32)
! PRINT *, 'INFO:abi[ELF N32]'
! #elif defined(__sgi) && defined(_ABI64)
! PRINT *, 'INFO:abi[ELF 64]'
! #elif defined(__ELF__)
! PRINT *, 'INFO:abi[ELF]'
! #endif
! PRINT *, 'ABI Detection'
END
Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C 2 -d -r1.19.2.1 -r1.19.2.2
*** CTest.cmake 1 Oct 2009 21:20:22 -0000 1.19.2.1
--- CTest.cmake 28 Jan 2010 21:47:34 -0000 1.19.2.2
***************
*** 1,12 ****
# - Configure a project for testing with CTest/CDash
! # This file configures a project to use the CTest/CDash/Dart
! # testing/dashboard process. This module should be included
! # in the CMakeLists.txt file at the top of a project. Typical usage:
! # INCLUDE(CTest)
! # IF(BUILD_TESTING)
! # # ... testing related CMake code ...
! # ENDIF(BUILD_TESTING)
! # The BUILD_TESTING option is created by the CTest module to determine
! # whether testing support should be enabled. The default is ON.
#=============================================================================
--- 1,48 ----
# - Configure a project for testing with CTest/CDash
! # Include this module in the top CMakeLists.txt file of a project to
! # enable testing with CTest and dashboard submissions to CDash:
! # project(MyProject)
! # ...
! # include(CTest)
! # The module automatically creates a BUILD_TESTING option that selects
! # whether to enable testing support (ON by default). After including
! # the module, use code like
! # if(BUILD_TESTING)
! # # ... CMake code to create tests ...
! # endif()
! # to creating tests when testing is enabled.
! #
! # To enable submissions to a CDash server, create a CTestConfig.cmake
! # file at the top of the project with content such as
! # set(CTEST_PROJECT_NAME "MyProject")
! # set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
! # set(CTEST_DROP_METHOD "http")
! # set(CTEST_DROP_SITE "my.cdash.org")
! # set(CTEST_DROP_LOCATION "/submit.php?project=MyProject")
! # set(CTEST_DROP_SITE_CDASH TRUE)
! # (the CDash server can provide the file to a project administrator
! # who configures 'MyProject').
! # Settings in the config file are shared by both this CTest module and
! # the CTest command-line tool's dashboard script mode (ctest -S).
! #
! # While building a project for submission to CDash, CTest scans the
! # build output for errors and warnings and reports them with
! # surrounding context from the build log. This generic approach works
! # for all build tools, but does not give details about the command
! # invocation that produced a given problem. One may get more detailed
! # reports by adding
! # set(CTEST_USE_LAUNCHERS 1)
! # to the CTestConfig.cmake file. When this option is enabled, the
! # CTest module tells CMake's Makefile generators to invoke every
! # command in the generated build system through a CTest launcher
! # program. (Currently the CTEST_USE_LAUNCHERS option is ignored on
! # non-Makefile generators.) During a manual build each launcher
! # transparently runs the command it wraps. During a CTest-driven
! # build for submission to CDash each launcher reports detailed
! # information when its command fails or warns.
! # (Setting CTEST_USE_LAUNCHERS in CTestConfig.cmake is convenient, but
! # also adds the launcher overhead even for manual builds. One may
! # instead set it in a CTest dashboard script and add it to the CMake
! # cache for the build tree.)
#=============================================================================
***************
*** 85,92 ****
SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT")
- # make program just needs to use CMAKE_MAKE_PROGRAM which is required
- # to be defined by cmake
- SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
-
FIND_PROGRAM(CVSCOMMAND cvs )
SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING
--- 121,124 ----
***************
*** 203,208 ****
SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
ENDIF(NOT BUILDNAME)
! # set the build command
! BUILD_COMMAND(MAKECOMMAND ${MAKEPROGRAM} )
IF(NOT "${CMAKE_GENERATOR}" MATCHES "Make")
--- 235,249 ----
SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
ENDIF(NOT BUILDNAME)
!
! # the build command
! BUILD_COMMAND(MAKECOMMAND CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}")
! SET(MAKECOMMAND ${MAKECOMMAND} CACHE STRING "Command to build the project")
!
! # the default build configuration the ctest build handler will use
! # if there is no -C arg given to ctest:
! SET(DEFAULT_CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
! IF(DEFAULT_CTEST_CONFIGURATION_TYPE STREQUAL "")
! SET(DEFAULT_CTEST_CONFIGURATION_TYPE "Release")
! ENDIF(DEFAULT_CTEST_CONFIGURATION_TYPE STREQUAL "")
IF(NOT "${CMAKE_GENERATOR}" MATCHES "Make")
Index: FindRuby.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindRuby.cmake,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C 2 -d -r1.11.2.1 -r1.11.2.2
*** FindRuby.cmake 1 Oct 2009 21:20:32 -0000 1.11.2.1
--- FindRuby.cmake 28 Jan 2010 21:47:37 -0000 1.11.2.2
***************
*** 153,156 ****
--- 153,157 ----
SET(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
SET(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
+ SET(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
# Now we know which version we found
***************
*** 181,185 ****
# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR ${_RUBY_VERSION_SHORT_NODOT} GREATER 18 OR RUBY_HDR_DIR)
- message(STATUS "lookign for config.h")
FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
NAMES ruby/config.h config.h
--- 182,185 ----
***************
*** 215,222 ****
LIST(APPEND _RUBY_POSSIBLE_LIB_NAMES
! "msvcr${_RUBY_MSVC_RUNTIME}-ruby${RUBY_NODOT_VERSION}"
! "msvcr${_RUBY_MSVC_RUNTIME}-ruby${RUBY_NODOT_VERSION}-static"
! "msvcrt-ruby${RUBY_NODOT_VERSION}"
! "msvcrt-ruby${RUBY_NODOT_VERSION}-static" )
ENDIF(WIN32)
--- 215,222 ----
LIST(APPEND _RUBY_POSSIBLE_LIB_NAMES
! "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
! "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
! "msvcrt-ruby${_RUBY_NODOT_VERSION}"
! "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
ENDIF(WIN32)
Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C 2 -d -r1.24.2.1 -r1.24.2.2
*** FindTclsh.cmake 1 Oct 2009 21:20:33 -0000 1.24.2.1
--- FindTclsh.cmake 28 Jan 2010 21:47:38 -0000 1.24.2.2
***************
*** 21,27 ****
# License text for the above reference.)
! IF(WIN32 AND UNIX)
FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
! ENDIF(WIN32 AND UNIX)
GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
--- 21,27 ----
# License text for the above reference.)
! IF(CYGWIN)
FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
! ENDIF(CYGWIN)
GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -C 2 -d -r1.43.2.2 -r1.43.2.3
*** FindPythonLibs.cmake 28 Oct 2009 16:14:56 -0000 1.43.2.2
--- FindPythonLibs.cmake 28 Jan 2010 21:47:37 -0000 1.43.2.3
***************
*** 45,48 ****
--- 45,56 ----
NO_SYSTEM_ENVIRONMENT_PATH
)
+ # Look for the static library in the Python config directory
+ FIND_LIBRARY(PYTHON_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+ # Avoid finding the .dll in the PATH. We want the .lib.
+ NO_SYSTEM_ENVIRONMENT_PATH
+ # This is where the static library is usually located
+ PATH_SUFFIXES python${_CURRENT_VERSION}/config
+ )
# For backward compatibility, honour value of PYTHON_INCLUDE_PATH, if
Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -C 2 -d -r1.38.2.2 -r1.38.2.3
*** NSIS.template.in 28 Oct 2009 16:14:56 -0000 1.38.2.2
--- NSIS.template.in 28 Jan 2010 21:47:42 -0000 1.38.2.3
***************
*** 75,79 ****
ClearErrors
;Reading component status from registry
! ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" "Installed"
IfErrors "default_${SecName}"
;Status will stay default if registry value not found
--- 75,79 ----
ClearErrors
;Reading component status from registry
! ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" "Installed"
IfErrors "default_${SecName}"
;Status will stay default if registry value not found
***************
*** 108,112 ****
;Calling Section uninstall macro and writing zero installed flag
!insertmacro "Remove_${${SecName}}"
! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" \
"Installed" 0
Goto "exit_${SecName}"
--- 108,112 ----
;Calling Section uninstall macro and writing zero installed flag
!insertmacro "Remove_${${SecName}}"
! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
"Installed" 0
Goto "exit_${SecName}"
***************
*** 114,118 ****
"leave_${SecName}:"
;Section is selected:
! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" \
"Installed" 1
--- 114,118 ----
"leave_${SecName}:"
;Section is selected:
! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
"Installed" 1
***************
*** 485,489 ****
Pop $1
StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
! WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" \
"$1" "$0"
;MessageBox MB_OK "Set Registry: '$1' to '$0'"
--- 485,489 ----
Pop $1
StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
! WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
"$1" "$0"
;MessageBox MB_OK "Set Registry: '$1' to '$0'"
***************
*** 795,809 ****
Section "Uninstall"
ReadRegStr $START_MENU SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "StartMenu"
;MessageBox MB_OK "Start menu is in: $START_MENU"
ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "DoNotAddToPath"
ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "AddToPathAllUsers"
ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "AddToPathCurrentUser"
;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
ReadRegStr $INSTALL_DESKTOP SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "InstallToDesktop"
;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
--- 795,809 ----
Section "Uninstall"
ReadRegStr $START_MENU SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "StartMenu"
;MessageBox MB_OK "Start menu is in: $START_MENU"
ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "DoNotAddToPath"
ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathAllUsers"
ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathCurrentUser"
;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
ReadRegStr $INSTALL_DESKTOP SHCTX \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "InstallToDesktop"
;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
***************
*** 822,826 ****
;Remove the uninstaller itself.
Delete "$INSTDIR\Uninstall.exe"
! DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
;Remove the installation directory if it is empty.
--- 822,826 ----
;Remove the uninstaller itself.
Delete "$INSTDIR\Uninstall.exe"
! DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@"
;Remove the installation directory if it is empty.
Index: CMakeBackwardCompatibilityC.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeBackwardCompatibilityC.cmake,v
retrieving revision 1.16.16.1
retrieving revision 1.16.16.2
diff -C 2 -d -r1.16.16.1 -r1.16.16.2
*** CMakeBackwardCompatibilityC.cmake 1 Oct 2009 21:20:17 -0000 1.16.16.1
--- CMakeBackwardCompatibilityC.cmake 28 Jan 2010 21:47:33 -0000 1.16.16.2
***************
*** 24,27 ****
--- 24,38 ----
IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
+ # Old CMake versions did not support OS X universal binaries anyway,
+ # so just get through this with at least some size for the types.
+ LIST(LENGTH CMAKE_OSX_ARCHITECTURES NUM_ARCHS)
+ IF(${NUM_ARCHS} GREATER 1)
+ IF(NOT DEFINED CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ MESSAGE(WARNING "This module does not work with OS X universal binaries.")
+ SET(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES 1)
+ LIST(GET CMAKE_OSX_ARCHITECTURES 0 CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ ENDIF()
+ ENDIF()
+
INCLUDE (CheckTypeSize)
CHECK_TYPE_SIZE(int CMAKE_SIZEOF_INT)
***************
*** 71,74 ****
--- 82,90 ----
SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL
"Use sproc libs.")
+
+ IF(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ SET(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ ENDIF()
ENDIF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
Index: FortranCInterface.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FortranCInterface.cmake,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C 2 -d -r1.19.2.1 -r1.19.2.2
*** FortranCInterface.cmake 1 Oct 2009 21:20:34 -0000 1.19.2.1
--- FortranCInterface.cmake 28 Jan 2010 21:47:39 -0000 1.19.2.2
***************
*** 101,104 ****
--- 101,108 ----
endif()
+ # Use CMake 2.8.0 behavior for this module regardless of including context.
+ cmake_policy(PUSH)
+ cmake_policy(VERSION 2.8.0)
+
#-----------------------------------------------------------------------------
# Verify that C and Fortran are available.
***************
*** 245,248 ****
--- 249,255 ----
CMAKE_FLAGS -DVERIFY_CXX=${verify_cxx}
-DCMAKE_VERBOSE_MAKEFILE=ON
+ "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
+ "-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}"
+ "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"
OUTPUT_VARIABLE _output)
file(WRITE "${FortranCInterface_BINARY_DIR}/Verify${lang}/output.txt" "${_output}")
***************
*** 274,275 ****
--- 281,285 ----
endif()
endfunction()
+
+ # Restore including context policies.
+ cmake_policy(POP)
Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C 2 -d -r1.23.2.2 -r1.23.2.3
*** CMakeFortranInformation.cmake 9 Oct 2009 20:11:10 -0000 1.23.2.2
--- CMakeFortranInformation.cmake 28 Jan 2010 21:47:34 -0000 1.23.2.3
***************
*** 90,93 ****
--- 90,101 ----
ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG)
+ IF(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
+ SET(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
+ ENDIF()
+
+ IF(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG)
+ SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
+ ENDIF()
+
# repeat for modules
IF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS)
***************
*** 99,110 ****
ENDIF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS)
- IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)
- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG})
- ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)
-
- IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP)
- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP})
- ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP)
-
IF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG)
SET(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG})
--- 107,110 ----
Index: FindDCMTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDCMTK.cmake,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C 2 -d -r1.5.4.1 -r1.5.4.2
*** FindDCMTK.cmake 1 Oct 2009 21:20:23 -0000 1.5.4.1
--- FindDCMTK.cmake 28 Jan 2010 21:47:36 -0000 1.5.4.2
***************
*** 1,3 ****
! # - find DCMTK libraries
#
--- 1,3 ----
! # - find DCMTK libraries and applications
#
***************
*** 10,17 ****
# directories and compiled libraries if you've just compiled it in the
# source tree. Just set it to the root of the tree where you extracted
! # the source.
#=============================================================================
# Copyright 2004-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
--- 10,18 ----
# directories and compiled libraries if you've just compiled it in the
# source tree. Just set it to the root of the tree where you extracted
! # the source (default to /usr/include/dcmtk/)
#=============================================================================
# Copyright 2004-2009 Kitware, Inc.
+ # Copyright 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
#
# Distributed under the OSI-approved BSD License (the "License");
***************
*** 27,38 ****
#
# Written for VXL by Amitha Perera.
#
FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
! ${DCMTK_DIR}/config/include ${DCMTK_DIR}/include
)
FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
! ${DCMTK_DIR}/ofstd/include ${DCMTK_DIR}/include/ofstd
)
--- 28,51 ----
#
# Written for VXL by Amitha Perera.
+ # Upgraded for GDCM by Mathieu Malaterre.
#
+ IF( NOT DCMTK_FOUND )
+ SET( DCMTK_DIR "/usr/include/dcmtk/"
+ CACHE PATH "Root of DCMTK source tree (optional)." )
+ MARK_AS_ADVANCED( DCMTK_DIR )
+ ENDIF( NOT DCMTK_FOUND )
+
+
FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
! ${DCMTK_DIR}/config/include
! ${DCMTK_DIR}/config
! ${DCMTK_DIR}/include
)
FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
! ${DCMTK_DIR}/ofstd/include
! ${DCMTK_DIR}/ofstd
! ${DCMTK_DIR}/include/ofstd
)
***************
*** 48,53 ****
FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
- ${DCMTK_DIR}/dcmdata/include
${DCMTK_DIR}/include/dcmdata
)
--- 61,67 ----
FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
${DCMTK_DIR}/include/dcmdata
+ ${DCMTK_DIR}/dcmdata
+ ${DCMTK_DIR}/dcmdata/include
)
***************
*** 64,67 ****
--- 78,82 ----
FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
${DCMTK_DIR}/dcmimgle/include
+ ${DCMTK_DIR}/dcmimgle
${DCMTK_DIR}/include/dcmimgle
)
***************
*** 76,90 ****
)
FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
! ${DCMTK_DIR}/imagectn/libsrc/Release
! ${DCMTK_DIR}/imagectn/libsrc/
! ${DCMTK_DIR}/imagectn/libsrc/Debug
! )
FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
! ${DCMTK_DIR}/dcmnet/libsrc/Release
! ${DCMTK_DIR}/dcmnet/libsrc/Debug
! ${DCMTK_DIR}/dcmnet/libsrc/
! )
--- 91,106 ----
)
+ # MM: I could not find this library on debian system / dcmtk 3.5.4
FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
! ${DCMTK_DIR}/imagectn/libsrc/Release
! ${DCMTK_DIR}/imagectn/libsrc/
! ${DCMTK_DIR}/imagectn/libsrc/Debug
! )
FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
! ${DCMTK_DIR}/dcmnet/libsrc/Release
! ${DCMTK_DIR}/dcmnet/libsrc/Debug
! ${DCMTK_DIR}/dcmnet/libsrc/
! )
***************
*** 138,143 ****
AND DCMTK_dcmimgle_LIBRARY )
! IF( NOT DCMTK_FOUND )
! SET( DCMTK_DIR "" CACHE PATH "Root of DCMTK source tree (optional)." )
! MARK_AS_ADVANCED( DCMTK_DIR )
! ENDIF( NOT DCMTK_FOUND )
--- 154,182 ----
AND DCMTK_dcmimgle_LIBRARY )
! FIND_PROGRAM(DCMTK_DCMDUMP_EXECUTABLE dcmdump
! ${DCMTK_DIR}/bin
! )
!
! FIND_PROGRAM(DCMTK_DCMDJPEG_EXECUTABLE dcmdjpeg
! ${DCMTK_DIR}/bin
! )
!
! FIND_PROGRAM(DCMTK_DCMDRLE_EXECUTABLE dcmdrle
! ${DCMTK_DIR}/bin
! )
!
! MARK_AS_ADVANCED(
! DCMTK_DCMDUMP_EXECUTABLE
! DCMTK_DCMDJPEG_EXECUTABLE
! DCMTK_DCMDRLE_EXECUTABLE
! DCMTK_config_INCLUDE_DIR
! DCMTK_dcmdata_INCLUDE_DIR
! DCMTK_dcmdata_LIBRARY
! DCMTK_dcmimgle_INCLUDE_DIR
! DCMTK_dcmimgle_LIBRARY
! DCMTK_imagedb_LIBRARY
! DCMTK_dcmnet_LIBRARY
! DCMTK_ofstd_INCLUDE_DIR
! DCMTK_ofstd_LIBRARY
! )
!
Index: CMakeDetermineCompilerId.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerId.cmake,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -C 2 -d -r1.19.4.1 -r1.19.4.2
*** CMakeDetermineCompilerId.cmake 1 Oct 2009 21:20:18 -0000 1.19.4.1
--- CMakeDetermineCompilerId.cmake 28 Jan 2010 21:47:34 -0000 1.19.4.2
***************
*** 58,61 ****
--- 58,63 ----
SET(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE)
SET(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}" PARENT_SCOPE)
+ SET(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}"
+ PARENT_SCOPE)
ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID)
***************
*** 172,176 ****
SET(PLATFORM_ID)
FILE(STRINGS ${file}
! CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 2 REGEX "INFO:")
SET(HAVE_COMPILER_TWICE 0)
FOREACH(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
--- 174,178 ----
SET(PLATFORM_ID)
FILE(STRINGS ${file}
! CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 3 REGEX "INFO:")
SET(HAVE_COMPILER_TWICE 0)
FOREACH(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
***************
*** 186,189 ****
--- 188,195 ----
PLATFORM_ID "${info}")
ENDIF("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*")
+ IF("${info}" MATCHES ".*INFO:arch\\[([^]\"]*)\\].*")
+ STRING(REGEX REPLACE ".*INFO:arch\\[([^]]*)\\].*" "\\1"
+ ARCHITECTURE_ID "${info}")
+ ENDIF("${info}" MATCHES ".*INFO:arch\\[([^]\"]*)\\].*")
ENDFOREACH(info)
***************
*** 192,195 ****
--- 198,202 ----
SET(CMAKE_${lang}_COMPILER_ID "${COMPILER_ID}")
SET(CMAKE_${lang}_PLATFORM_ID "${PLATFORM_ID}")
+ SET(MSVC_${lang}_ARCHITECTURE_ID "${ARCHITECTURE_ID}")
ENDIF(COMPILER_ID AND NOT COMPILER_ID_TWICE)
***************
*** 235,238 ****
--- 242,247 ----
SET(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE)
SET(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}" PARENT_SCOPE)
+ SET(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}"
+ PARENT_SCOPE)
SET(CMAKE_EXECUTABLE_FORMAT "${CMAKE_EXECUTABLE_FORMAT}" PARENT_SCOPE)
ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang)
Index: FindHDF5.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindHDF5.cmake,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C 2 -d -r1.4.2.2 -r1.4.2.3
*** FindHDF5.cmake 3 Nov 2009 22:25:02 -0000 1.4.2.2
--- FindHDF5.cmake 28 Jan 2010 21:47:36 -0000 1.4.2.3
***************
*** 29,33 ****
#
# This module will define the following variables:
! # HDF5_INCLUDE_DIR - Location of the hdf5 includes
# HDF5_DEFINITIONS - Required compiler definitions for HDF5
# HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings.
--- 29,34 ----
#
# This module will define the following variables:
! # HDF5_INCLUDE_DIRS - Location of the hdf5 includes
! # HDF5_INCLUDE_DIR - Location of the hdf5 includes (deprecated)
# HDF5_DEFINITIONS - Required compiler definitions for HDF5
# HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings.
***************
*** 107,111 ****
# Parse a compile line for definitions, includes, library paths, and libraries.
macro( _HDF5_parse_compile_line
! compile_line
include_paths
definitions
--- 108,112 ----
# Parse a compile line for definitions, includes, library paths, and libraries.
macro( _HDF5_parse_compile_line
! compile_line_var
include_paths
definitions
***************
*** 115,119 ****
# Match the include paths
string( REGEX MATCHALL "-I([^\" ]+)" include_path_flags
! "${compile_line}"
)
foreach( IPATH ${include_path_flags} )
--- 116,120 ----
# Match the include paths
string( REGEX MATCHALL "-I([^\" ]+)" include_path_flags
! "${${compile_line_var}}"
)
foreach( IPATH ${include_path_flags} )
***************
*** 124,128 ****
# Match the definitions
! string( REGEX MATCHALL "-D[^ ]*" definition_flags "${compile_line}" )
foreach( DEF ${definition_flags} )
list( APPEND ${definitions} ${DEF} )
--- 125,129 ----
# Match the definitions
! string( REGEX MATCHALL "-D[^ ]*" definition_flags "${${compile_line_var}}" )
foreach( DEF ${definition_flags} )
list( APPEND ${definitions} ${DEF} )
***************
*** 131,135 ****
# Match the library paths
string( REGEX MATCHALL "-L([^\" ]+|\"[^\"]+\")" library_path_flags
! "${compile_line}"
)
--- 132,136 ----
# Match the library paths
string( REGEX MATCHALL "-L([^\" ]+|\"[^\"]+\")" library_path_flags
! "${${compile_line_var}}"
)
***************
*** 144,148 ****
# this is to exclude directory names like xxx-linux/
string( REGEX MATCHALL "[, ]-l([^\", ]+)" library_name_flags
! "${compile_line}" )
# strip the -l from all of the library flags and add to the search list
foreach( LIB ${library_name_flags} )
--- 145,149 ----
# this is to exclude directory names like xxx-linux/
string( REGEX MATCHALL "[, ]-l([^\", ]+)" library_name_flags
! "${${compile_line_var}}" )
# strip the -l from all of the library flags and add to the search list
foreach( LIB ${library_name_flags} )
***************
*** 152,156 ****
endmacro()
! if( HDF5_INCLUDE_DIR AND HDF5_LIBRARIES )
# Do nothing: we already have HDF5_INCLUDE_PATH and HDF5_LIBRARIES in the
# cache, it would be a shame to override them
--- 153,157 ----
endmacro()
! if( HDF5_INCLUDE_DIRS AND HDF5_LIBRARIES )
# Do nothing: we already have HDF5_INCLUDE_PATH and HDF5_LIBRARIES in the
# cache, it would be a shame to override them
***************
*** 180,184 ****
foreach( LANGUAGE ${HDF5_LANGUAGE_BINDINGS} )
if( HDF5_${LANGUAGE}_COMPILE_LINE )
! _HDF5_parse_compile_line( ${HDF5_${LANGUAGE}_COMPILE_LINE}
HDF5_${LANGUAGE}_INCLUDE_FLAGS
HDF5_${LANGUAGE}_DEFINITIONS
--- 181,185 ----
foreach( LANGUAGE ${HDF5_LANGUAGE_BINDINGS} )
if( HDF5_${LANGUAGE}_COMPILE_LINE )
! _HDF5_parse_compile_line( HDF5_${LANGUAGE}_COMPILE_LINE
HDF5_${LANGUAGE}_INCLUDE_FLAGS
HDF5_${LANGUAGE}_DEFINITIONS
***************
*** 210,214 ****
)
mark_as_advanced( HDF5_${LANGUAGE}_INCLUDE_DIR )
! list( APPEND HDF5_INCLUDE_DIR ${HDF5_${LANGUAGE}_INCLUDE_DIR} )
set( HDF5_${LANGUAGE}_LIBRARY_NAMES
--- 211,215 ----
)
mark_as_advanced( HDF5_${LANGUAGE}_INCLUDE_DIR )
! list( APPEND HDF5_INCLUDE_DIRS ${HDF5_${LANGUAGE}_INCLUDE_DIR} )
set( HDF5_${LANGUAGE}_LIBRARY_NAMES
***************
*** 267,272 ****
# process for the language bindings (both the C and C++ bindings depend on
# libz for example). Remove the duplicates.
! if( HDF5_INCLUDE_DIR )
! list( REMOVE_DUPLICATES HDF5_INCLUDE_DIR )
endif()
if( HDF5_LIBRARIES_DEBUG )
--- 268,273 ----
# process for the language bindings (both the C and C++ bindings depend on
# libz for example). Remove the duplicates.
! if( HDF5_INCLUDE_DIRS )
! list( REMOVE_DUPLICATES HDF5_INCLUDE_DIRS )
endif()
if( HDF5_LIBRARIES_DEBUG )
***************
*** 293,299 ****
# 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" )
--- 294,300 ----
# HDF5 was compiled with parallel IO support
set( HDF5_IS_PARALLEL FALSE )
! foreach( _dir HDF5_INCLUDE_DIRS )
! if( EXISTS "${_dir}/H5pubconf.h" )
! file( STRINGS "${_dir}/H5pubconf.h"
HDF5_HAVE_PARALLEL_DEFINE
REGEX "HAVE_PARALLEL 1" )
***************
*** 302,306 ****
endif()
endif()
! endif()
set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
"HDF5 library compiled with parallel IO support" )
--- 303,307 ----
endif()
endif()
! endforeach()
set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
"HDF5 library compiled with parallel IO support" )
***************
*** 311,319 ****
find_package_handle_standard_args( HDF5 DEFAULT_MSG
HDF5_LIBRARIES
! HDF5_INCLUDE_DIR
)
mark_as_advanced(
! HDF5_INCLUDE_DIR
HDF5_LIBRARIES
HDF5_DEFINTIONS
--- 312,320 ----
find_package_handle_standard_args( HDF5 DEFAULT_MSG
HDF5_LIBRARIES
! HDF5_INCLUDE_DIRS
)
mark_as_advanced(
! HDF5_INCLUDE_DIRS
HDF5_LIBRARIES
HDF5_DEFINTIONS
***************
*** 322,323 ****
--- 323,328 ----
HDF5_CXX_COMPILER_EXECUTABLE )
+ # For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
+ # HDF5_INCLUDE_DIRS
+ set( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
+
Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.16.14.1
retrieving revision 1.16.14.2
diff -C 2 -d -r1.16.14.1 -r1.16.14.2
*** FindJava.cmake 1 Oct 2009 21:20:30 -0000 1.16.14.1
--- FindJava.cmake 28 Jan 2010 21:47:37 -0000 1.16.14.2
***************
*** 4,14 ****
# variables:
#
! # JAVA_RUNTIME = the full path to the Java runtime
! # JAVA_COMPILE = the full path to the Java compiler
! # JAVA_ARCHIVE = the full path to the Java archiver
#
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
--- 4,35 ----
# variables:
#
! # Java_JAVA_EXECUTABLE = the full path to the Java runtime
! # Java_JAVAC_EXECUTABLE = the full path to the Java compiler
! # Java_JAR_EXECUTABLE = the full path to the Java archiver
! # Java_VERSION_STRING = Version of the package found (java version), eg. 1.6.0_12
! # Java_VERSION_MAJOR = The major version of the package found.
! # Java_VERSION_MINOR = The minor version of the package found.
! # Java_VERSION_PATCH = The patch version of the package found.
! # Java_VERSION_TWEAK = The tweak version of the package found (after '_')
! # Java_VERSION = This is set to: $major.$minor.$patch(.$tweak)
! #
! # NOTE: ${Java_VERSION} and ${Java_VERSION_STRING} are not guaranteed to be
! # identical. For example some java version may return:
! # Java_VERSION_STRING = 1.5.0_17
! # and
! # Java_VERSION = 1.5.0.17
! #
! # another example is the Java OEM, with:
! # Java_VERSION_STRING = 1.6.0-oem
! # and
! # Java_VERSION = 1.6.0
#
+ # NOTE: At the moment this script will look for javac and jar component,
+ # which means it will fail if javac or jar is not found.:w
+ # See Bug #9840
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
+ # Copyright 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
#
# Distributed under the OSI-approved BSD License (the "License");
***************
*** 22,39 ****
# License text for the above reference.)
! SET(JAVA_BIN_PATH
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
! "[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
/usr/share/java/bin
- /usr/local/bin
/usr/local/java/bin
/usr/local/java/share/bin
--- 43,63 ----
# License text for the above reference.)
! # The HINTS option should only be used for values computed from the system.
! SET(_JAVA_HINTS
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
! "[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
! )
! # Hard-coded guesses should still go in PATHS. This ensures that the user
! # environment can always override hard guesses.
! SET(_JAVA_PATHS
/usr/lib/java/bin
/usr/share/java/bin
/usr/local/java/bin
/usr/local/java/share/bin
***************
*** 44,65 ****
/opt/sun-jdk-1.5.0.04/bin
)
! FIND_PROGRAM(JAVA_RUNTIME
NAMES java
! PATHS ${JAVA_BIN_PATH}
)
! FIND_PROGRAM(JAVA_ARCHIVE
NAMES jar
! PATHS ${JAVA_BIN_PATH}
)
! FIND_PROGRAM(JAVA_COMPILE
NAMES javac
! PATHS ${JAVA_BIN_PATH}
)
! MARK_AS_ADVANCED(
! JAVA_RUNTIME
! JAVA_ARCHIVE
! JAVA_COMPILE
)
--- 68,168 ----
/opt/sun-jdk-1.5.0.04/bin
)
! FIND_PROGRAM(Java_JAVA_EXECUTABLE
NAMES java
! HINTS ${_JAVA_HINTS}
! PATHS ${_JAVA_PATHS}
)
! IF(Java_JAVA_EXECUTABLE)
! set(_java_version_acceptable TRUE)
! EXECUTE_PROCESS(COMMAND ${Java_JAVA_EXECUTABLE} -version
! RESULT_VARIABLE res
! OUTPUT_VARIABLE var
! ERROR_VARIABLE var # sun-java output to stderr
! OUTPUT_STRIP_TRAILING_WHITESPACE
! ERROR_STRIP_TRAILING_WHITESPACE)
! IF( res )
! MESSAGE( FATAL_ERROR "Error executing java -version" )
! ELSE()
! # extract major/minor version and patch level from "java -version" output
! # Tested on linux using
! # 1. Sun / Sun OEM
! # 2. OpenJDK 1.6
! # 3. GCJ 1.5
! # 4. Kaffe 1.4.2
! IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_]+[oem-]*\".*")
! # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
! STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_]+)[oem-]*\".*"
! "\\1" Java_VERSION_STRING "${var}" )
! ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
! # Kaffe style
! STRING( REGEX REPLACE "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+).*"
! "\\1" Java_VERSION_STRING "${var}" )
! ELSE()
! IF(NOT Java_FIND_QUIETLY)
! message(WARNING "regex not supported: ${var}. Please report")
! set(_java_version_acceptable FALSE)
! ENDIF(NOT Java_FIND_QUIETLY)
! ENDIF()
! STRING( REGEX REPLACE "([0-9]+).*" "\\1" Java_VERSION_MAJOR "${Java_VERSION_STRING}" )
! STRING( REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_MINOR "${Java_VERSION_STRING}" )
! STRING( REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_PATCH "${Java_VERSION_STRING}" )
! # warning tweak version can be empty:
! STRING( REGEX REPLACE "[0-9]+\\.[0-9]+\\.[0-9]+\\_?([0-9]*)$" "\\1" Java_VERSION_TWEAK "${Java_VERSION_STRING}" )
! if( Java_VERSION_TWEAK STREQUAL "" ) # check case where tweak is not defined
! set(Java_VERSION ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH})
! else( )
! set(Java_VERSION ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH}.${Java_VERSION_TWEAK})
! endif( )
! # display info
! #MESSAGE( STATUS "Java version ${Java_VERSION_STRING} configured successfully!" ) # keep me, used for debug
! IF(NOT Java_FIND_QUIETLY)
! MESSAGE( STATUS "Java version ${Java_VERSION} configured successfully!" )
! ENDIF(NOT Java_FIND_QUIETLY)
! ENDIF()
!
! # check version if requested:
! if( Java_FIND_VERSION )
! if("${Java_VERSION}" VERSION_LESS "${Java_FIND_VERSION}")
! set(_java_version_acceptable FALSE)
! endif("${Java_VERSION}" VERSION_LESS "${Java_FIND_VERSION}")
! if( Java_FIND_VERSION_EXACT )
! if("${Java_VERSION}" VERSION_GREATER "${Java_FIND_VERSION}")
! set(_java_version_acceptable FALSE)
! endif("${Java_VERSION}" VERSION_GREATER "${Java_FIND_VERSION}")
! endif( Java_FIND_VERSION_EXACT )
! endif( Java_FIND_VERSION )
! ENDIF(Java_JAVA_EXECUTABLE)
!
!
! FIND_PROGRAM(Java_JAR_EXECUTABLE
NAMES jar
! HINTS ${_JAVA_HINTS}
! PATHS ${_JAVA_PATHS}
)
! FIND_PROGRAM(Java_JAVAC_EXECUTABLE
NAMES javac
! HINTS ${_JAVA_HINTS}
! PATHS ${_JAVA_PATHS}
)
! include(FindPackageHandleStandardArgs)
! find_package_handle_standard_args(Java DEFAULT_MSG
! Java_JAVA_EXECUTABLE
! Java_JAR_EXECUTABLE
! Java_JAVAC_EXECUTABLE
! _java_version_acceptable
)
+
+ MARK_AS_ADVANCED(
+ Java_JAVA_EXECUTABLE
+ Java_JAR_EXECUTABLE
+ Java_JAVAC_EXECUTABLE
+ )
+
+ # LEGACY
+ SET(JAVA_RUNTIME ${Java_JAVA_EXECUTABLE})
+ SET(JAVA_ARCHIVE ${Java_JAR_EXECUTABLE})
+ SET(JAVA_COMPILE ${Java_JAVAC_EXECUTABLE})
+
Index: KDE3Macros.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/KDE3Macros.cmake,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -C 2 -d -r1.8.4.1 -r1.8.4.2
*** KDE3Macros.cmake 1 Oct 2009 21:20:34 -0000 1.8.4.1
--- KDE3Macros.cmake 28 Jan 2010 21:47:42 -0000 1.8.4.2
***************
*** 323,327 ****
FILE(APPEND ${_laname} "dlname='${_soname}'\n")
FILE(APPEND ${_laname} "# Names of this library\n")
! FILE(APPEND ${_laname} "library_names='${_soname} ${_soname} ${_soname}'\n")
FILE(APPEND ${_laname} "# The name of the static archive\n")
FILE(APPEND ${_laname} "old_library=''\n")
--- 323,331 ----
FILE(APPEND ${_laname} "dlname='${_soname}'\n")
FILE(APPEND ${_laname} "# Names of this library\n")
! IF(CYGWIN)
! FILE(APPEND ${_laname} "library_names='${_soname}'\n")
! ELSE(CYGWIN)
! FILE(APPEND ${_laname} "library_names='${_soname} ${_soname} ${_soname}'\n")
! ENDIF(CYGWIN)
FILE(APPEND ${_laname} "# The name of the static archive\n")
FILE(APPEND ${_laname} "old_library=''\n")
Index: CheckTypeSize.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckTypeSize.cmake,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -C 2 -d -r1.32.2.1 -r1.32.2.2
*** CheckTypeSize.cmake 1 Oct 2009 21:20:23 -0000 1.32.2.1
--- CheckTypeSize.cmake 28 Jan 2010 21:47:34 -0000 1.32.2.2
***************
*** 1,15 ****
# - Check sizeof a type
# CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY])
! # Check if the type exists and determine size of type. if the type
! # exists, the size will be stored to the variable. This also
! # calls check_include_file for sys/types.h stdint.h
! # and stddef.h, setting HAVE_SYS_TYPES_H, HAVE_STDINT_H,
! # and HAVE_STDDEF_H. This is because many types are stored
! # in these include files.
! # VARIABLE - variable to store size if the type exists.
! # HAVE_${VARIABLE} - does the variable exists or not
! # BUILTIN_TYPES_ONLY - The third argument is optional and if
! # it is set to the string BUILTIN_TYPES_ONLY
! # this macro will not check for any header files.
# The following variables may be set before calling this macro to
# modify the way the check is run:
--- 1,28 ----
# - Check sizeof a type
# CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY])
! # Check if the type exists and determine its size.
! # On return, "HAVE_${VARIABLE}" holds the existence of the type,
! # and "${VARIABLE}" holds one of the following:
! # <size> = type has non-zero size <size>
! # "0" = type has arch-dependent size (see below)
! # "" = type does not exist
! # Furthermore, the variable "${VARIABLE}_CODE" holds C preprocessor
! # code to define the macro "${VARIABLE}" to the size of the type, or
! # leave the macro undefined if the type does not exist.
! #
! # The variable "${VARIABLE}" may be "0" when CMAKE_OSX_ARCHITECTURES
! # has multiple architectures for building OS X universal binaries.
! # This indicates that the type size varies across architectures.
! # In this case "${VARIABLE}_CODE" contains C preprocessor tests
! # mapping from each architecture macro to the corresponding type size.
! # The list of architecture macros is stored in "${VARIABLE}_KEYS", and
! # the value for each key is stored in "${VARIABLE}-${KEY}".
! #
! # If the BUILTIN_TYPES_ONLY option is not given, the macro checks for
! # headers <sys/types.h>, <stdint.h>, and <stddef.h>, and saves results
! # in HAVE_SYS_TYPES_H, HAVE_STDINT_H, and HAVE_STDDEF_H. The type
! # size check automatically includes the available headers, thus
! # supporting checks of types defined in the headers.
! #
# The following variables may be set before calling this macro to
# modify the way the check is run:
***************
*** 19,25 ****
# CMAKE_REQUIRED_INCLUDES = list of include directories
# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
!
! # These variables are referenced in CheckTypeSizeC.c so we have
! # to check for them.
#=============================================================================
--- 32,36 ----
# CMAKE_REQUIRED_INCLUDES = list of include directories
# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
! # CMAKE_EXTRA_INCLUDE_FILES = list of extra headers to include
#=============================================================================
***************
*** 38,117 ****
include(CheckIncludeFile)
! MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
! IF(NOT "${ARGV2}" STREQUAL "BUILTIN_TYPES_ONLY")
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stddef.h HAVE_STDDEF_H)
! ENDIF(NOT "${ARGV2}" STREQUAL "BUILTIN_TYPES_ONLY")
!
! IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
! MESSAGE(STATUS "Check size of ${TYPE}")
! SET(CHECK_TYPE_SIZE_TYPE "${TYPE}")
! SET(MACRO_CHECK_TYPE_SIZE_FLAGS
! "${CMAKE_REQUIRED_FLAGS}")
! FOREACH(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H)
! IF("${def}")
! SET(MACRO_CHECK_TYPE_SIZE_FLAGS
! "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
! ENDIF("${def}")
! ENDFOREACH(def)
! SET(CHECK_TYPE_SIZE_PREINCLUDE)
! SET(CHECK_TYPE_SIZE_PREMAIN)
! SET(CHECK_TYPE_SIZE_ADD_LIBRARIES)
! SET(CHECK_TYPE_SIZE_ADD_INCLUDES)
!
! FOREACH(def ${CMAKE_EXTRA_INCLUDE_FILES})
! SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")
! ENDFOREACH(def)
! IF(CMAKE_REQUIRED_LIBRARIES)
! SET(CHECK_TYPE_SIZE_ADD_LIBRARIES
! "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
! ENDIF(CMAKE_REQUIRED_LIBRARIES)
! IF(CMAKE_REQUIRED_INCLUDES)
! SET(CHECK_TYPE_SIZE_ADD_INCLUDES
! "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
! ENDIF(CMAKE_REQUIRED_INCLUDES)
!
! CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CheckTypeSizeC.c.in"
! "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSizeC.c" IMMEDIATE @ONLY)
! FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSizeC.c"
! CHECK_TYPE_SIZE_FILE_CONTENT)
! TRY_COMPILE(HAVE_${VARIABLE}
! ${CMAKE_BINARY_DIR}
! "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSizeC.c"
! COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
! CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
! "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
! "${CHECK_TYPE_SIZE_ADD_INCLUDES}"
! OUTPUT_VARIABLE OUTPUT
! COPY_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize.bin" )
! IF(HAVE_${VARIABLE})
! FILE(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize.bin"
! CMAKE_CHECKTYPESIZE_STRINGS LIMIT_COUNT 2 REGEX "INFO:sizeof")
! SET(CMAKE_CHECKTYPESIZE_FIRST_RESULT "FIRST_LOOP")
! FOREACH(info ${CMAKE_CHECKTYPESIZE_STRINGS})
! IF("${info}" MATCHES ".*INFO:sizeof\\[0*([^]]*)\\].*")
! STRING(REGEX REPLACE ".*INFO:sizeof\\[0*([^]]*)\\].*" "\\1" ${VARIABLE} "${info}")
! ENDIF("${info}" MATCHES ".*INFO:sizeof\\[0*([^]]*)\\].*")
! IF("${CMAKE_CHECKTYPESIZE_FIRST_RESULT}" STREQUAL "FIRST_LOOP")
! SET(CMAKE_CHECKTYPESIZE_FIRST_RESULT "${${VARIABLE}}")
! ENDIF("${CMAKE_CHECKTYPESIZE_FIRST_RESULT}" STREQUAL "FIRST_LOOP")
! IF(NOT "${CMAKE_CHECKTYPESIZE_FIRST_RESULT}" STREQUAL "${${VARIABLE}}")
! MESSAGE(SEND_ERROR "CHECK_TYPE_SIZE found different results, consider setting CMAKE_OSX_ARCHITECTURES or CMAKE_TRY_COMPILE_OSX_ARCHITECTURES to one or no architecture !")
! ENDIF(NOT "${CMAKE_CHECKTYPESIZE_FIRST_RESULT}" STREQUAL "${${VARIABLE}}")
! ENDFOREACH(info ${CMAKE_CHECKTYPESIZE_STRINGS})
! MESSAGE(STATUS "Check size of ${TYPE} - done")
! FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
! "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n")
! ELSE(HAVE_${VARIABLE})
! MESSAGE(STATUS "Check size of ${TYPE} - failed")
! FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
! "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\nCheckTypeSizeC.c:\n${CHECK_TYPE_SIZE_FILE_CONTENT}\n\n")
! SET(${VARIABLE})
! ENDIF(HAVE_${VARIABLE})
! SET(${VARIABLE} "${${VARIABLE}}" CACHE INTERNAL "Result of CHECK_TYPE_SIZE" FORCE)
! ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
! ENDMACRO(CHECK_TYPE_SIZE)
--- 49,191 ----
include(CheckIncludeFile)
! cmake_policy(PUSH)
! cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
!
! get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
!
! #-----------------------------------------------------------------------------
! # Helper function. DO NOT CALL DIRECTLY.
! function(__check_type_size_impl type var map builtin)
! message(STATUS "Check size of ${type}")
!
! # Include header files.
! set(headers)
! if(builtin)
! if(HAVE_SYS_TYPES_H)
! set(headers "${headers}#include <sys/types.h>\n")
! endif()
! if(HAVE_STDINT_H)
! set(headers "${headers}#include <stdint.h>\n")
! endif()
! if(HAVE_STDDEF_H)
! set(headers "${headers}#include <stddef.h>\n")
! endif()
! endif()
! foreach(h ${CMAKE_EXTRA_INCLUDE_FILES})
! set(headers "${headers}#include \"${h}\"\n")
! endforeach()
!
! # Perform the check.
! set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
! set(bin ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.bin)
! configure_file(${__check_type_size_dir}/CheckTypeSize.c.in ${src} @ONLY)
! try_compile(HAVE_${var} ${CMAKE_BINARY_DIR} ${src}
! COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
! CMAKE_FLAGS
! "-DCOMPILE_DEFINITIONS:STRING=${CMAKE_REQUIRED_FLAGS}"
! "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
! "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
! OUTPUT_VARIABLE output
! COPY_FILE ${bin}
! )
!
! if(HAVE_${var})
! # The check compiled. Load information from the binary.
! file(STRINGS ${bin} strings LIMIT_COUNT 10 REGEX "INFO:size")
!
! # Parse the information strings.
! set(regex_size ".*INFO:size\\[0*([^]]*)\\].*")
! set(regex_key " key\\[([^]]*)\\]")
! set(keys)
! set(code)
! set(mismatch)
! set(first 1)
! foreach(info ${strings})
! if("${info}" MATCHES "${regex_size}")
! # Get the type size.
! string(REGEX REPLACE "${regex_size}" "\\1" size "${info}")
! if(first)
! set(${var} ${size})
! elseif(NOT "${size}" STREQUAL "${${var}}")
! set(mismatch 1)
! endif()
! set(first 0)
!
! # Get the architecture map key.
! string(REGEX MATCH "${regex_key}" key "${info}")
! string(REGEX REPLACE "${regex_key}" "\\1" key "${key}")
! if(key)
! set(code "${code}\nset(${var}-${key} \"${size}\")")
! list(APPEND keys ${key})
! endif()
! endif()
! endforeach()
!
! # Update the architecture-to-size map.
! if(mismatch AND keys)
! configure_file(${__check_type_size_dir}/CheckTypeSizeMap.cmake.in ${map} @ONLY)
! set(${var} 0)
! else()
! file(REMOVE ${map})
! endif()
!
! if(mismatch AND NOT keys)
! message(SEND_ERROR "CHECK_TYPE_SIZE found different results, consider setting CMAKE_OSX_ARCHITECTURES or CMAKE_TRY_COMPILE_OSX_ARCHITECTURES to one or no architecture !")
! endif()
!
! message(STATUS "Check size of ${type} - done")
! file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
! "Determining size of ${type} passed with the following output:\n${output}\n\n")
! set(${var} "${${var}}" CACHE INTERNAL "CHECK_TYPE_SIZE: sizeof(${type})")
! else(HAVE_${var})
! # The check failed to compile.
! message(STATUS "Check size of ${type} - failed")
! file(READ ${src} content)
! file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
! "Determining size of ${type} failed with the following output:\n${output}\n${src}:\n${content}\n\n")
! set(${var} "" CACHE INTERNAL "CHECK_TYPE_SIZE: ${type} unknown")
! file(REMOVE ${map})
! endif(HAVE_${var})
! endfunction()
!
! #-----------------------------------------------------------------------------
! macro(CHECK_TYPE_SIZE TYPE VARIABLE)
! # Optionally check for standard headers.
! if("${ARGV2}" STREQUAL "BUILTIN_TYPES_ONLY")
! set(_builtin 0)
! else()
! set(_builtin 1)
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stddef.h HAVE_STDDEF_H)
! endif()
! # Compute or load the size or size map.
! set(${VARIABLE}_KEYS)
! set(_map_file ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${VARIABLE}.cmake)
! if(NOT DEFINED HAVE_${VARIABLE})
! __check_type_size_impl(${TYPE} ${VARIABLE} ${_map_file} ${_builtin})
! endif()
! include(${_map_file} OPTIONAL)
! set(_map_file)
! set(_builtin)
! # Create preprocessor code.
! if(${VARIABLE}_KEYS)
! set(${VARIABLE}_CODE)
! set(_if if)
! foreach(key ${${VARIABLE}_KEYS})
! set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#${_if} defined(${key})\n# define ${VARIABLE} ${${VARIABLE}-${key}}\n")
! set(_if elif)
! endforeach()
! set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#else\n# error ${VARIABLE} unknown\n#endif")
! set(_if)
! elseif(${VARIABLE})
! set(${VARIABLE}_CODE "#define ${VARIABLE} ${${VARIABLE}}")
! else()
! set(${VARIABLE}_CODE "/* #undef ${VARIABLE} */")
! endif()
! endmacro()
! #-----------------------------------------------------------------------------
! cmake_policy(POP)
Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -C 2 -d -r1.48.2.1 -r1.48.2.2
*** CMakeDetermineCXXCompiler.cmake 1 Oct 2009 21:20:18 -0000 1.48.2.1
--- CMakeDetermineCXXCompiler.cmake 28 Jan 2010 21:47:34 -0000 1.48.2.2
***************
*** 177,181 ****
INCLUDE(CMakeFindBinUtils)
!
# configure all variables set in this file
CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCXXCompiler.cmake.in
--- 177,184 ----
INCLUDE(CMakeFindBinUtils)
! IF(MSVC_CXX_ARCHITECTURE_ID)
! SET(SET_MSVC_CXX_ARCHITECTURE_ID
! "SET(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID})")
! ENDIF(MSVC_CXX_ARCHITECTURE_ID)
# configure all variables set in this file
CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCXXCompiler.cmake.in
Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C 2 -d -r1.21.2.1 -r1.21.2.2
*** UseQt4.cmake 1 Oct 2009 21:20:34 -0000 1.21.2.1
--- UseQt4.cmake 28 Jan 2010 21:47:42 -0000 1.21.2.2
***************
*** 24,30 ****
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
- IF(Q_WS_MAC AND QT_USE_FRAMEWORKS)
- INCLUDE_DIRECTORIES(${QT_QTCORE_LIBRARY})
- ENDIF(Q_WS_MAC AND QT_USE_FRAMEWORKS)
SET(QT_LIBRARIES "")
--- 24,27 ----
***************
*** 81,85 ****
INCLUDE_DIRECTORIES(${QT_${module}_INCLUDE_DIR})
ENDIF(QT_USE_${module})
! SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
SET(QT_USE_${depend_module}_DEPENDS 1)
--- 78,85 ----
INCLUDE_DIRECTORIES(${QT_${module}_INCLUDE_DIR})
ENDIF(QT_USE_${module})
! SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY})
! IF(QT_IS_STATIC)
! SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
! ENDIF(QT_IS_STATIC)
FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
SET(QT_USE_${depend_module}_DEPENDS 1)
Index: CMakeDetermineCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCCompiler.cmake,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -C 2 -d -r1.56.2.1 -r1.56.2.2
*** CMakeDetermineCCompiler.cmake 1 Oct 2009 21:20:18 -0000 1.56.2.1
--- CMakeDetermineCCompiler.cmake 28 Jan 2010 21:47:34 -0000 1.56.2.2
***************
*** 172,181 ****
INCLUDE(CMakeFindBinUtils)
!
# configure variables set in this file for fast reload later on
CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
"${CMAKE_PLATFORM_ROOT_BIN}/CMakeCCompiler.cmake"
@ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0
! )
!
SET(CMAKE_C_COMPILER_ENV_VAR "CC")
--- 172,183 ----
INCLUDE(CMakeFindBinUtils)
! IF(MSVC_C_ARCHITECTURE_ID)
! SET(SET_MSVC_C_ARCHITECTURE_ID
! "SET(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID})")
! ENDIF(MSVC_C_ARCHITECTURE_ID)
# configure variables set in this file for fast reload later on
CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
"${CMAKE_PLATFORM_ROOT_BIN}/CMakeCCompiler.cmake"
@ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0
! )
SET(CMAKE_C_COMPILER_ENV_VAR "CC")
--- NEW FILE: CMakeJOMFindMake.cmake ---
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
SET (CMAKE_MAKE_PROGRAM "jom" CACHE STRING
"Program used to build from makefiles.")
MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.45.2.2
retrieving revision 1.45.2.3
diff -C 2 -d -r1.45.2.2 -r1.45.2.3
*** CPack.cmake 13 Nov 2009 14:07:10 -0000 1.45.2.2
--- CPack.cmake 28 Jan 2010 21:47:34 -0000 1.45.2.3
***************
*** 108,111 ****
--- 108,171 ----
# list of patterns, e.g., /CVS/;/\\.svn/;\\.swp$;\\.#;/#;.*~;cscope.*
#
+ # The following variables are specific to the DragNDrop installers
+ # built on Mac OS X:
+ #
+ # CPACK_DMG_VOLUME_NAME - The volume name of the generated disk
+ # image. Defaults to CPACK_PACKAGE_FILE_NAME.
+ #
+ # CPACK_DMG_FORMAT - The disk image format. Common values are UDRO
+ # (UDIF read-only), UDZO (UDIF zlib-compressed) or UDBZ (UDIF
+ # bzip2-compressed). Refer to hdiutil(1) for more information on
+ # other available formats.
+ #
+ # CPACK_DMG_DS_STORE - Path to a custom .DS_Store file which e.g.
+ # can be used to specify the Finder window position/geometry and
+ # layout (such as hidden toolbars, placement of the icons etc.).
+ # This file has to be generated by the Finder (either manually or
+ # through OSA-script) using a normal folder from which the .DS_Store
+ # file can then be extracted.
+ #
+ # CPACK_DMG_BACKGROUND_IMAGE - Path to an image file which is to be
+ # used as the background for the Finder Window when the disk image
+ # is opened. By default no background image is set. The background
+ # image is applied after applying the custom .DS_Store file.
+ #
+ # CPACK_COMMAND_HDIUTIL - Path to the hdiutil(1) command used to
+ # operate on disk image files on Mac OS X. This variable can be used
+ # to override the automatically detected command (or specify its
+ # location if the auto-detection fails to find it.)
+ #
+ # CPACK_COMMAND_SETFILE - Path to the SetFile(1) command used to set
+ # extended attributes on files and directories on Mac OS X. This
+ # variable can be used to override the automatically detected
+ # command (or specify its location if the auto-detection fails to
+ # find it.)
+ #
+ # CPACK_COMMAND_REZ - Path to the Rez(1) command used to compile
+ # resources on Mac OS X. This variable can be used to override the
+ # automatically detected command (or specify its location if the
+ # auto-detection fails to find it.)
+ #
+ # Installers built on Mac OS X using the Bundle generator use the
+ # aforementioned DragNDrop variables, plus the following Bundle-specific
+ # parameters:
+ #
+ # CPACK_BUNDLE_NAME - The name of the generated bundle. This
+ # appears in the OSX finder as the bundle name. Required.
+ #
+ # CPACK_BUNDLE_PLIST - Path to an OSX plist file that will be used
+ # as the Info.plist for the generated bundle. This assumes that
+ # the caller has generated or specified their own Info.plist file.
+ # Required.
+ #
+ # CPACK_BUNDLE_ICON - Path to an OSX icns file that will be used as
+ # the icon for the generated bundle. This is the icon that appears
+ # in the OSX finder for the bundle, and in the OSX dock when the
+ # bundle is opened. Required.
+ #
+ # CPACK_BUNDLE_STARTUP_SCRIPT - Path to an executable or script that
+ # will be run whenever an end-user double-clicks the generated bundle
+ # in the OSX Finder. Optional.
+ #
# The following variables are specific to the graphical installers built
# on Windows using the Nullsoft Installation System.
Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -C 2 -d -r1.41.2.3 -r1.41.2.4
*** FindJNI.cmake 3 Nov 2009 22:25:02 -0000 1.41.2.3
--- FindJNI.cmake 28 Jan 2010 21:47:36 -0000 1.41.2.4
***************
*** 6,9 ****
--- 6,10 ----
# JNI_INCLUDE_DIRS = the include dirs to use
# JNI_LIBRARIES = the libraries to use
+ # JNI_FOUND = TRUE if JNI headers and libraries were found.
# JAVA_AWT_LIBRARY = the path to the jawt library
# JAVA_JVM_LIBRARY = the path to the jvm library
***************
*** 207,210 ****
--- 208,215 ----
)
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI DEFAULT_MSG JAVA_AWT_LIBRARY JAVA_JVM_LIBRARY
+ JAVA_INCLUDE_PATH JAVA_INCLUDE_PATH2 JAVA_AWT_INCLUDE_PATH)
+
MARK_AS_ADVANCED(
JAVA_AWT_LIBRARY
--- CheckTypeSizeC.c.in DELETED ---
--- NEW FILE: CheckTypeSize.c.in ---
@headers@
#undef KEY
#if defined(__i386)
# define KEY '_','_','i','3','8','6'
#elif defined(__x86_64)
# define KEY '_','_','x','8','6','_','6','4'
#elif defined(__ppc__)
# define KEY '_','_','p','p','c','_','_'
#elif defined(__ppc64__)
# define KEY '_','_','p','p','c','6','4','_','_'
#endif
#define SIZE (sizeof(@type@))
char info_size[] = {'I', 'N', 'F', 'O', ':', 's','i','z','e','[',
('0' + ((SIZE / 10000)%10)),
('0' + ((SIZE / 1000)%10)),
('0' + ((SIZE / 100)%10)),
('0' + ((SIZE / 10)%10)),
('0' + (SIZE % 10)),
']',
#ifdef KEY
' ','k','e','y','[', KEY, ']',
#endif
'\0'};
#ifdef __CLASSIC_C__
int main(argc, argv) int argc; char *argv[];
#else
int main(int argc, char *argv[])
#endif
{
int require = 0;
require += info_size[argc];
(void)argv;
return require;
}
Index: FindCUDA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCUDA.cmake,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C 2 -d -r1.2.2.4 -r1.2.2.5
*** FindCUDA.cmake 11 Nov 2009 18:34:12 -0000 1.2.2.4
--- FindCUDA.cmake 28 Jan 2010 21:47:36 -0000 1.2.2.5
***************
*** 477,481 ****
if(CUDA_NVCC_EXECUTABLE AND NOT CUDA_VERSION)
# Compute the version.
! exec_program(${CUDA_NVCC_EXECUTABLE} ARGS "--version" OUTPUT_VARIABLE NVCC_OUT)
string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR ${NVCC_OUT})
string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${NVCC_OUT})
--- 477,481 ----
if(CUDA_NVCC_EXECUTABLE AND NOT CUDA_VERSION)
# Compute the version.
! execute_process (COMMAND ${CUDA_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT)
string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR ${NVCC_OUT})
string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${NVCC_OUT})
***************
*** 814,818 ****
set(CUDA_C_OR_CXX CXX)
else(CUDA_HOST_COMPILATION_CPP)
! set(nvcc_flags ${nvcc_flags} --host-compilation C)
set(CUDA_C_OR_CXX C)
endif(CUDA_HOST_COMPILATION_CPP)
--- 814,822 ----
set(CUDA_C_OR_CXX CXX)
else(CUDA_HOST_COMPILATION_CPP)
! if(CUDA_VERSION VERSION_LESS "3.0")
! set(nvcc_flags ${nvcc_flags} --host-compilation C)
! else()
! message(WARNING "--host-compilation flag is deprecated in CUDA version >= 3.0. Removing --host-compilation C flag" )
! endif()
set(CUDA_C_OR_CXX C)
endif(CUDA_HOST_COMPILATION_CPP)
Index: FindCURL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCURL.cmake,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C 2 -d -r1.4.4.1 -r1.4.4.2
*** FindCURL.cmake 1 Oct 2009 21:20:23 -0000 1.4.4.1
--- FindCURL.cmake 28 Jan 2010 21:47:36 -0000 1.4.4.2
***************
*** 24,28 ****
# Look for the library.
! FIND_LIBRARY(CURL_LIBRARY NAMES curl)
MARK_AS_ADVANCED(CURL_LIBRARY)
--- 24,34 ----
# Look for the library.
! FIND_LIBRARY(CURL_LIBRARY NAMES
! curl
! # Windows MSVC prebuilts:
! curllib
! libcurl_imp
! curllib_static
! )
MARK_AS_ADVANCED(CURL_LIBRARY)
***************
*** 35,40 ****
SET(CURL_LIBRARIES ${CURL_LIBRARY})
SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
- ELSE(CURL_FOUND)
- SET(CURL_LIBRARIES)
- SET(CURL_INCLUDE_DIRS)
ENDIF(CURL_FOUND)
--- 41,43 ----
Index: CMakeFortranCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompiler.cmake.in,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C 2 -d -r1.14 -r1.14.2.1
*** CMakeFortranCompiler.cmake.in 30 Jul 2009 17:46:51 -0000 1.14
--- CMakeFortranCompiler.cmake.in 28 Jan 2010 21:47:34 -0000 1.14.2.1
***************
*** 31,34 ****
--- 31,46 ----
ENDIF(UNIX)
+ # Save compiler ABI information.
+ SET(CMAKE_Fortran_SIZEOF_DATA_PTR "@CMAKE_Fortran_SIZEOF_DATA_PTR@")
+ SET(CMAKE_Fortran_COMPILER_ABI "@CMAKE_Fortran_COMPILER_ABI@")
+
+ IF(CMAKE_Fortran_SIZEOF_DATA_PTR)
+ SET(CMAKE_SIZEOF_VOID_P "${CMAKE_Fortran_SIZEOF_DATA_PTR}")
+ ENDIF(CMAKE_Fortran_SIZEOF_DATA_PTR)
+
+ IF(CMAKE_Fortran_COMPILER_ABI)
+ SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_Fortran_COMPILER_ABI}")
+ ENDIF(CMAKE_Fortran_COMPILER_ABI)
+
SET(CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "@CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES@")
SET(CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES "@CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES@")
Index: CMakeCXXCompilerId.cpp.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompilerId.cpp.in,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C 2 -d -r1.5 -r1.5.2.1
*** CMakeCXXCompilerId.cpp.in 7 Aug 2009 14:13:03 -0000 1.5
--- CMakeCXXCompilerId.cpp.in 28 Jan 2010 21:47:34 -0000 1.5.2.1
***************
*** 39,42 ****
--- 39,45 ----
# define COMPILER_ID "PGI"
+ #elif defined(__PATHSCALE__)
+ # define COMPILER_ID "PathScale"
+
#elif defined(__GNUC__)
# define COMPILER_ID "GNU"
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.45.2.3
retrieving revision 1.45.2.4
diff -C 2 -d -r1.45.2.3 -r1.45.2.4
*** FindBoost.cmake 28 Oct 2009 16:14:56 -0000 1.45.2.3
--- FindBoost.cmake 28 Jan 2010 21:47:34 -0000 1.45.2.4
***************
*** 64,68 ****
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
! # 1.40, 1.40.0
#
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
--- 64,68 ----
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
! # 1.40, 1.40.0, 1.41, 1.41.0
#
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
***************
*** 266,269 ****
--- 266,280 ----
#
+ # A convenience function for marking desired components
+ # as found or not
+ #
+ function(_Boost_MARK_COMPONENTS_FOUND _yes_or_no)
+ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ set(Boost_${UPPERCOMPONENT}_FOUND ${_yes_or_no} CACHE INTERNAL "Whether the Boost ${COMPONENT} library found" FORCE)
+ endforeach()
+ endfunction()
+
+ #
# End functions/macros
#
***************
*** 287,291 ****
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
! "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
--- 298,302 ----
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
! "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
***************
*** 761,764 ****
--- 772,779 ----
endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
+ if (NOT Boost_FOUND)
+ _Boost_MARK_COMPONENTS_FOUND(OFF)
+ endif()
+
if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
# If the user requested an exact version of Boost, check
***************
*** 774,781 ****
--- 789,798 ----
# We'll set Boost_FOUND true again if we have an exact version match.
set(Boost_FOUND FALSE)
+ _Boost_MARK_COMPONENTS_FOUND(OFF)
if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
set( Boost_FOUND TRUE )
+ _Boost_MARK_COMPONENTS_FOUND(ON)
endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
***************
*** 797,813 ****
endif (NOT Boost_FOUND)
! if (Boost_FOUND)
! set(_boost_CHECKED_COMPONENT FALSE)
! set(_Boost_MISSING_COMPONENTS)
! foreach(COMPONENT ${Boost_FIND_COMPONENTS})
! string(TOUPPER ${COMPONENT} COMPONENT)
! set(_boost_CHECKED_COMPONENT TRUE)
! if(NOT Boost_${COMPONENT}_FOUND)
! string(TOLOWER ${COMPONENT} COMPONENT)
! list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
! set( Boost_FOUND FALSE)
! endif(NOT Boost_${COMPONENT}_FOUND)
! endforeach(COMPONENT)
! endif (Boost_FOUND)
if(Boost_DEBUG)
--- 814,829 ----
endif (NOT Boost_FOUND)
! # Always check for missing components
! set(_boost_CHECKED_COMPONENT FALSE)
! set(_Boost_MISSING_COMPONENTS "")
! foreach(COMPONENT ${Boost_FIND_COMPONENTS})
! string(TOUPPER ${COMPONENT} COMPONENT)
! set(_boost_CHECKED_COMPONENT TRUE)
! if(NOT Boost_${COMPONENT}_FOUND)
! string(TOLOWER ${COMPONENT} COMPONENT)
! list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
! set( Boost_FOUND FALSE)
! endif(NOT Boost_${COMPONENT}_FOUND)
! endforeach(COMPONENT)
if(Boost_DEBUG)
***************
*** 877,883 ****
IF (NOT Boost_FIND_QUIETLY)
MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
! ENDIF(NOT Boost_FIND_QUIETLY)
! IF (NOT Boost_FIND_QUIETLY)
! MESSAGE(STATUS "Found the following Boost libraries:")
ENDIF(NOT Boost_FIND_QUIETLY)
FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
--- 893,899 ----
IF (NOT Boost_FIND_QUIETLY)
MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
! if(Boost_FIND_COMPONENTS)
! message(STATUS "Found the following Boost libraries:")
! endif()
ENDIF(NOT Boost_FIND_QUIETLY)
FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C 2 -d -r1.23.2.2 -r1.23.2.3
*** FindMPI.cmake 28 Oct 2009 16:14:56 -0000 1.23.2.2
--- FindMPI.cmake 28 Jan 2010 21:47:37 -0000 1.23.2.3
***************
*** 73,77 ****
# Argonne National Labs MPICH2 sets a registry key that we can use.
! set(MPI_PACKAGE_DIR
mpi
mpich
--- 73,77 ----
# Argonne National Labs MPICH2 sets a registry key that we can use.
! set(_MPI_PACKAGE_DIR
mpi
mpich
***************
*** 84,96 ****
)
! set(MPI_PREFIX_PATH)
if(WIN32)
! list(APPEND MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
endif()
foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH})
! foreach(MpiPackageDir ${MPI_PREFIX_PATH})
if(EXISTS ${SystemPrefixDir}/${MpiPackageDir})
! list(APPEND MPI_PREFIX_PATH "${SystemPrefixDir}/${MpiPackageDir}")
endif()
endforeach(MpiPackageDir)
--- 84,96 ----
)
! set(_MPI_PREFIX_PATH)
if(WIN32)
! list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
endif()
foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH})
! foreach(MpiPackageDir ${_MPI_PREFIX_PATH})
if(EXISTS ${SystemPrefixDir}/${MpiPackageDir})
! list(APPEND _MPI_PREFIX_PATH "${SystemPrefixDir}/${MpiPackageDir}")
endif()
endforeach(MpiPackageDir)
***************
*** 100,104 ****
find_program(MPIEXEC
NAMES mpiexec mpirun lamexec
! PATHS ${MPI_PREFIX_PATH}
PATH_SUFFIXES bin
DOC "Executable for running MPI programs."
--- 100,104 ----
find_program(MPIEXEC
NAMES mpiexec mpirun lamexec
! PATHS ${_MPI_PREFIX_PATH}
PATH_SUFFIXES bin
DOC "Executable for running MPI programs."
***************
*** 107,118 ****
# call get_filename_component twice to remove mpiexec and the directory it exists in (typically bin).
# This gives us a fairly reliable base directory to search for /bin /lib and /include from.
! get_filename_component(MPI_BASE_DIR "${MPIEXEC}" PATH)
! get_filename_component(MPI_BASE_DIR "${MPI_BASE_DIR}" PATH)
# If there is an mpi compiler find it and interogate (farther below) it for the include
! # and lib dirs otherwise we will continue to search from ${MPI_BASE_DIR}.
find_program(MPI_COMPILER
NAMES mpic++ mpicxx mpiCC mpicc
! HINTS "${MPI_BASE_DIR}"
PATH_SUFFIXES bin
DOC "MPI compiler. Used only to detect MPI compilation flags.")
--- 107,118 ----
# call get_filename_component twice to remove mpiexec and the directory it exists in (typically bin).
# This gives us a fairly reliable base directory to search for /bin /lib and /include from.
! get_filename_component(_MPI_BASE_DIR "${MPIEXEC}" PATH)
! get_filename_component(_MPI_BASE_DIR "${_MPI_BASE_DIR}" PATH)
# If there is an mpi compiler find it and interogate (farther below) it for the include
! # and lib dirs otherwise we will continue to search from ${_MPI_BASE_DIR}.
find_program(MPI_COMPILER
NAMES mpic++ mpicxx mpiCC mpicc
! HINTS "${_MPI_BASE_DIR}"
PATH_SUFFIXES bin
DOC "MPI compiler. Used only to detect MPI compilation flags.")
***************
*** 223,227 ****
# paths.
find_path(MPI_INCLUDE_PATH mpi.h
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
PATH_SUFFIXES include
)
--- 223,227 ----
# paths.
find_path(MPI_INCLUDE_PATH mpi.h
! HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
PATH_SUFFIXES include
)
***************
*** 305,309 ****
# No MPI compiler to interogate so attempt to find everything with find functions.
find_path(MPI_INCLUDE_PATH mpi.h
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
PATH_SUFFIXES include
)
--- 305,309 ----
# No MPI compiler to interogate so attempt to find everything with find functions.
find_path(MPI_INCLUDE_PATH mpi.h
! HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
PATH_SUFFIXES include
)
***************
*** 318,322 ****
find_library(MPI_LIBRARY
NAMES mpi mpich msmpi
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR}
)
--- 318,322 ----
find_library(MPI_LIBRARY
NAMES mpi mpich msmpi
! HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR}
)
***************
*** 324,328 ****
find_library(MPI_EXTRA_LIBRARY
NAMES mpi++
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
PATH_SUFFIXES lib
DOC "Extra MPI libraries to link against.")
--- 324,328 ----
find_library(MPI_EXTRA_LIBRARY
NAMES mpi++
! HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
PATH_SUFFIXES lib
DOC "Extra MPI libraries to link against.")
***************
*** 359,363 ****
# unset to cleanup namespace
! unset(MPI_PACKAGE_DIR)
! unset(MPI_PREFIX_PATH)
! unset(MPI_BASE_DIR)
--- 359,363 ----
# unset to cleanup namespace
! unset(_MPI_PACKAGE_DIR)
! unset(_MPI_PREFIX_PATH)
! unset(_MPI_BASE_DIR)
Index: FindOpenSSL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenSSL.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C 2 -d -r1.3.2.2 -r1.3.2.3
*** FindOpenSSL.cmake 3 Nov 2009 22:25:02 -0000 1.3.2.2
--- FindOpenSSL.cmake 28 Jan 2010 21:47:37 -0000 1.3.2.3
***************
*** 21,32 ****
# License text for the above reference.)
- IF(OPENSSL_LIBRARIES)
- SET(OpenSSL_FIND_QUIETLY TRUE)
- ENDIF(OPENSSL_LIBRARIES)
-
- IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
- SET(LIB_FOUND 1)
- ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
-
# http://www.slproweb.com/products/Win32OpenSSL.html
FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
--- 21,24 ----
***************
*** 34,97 ****
)
! IF(WIN32 AND MSVC)
! # /MD and /MDd are the standard values - if somone wants to use
! # others, the libnames have to change here too
! # 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)
! MESSAGE(STATUS "Could not find the debug and release version of openssl")
! ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! ELSE(MSVC_IDE)
! 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)
! IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
! SET(OPENSSL_FOUND TRUE)
! ELSE(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
! SET(OPENSSL_FOUND FALSE)
! ENDIF (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
! IF (OPENSSL_FOUND)
! IF (NOT OpenSSL_FIND_QUIETLY)
! MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
! ENDIF (NOT OpenSSL_FIND_QUIETLY)
! ELSE (OPENSSL_FOUND)
! IF (OpenSSL_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "Could NOT find OpenSSL")
! ENDIF (OpenSSL_FIND_REQUIRED)
! ENDIF (OPENSSL_FOUND)
MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
--- 26,104 ----
)
! IF(WIN32 AND NOT CYGWIN)
! # MINGW should go here too
! IF(MSVC)
! # /MD and /MDd are the standard values - if someone wants to use
! # others, the libnames have to change here too
! # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
! # TODO: handle /MT and static lib
! # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
! # * MD for dynamic-release
! # * MDd for dynamic-debug
! # * MT for static-release
! # * MTd for static-debug
! # Implementation details:
! # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
! # libeay32MD.lib is identical to ../libeay32.lib, and
! # ssleay32MD.lib is identical to ../ssleay32.lib
! 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 ssleay32 ssl
! 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 ssleay32 ssl
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
! )
! if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
! set( OPENSSL_LIBRARIES
! optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE}
! debug ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG}
! )
! else()
! set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} )
! endif()
! MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
! MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
! ELSEIF(MINGW)
! # same player, for MingW
! FIND_LIBRARY(LIB_EAY NAMES libeay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/MinGW"
! )
! FIND_LIBRARY(SSL_EAY NAMES ssleay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/MinGW"
! )
! MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
! set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
! ELSE(MSVC)
! # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
! FIND_LIBRARY(LIB_EAY NAMES libeay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib"
! )
! FIND_LIBRARY(SSL_EAY NAMES ssleay32
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib"
! )
! MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
! set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
! ENDIF(MSVC)
! ELSE(WIN32 AND NOT CYGWIN)
! 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 NOT CYGWIN)
! include(FindPackageHandleStandardArgs)
! find_package_handle_standard_args(OpenSSL DEFAULT_MSG
! OPENSSL_LIBRARIES
! OPENSSL_INCLUDE_DIR
! )
MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
Index: FindGTK2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGTK2.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindGTK2.cmake 1 Oct 2009 21:20:29 -0000 1.2.2.1
--- FindGTK2.cmake 28 Jan 2010 21:47:36 -0000 1.2.2.2
***************
*** 65,68 ****
--- 65,71 ----
# License text for the above reference.)
+ # Version 0.8 (1/4/2010)
+ # * Get module working under MacOSX fink by adding /sw/include, /sw/lib
+ # to PATHS and the gobject library
# Version 0.7 (3/22/09)
# * Checked into CMake CVS
***************
*** 168,171 ****
--- 171,176 ----
/opt/openwin/include
/usr/openwin/lib
+ /sw/include
+ /sw/lib
$ENV{GTKMM_BASEPATH}/include
$ENV{GTKMM_BASEPATH}/lib
***************
*** 278,281 ****
--- 283,287 ----
/usr/openwin/lib
/usr/openwin/lib64
+ /sw/lib
$ENV{GTKMM_BASEPATH}/lib
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
***************
*** 387,394 ****
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
if(_GTK2_component STREQUAL "gtk")
-
_GTK2_FIND_INCLUDE_DIR(GTK2_GLIB_INCLUDE_DIR glib.h)
_GTK2_FIND_INCLUDE_DIR(GTK2_GLIBCONFIG_INCLUDE_DIR glibconfig.h)
_GTK2_FIND_LIBRARY (GTK2_GLIB_LIBRARY glib false true)
_GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h)
--- 393,402 ----
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
if(_GTK2_component STREQUAL "gtk")
_GTK2_FIND_INCLUDE_DIR(GTK2_GLIB_INCLUDE_DIR glib.h)
_GTK2_FIND_INCLUDE_DIR(GTK2_GLIBCONFIG_INCLUDE_DIR glibconfig.h)
_GTK2_FIND_LIBRARY (GTK2_GLIB_LIBRARY glib false true)
+
+ _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h)
+ _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true)
_GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h)
Index: CMakeDetermineFortranCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineFortranCompiler.cmake,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -C 2 -d -r1.26.2.1 -r1.26.2.2
*** CMakeDetermineFortranCompiler.cmake 1 Oct 2009 21:20:18 -0000 1.26.2.1
--- CMakeDetermineFortranCompiler.cmake 28 Jan 2010 21:47:34 -0000 1.26.2.2
***************
*** 63,69 ****
# then 77 or older compilers, gnu is always last in the group,
# so if you paid for a compiler it is picked by default.
- # NOTE for testing purposes this list is DUPLICATED in
- # CMake/Source/CMakeLists.txt, IF YOU CHANGE THIS LIST,
- # PLEASE UPDATE THAT FILE AS WELL!
SET(CMAKE_Fortran_COMPILER_LIST
ifort ifc efc f95 pgf95 lf95 xlf95 fort gfortran gfortran-4 g95 f90
--- 63,66 ----
--- NEW FILE: Qt4ConfigDependentSettings.cmake ---
# This file is included by FindQt4.cmake, don't include it directly.
#=============================================================================
# Copyright 2005-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
###############################################
#
# configuration/system dependent settings
#
###############################################
# find dependencies for some Qt modules
# when doing builds against a static Qt, they are required
# when doing builds against a shared Qt, they are not required
# if a user needs the dependencies, and they couldn't be found, they can set
# the variables themselves.
SET(QT_QTGUI_LIB_DEPENDENCIES "")
SET(QT_QTCORE_LIB_DEPENDENCIES "")
SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
SET(QT_QTOPENGL_LIB_DEPENDENCIES "")
SET(QT_QTDBUS_LIB_DEPENDENCIES "")
SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
IF(WIN32)
# On Windows, qconfig.pri has "static" for static library builds
IF(QT_CONFIG MATCHES "static")
SET(QT_IS_STATIC 1)
ENDIF(QT_CONFIG MATCHES "static")
ELSE(WIN32)
# On other platforms, check file extension to know if its static
IF(QT_QTCORE_LIBRARY_RELEASE)
GET_FILENAME_COMPONENT(qtcore_lib_ext "${QT_QTCORE_LIBRARY_RELEASE}" EXT)
IF("${qtcore_lib_ext}" STREQUAL "${CMAKE_STATIC_LIBRARY_SUFFIX}")
SET(QT_IS_STATIC 1)
ENDIF("${qtcore_lib_ext}" STREQUAL "${CMAKE_STATIC_LIBRARY_SUFFIX}")
ENDIF(QT_QTCORE_LIBRARY_RELEASE)
IF(QT_QTCORE_LIBRARY_DEBUG)
GET_FILENAME_COMPONENT(qtcore_lib_ext "${QT_QTCORE_LIBRARY_DEBUG}" EXT)
IF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX})
SET(QT_IS_STATIC 1)
ENDIF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX})
ENDIF(QT_QTCORE_LIBRARY_DEBUG)
ENDIF(WIN32)
# build using shared Qt needs -DQT_DLL on Windows
IF(WIN32 AND NOT QT_IS_STATIC)
SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
ENDIF(WIN32 AND NOT QT_IS_STATIC)
# QtOpenGL dependencies
QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
## system png
IF(QT_QCONFIG MATCHES "system-png")
FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
MARK_AS_ADVANCED(QT_PNG_LIBRARY)
IF(QT_PNG_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
ENDIF(QT_PNG_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-png")
# for X11, get X11 library directory
IF(Q_WS_X11)
QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
ENDIF(Q_WS_X11)
## X11 SM
IF(QT_QCONFIG MATCHES "x11sm")
# ask qmake where the x11 libs are
FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
IF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
ENDIF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "x11sm")
## Xi
IF(QT_QCONFIG MATCHES "tablet")
FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(QT_XI_LIBRARY)
IF(QT_XI_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
ENDIF(QT_XI_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "tablet")
## Xrender
IF(QT_QCONFIG MATCHES "xrender")
FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
IF(QT_XRENDER_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
ENDIF(QT_XRENDER_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xrender")
## Xrandr
IF(QT_QCONFIG MATCHES "xrandr")
FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
IF(QT_XRANDR_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
ENDIF(QT_XRANDR_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xrandr")
## Xcursor
IF(QT_QCONFIG MATCHES "xcursor")
FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
IF(QT_XCURSOR_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
ENDIF(QT_XCURSOR_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xcursor")
## Xinerama
IF(QT_QCONFIG MATCHES "xinerama")
FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
IF(QT_XINERAMA_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
ENDIF(QT_XINERAMA_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xinerama")
## Xfixes
IF(QT_QCONFIG MATCHES "xfixes")
FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(QT_XFIXES_LIBRARY)
IF(QT_XFIXES_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
ENDIF(QT_XFIXES_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xfixes")
## system-freetype
IF(QT_QCONFIG MATCHES "system-freetype")
FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
IF(QT_FREETYPE_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
ENDIF(QT_FREETYPE_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-freetype")
## fontconfig
IF(QT_QCONFIG MATCHES "fontconfig")
FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
IF(QT_FONTCONFIG_LIBRARY)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
ENDIF(QT_FONTCONFIG_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "fontconfig")
## system-zlib
IF(QT_QCONFIG MATCHES "system-zlib")
FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
IF(QT_ZLIB_LIBRARY)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
ENDIF(QT_ZLIB_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-zlib")
## openssl
IF(NOT Q_WS_WIN)
SET(_QT_NEED_OPENSSL 0)
IF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
SET(_QT_NEED_OPENSSL 1)
ENDIF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
IF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
SET(_QT_NEED_OPENSSL 1)
ENDIF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
IF(_QT_NEED_OPENSSL)
FIND_PACKAGE(OpenSSL)
IF(OPENSSL_LIBRARIES)
SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
ENDIF(OPENSSL_LIBRARIES)
ENDIF(_QT_NEED_OPENSSL)
ENDIF(NOT Q_WS_WIN)
## dbus
IF(QT_QCONFIG MATCHES "dbus")
# if the dbus library isn't found, we'll assume its not required to build
# shared Qt on Linux doesn't require it
IF(NOT QT_DBUS_LIBRARY)
EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L dbus-1
OUTPUT_VARIABLE _dbus_query_output
RESULT_VARIABLE _dbus_result
ERROR_VARIABLE _dbus_query_output )
IF(_dbus_result MATCHES 0)
STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}")
SEPARATE_ARGUMENTS(_dbus_query_output)
ELSE(_dbus_result MATCHES 0)
SET(_dbus_query_output)
ENDIF(_dbus_result MATCHES 0)
FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} )
IF(QT_DBUS_LIBRARY)
SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY})
ENDIF(QT_DBUS_LIBRARY)
MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
ENDIF(NOT QT_DBUS_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "dbus")
## glib
IF(QT_QCONFIG MATCHES "glib")
# if the glib libraries aren't found, we'll assume its not required to build
# shared Qt on Linux doesn't require it
# Qt 4.2.0+ uses glib-2.0
IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
OUTPUT_VARIABLE _glib_query_output
RESULT_VARIABLE _glib_result
ERROR_VARIABLE _glib_query_output )
IF(_glib_result MATCHES 0)
STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
SEPARATE_ARGUMENTS(_glib_query_output)
ELSE(_glib_result MATCHES 0)
SET(_glib_query_output)
ENDIF(_glib_result MATCHES 0)
FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
# Qt 4.5+ also links to gobject-2.0
IF(QT_VERSION_MINOR GREATER 4)
IF(NOT QT_GOBJECT_LIBRARY)
EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L gobject-2.0
OUTPUT_VARIABLE _glib_query_output
RESULT_VARIABLE _glib_result
ERROR_VARIABLE _glib_query_output )
IF(_glib_result MATCHES 0)
STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
SEPARATE_ARGUMENTS(_glib_query_output)
ELSE(_glib_result MATCHES 0)
SET(_glib_query_output)
ENDIF(_glib_result MATCHES 0)
FIND_LIBRARY(QT_GOBJECT_LIBRARY NAMES gobject-2.0 PATHS ${_glib_query_output} )
MARK_AS_ADVANCED(QT_GOBJECT_LIBRARY)
ENDIF(NOT QT_GOBJECT_LIBRARY)
IF(QT_GOBJECT_LIBRARY)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
${QT_GOBJECT_LIBRARY})
ENDIF(QT_GOBJECT_LIBRARY)
ENDIF(QT_VERSION_MINOR GREATER 4)
ENDIF(QT_QCONFIG MATCHES "glib")
## clock-monotonic, just see if we need to link with rt
IF(QT_QCONFIG MATCHES "clock-monotonic")
SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
SET(CMAKE_REQUIRED_LIBRARIES rt)
CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS)
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
IF(QT_POSIX_TIMERS)
FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
MARK_AS_ADVANCED(QT_RT_LIBRARY)
IF(QT_RT_LIBRARY)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
ENDIF(QT_RT_LIBRARY)
ENDIF(QT_POSIX_TIMERS)
ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
IF(Q_WS_X11)
# X11 libraries Qt absolutely depends on
QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
SEPARATE_ARGUMENTS(QT_LIBS_X11)
FOREACH(QT_X11_LIB ${QT_LIBS_X11})
STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
MARK_AS_ADVANCED(${QT_TMP_STR})
IF(${QT_TMP_STR})
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
ENDIF(${QT_TMP_STR})
ENDFOREACH(QT_X11_LIB)
QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
ENDIF(Q_WS_X11)
IF(Q_WS_WIN)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} imm32 winmm)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ws2_32)
ENDIF(Q_WS_WIN)
IF(Q_WS_MAC)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework Carbon")
# Qt 4.0, 4.1, 4.2 use QuickTime
IF(QT_VERSION_MINOR LESS 3)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework QuickTime")
ENDIF(QT_VERSION_MINOR LESS 3)
# Qt 4.2+ use AppKit
IF(QT_VERSION_MINOR GREATER 1)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
ENDIF(QT_VERSION_MINOR GREATER 1)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
ENDIF(Q_WS_MAC)
Index: FindGTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGTest.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** FindGTest.cmake 1 Oct 2009 21:20:29 -0000 1.1.2.1
--- FindGTest.cmake 28 Jan 2010 21:47:36 -0000 1.1.2.2
***************
*** 16,29 ****
# Accepts the following variables as input:
#
! # GTEST_ROOT - (as CMake or env. variable)
# The root directory of the gtest install prefix
#
! # GTEST_MSVC_SEARCH - If on MSVC, enables searching the build tree of
! # GTest if set to MD or MT (defaults: MD)
#
#-----------------------
# Example Usage:
#
! # enable_testing(true)
# find_package(GTest REQUIRED)
# include_directories(${GTEST_INCLUDE_DIRS})
--- 16,30 ----
# Accepts the following variables as input:
#
! # GTEST_ROOT - (as a CMake or environment variable)
# The root directory of the gtest install prefix
#
! # GTEST_MSVC_SEARCH - If compiling with MSVC, this variable can be set to
! # "MD" or "MT" to enable searching a GTest build tree
! # (defaults: "MD")
#
#-----------------------
# Example Usage:
#
! # enable_testing()
# find_package(GTest REQUIRED)
# include_directories(${GTEST_INCLUDE_DIRS})
***************
*** 37,42 ****
#
# If you would like each Google test to show up in CTest as
! # a test you may use the following macro. NOTE: It WILL slow
! # down your tests, so be warned.
#
# GTEST_ADD_TESTS(executable extra_args ARGN)
--- 38,45 ----
#
# If you would like each Google test to show up in CTest as
! # a test you may use the following macro.
! # NOTE: It will slow down your tests by running an executable
! # for each test and test fixture. You will also have to rerun
! # CMake after adding or removing tests or test fixtures.
#
# GTEST_ADD_TESTS(executable extra_args ARGN)
***************
*** 77,81 ****
string(REGEX MATCHALL "TEST_?F?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
foreach(hit ${found_tests})
! string(REGEX REPLACE ".*\\(([A-Za-z_0-9]+)[, ]*([A-Za-z_0-9]+)\\).*" "\\1.\\2" test_name ${hit})
add_test(${test_name} ${executable} --gtest_filter=${test_name} ${extra_args})
endforeach()
--- 80,84 ----
string(REGEX MATCHALL "TEST_?F?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
foreach(hit ${found_tests})
! string(REGEX REPLACE ".*\\( *([A-Za-z_0-9]+), *([A-Za-z_0-9]+) *\\).*" "\\1.\\2" test_name ${hit})
add_test(${test_name} ${executable} --gtest_filter=${test_name} ${extra_args})
endforeach()
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.166.2.4
retrieving revision 1.166.2.5
diff -C 2 -d -r1.166.2.4 -r1.166.2.5
*** FindQt4.cmake 11 Nov 2009 18:34:12 -0000 1.166.2.4
--- FindQt4.cmake 28 Jan 2010 21:47:37 -0000 1.166.2.5
***************
*** 35,38 ****
--- 35,39 ----
# QT_USE_QTMOTIF
# QT_USE_QTMAIN
+ # QT_USE_QTMULTIMEDIA
# QT_USE_QTNETWORK
# QT_USE_QTNSPLUGIN
***************
*** 52,55 ****
--- 53,68 ----
# QT_USE_QTSCRIPTTOOLS
[...1209 lines suppressed...]
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework QuickTime")
! ENDIF(QT_VERSION_MINOR LESS 3)
!
! # Qt 4.2+ use AppKit
! IF(QT_VERSION_MINOR GREATER 1)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
! ENDIF(QT_VERSION_MINOR GREATER 1)
- SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
- ENDIF(Q_WS_MAC)
#######################################
--- 1135,1141 ----
#
###############################################
! INCLUDE("${_qt4_current_dir}/Qt4ConfigDependentSettings.cmake")
#######################################
Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C 2 -d -r1.13.2.2 -r1.13.2.3
*** CPackRPM.cmake 11 Nov 2009 18:34:12 -0000 1.13.2.2
--- CPackRPM.cmake 28 Jan 2010 21:47:34 -0000 1.13.2.3
***************
*** 5,9 ****
#
# 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#RPM_.28Unix_Only.29
--- 5,9 ----
#
# 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#RPM_.28Unix_Only.29
***************
*** 45,49 ****
# CPACK_RPM_PACKAGE_VENDOR
# Mandatory : YES
! # Default : CPACK_PACKAGE_VENDOR if set or"unknown"
# The RPM package group.
# CPACK_RPM_PACKAGE_DESCRIPTION
--- 45,49 ----
# CPACK_RPM_PACKAGE_VENDOR
# Mandatory : YES
! # Default : CPACK_PACKAGE_VENDOR if set or "unknown"
# The RPM package group.
# CPACK_RPM_PACKAGE_DESCRIPTION
***************
*** 53,57 ****
# Mandatory : NO
# Default : -
! # May be used to set RPM dependencies.
# CPACK_RPM_SPEC_INSTALL_POST
# Mandatory : NO
--- 53,64 ----
# Mandatory : NO
# Default : -
! # May be used to set RPM dependencies (requires).
! # Note that you must enclose the complete requires string between quotes,
! # for example:
! # set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.5.0, cmake >= 2.8")
! # CPACK_RPM_PACKAGES_PROVIDES
! # Mandatory : NO
! # Default : -
! # May be used to set RPM dependencies (provides).
# CPACK_RPM_SPEC_INSTALL_POST
# Mandatory : NO
***************
*** 70,73 ****
--- 77,112 ----
# during CPack RPM run. For example you may launch CPack like this
# cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM
+ # CPACK_RPM_USER_BINARY_SPECFILE
+ # Mandatory : NO
+ # Default : -
+ # May be set by the user in order to specify a USER binary spec file
+ # to be used by CPackRPM instead of generating the file.
+ # The specified file will be processed by CONFIGURE_FILE( @ONLY).
+ # CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
+ # Mandatory : NO
+ # Default : -
+ # If set CPack will generate a template for USER specified binary
+ # spec file and stop with an error. For example launch CPack like this
+ # cpack -D CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE=1 -G RPM
+ # The user may then use this file in order to hand-craft is own
+ # binary spec file which may be used with CPACK_RPM_USER_BINARY_SPECFILE.
+ # CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
+ # CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
+ # Mandatory : NO
+ # Default : -
+ # May be used to embbed a pre (un)installation script in the spec file.
+ # The refered script file(s) will be read and directly
+ # put after the %pre or %preun section
+ # One may verify which scriptlet has been included with
+ # rpm -qp --scripts package.rpm
+ # CPACK_RPM_POST_INSTALL_SCRIPT_FILE
+ # CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
+ # Mandatory : NO
+ # Default : -
+ # May be used to embbed a post (un)installation script in the spec file.
+ # The refered script file(s) will be read and directly
+ # put after the %post or %postun section
+ # One may verify which scriptlet has been included with
+ # rpm -qp --scripts package.rpm
#=============================================================================
***************
*** 237,240 ****
--- 276,289 ----
ENDIF(CPACK_RPM_PACKAGE_REQUIRES)
+ # CPACK_RPM_PACKAGE_PROVIDES
+ # Placeholder used to specify binary RPM dependencies (if any)
+ # see http://www.rpm.org/max-rpm/s1-rpm-depend-manual-dependencies.html
+ IF(CPACK_RPM_PACKAGE_PROVIDES)
+ IF(CPACK_RPM_PACKAGE_DEBUG)
+ MESSAGE("CPackRPM:Debug: User defined Provides:\n ${CPACK_RPM_PACKAGE_PROVIDES}")
+ ENDIF(CPACK_RPM_PACKAGE_DEBUG)
+ SET(TMP_RPM_PROVIDES "Provides: ${CPACK_RPM_PACKAGE_PROVIDES}")
+ ENDIF(CPACK_RPM_PACKAGE_PROVIDES)
+
# CPACK_RPM_SPEC_INSTALL_POST
# May be used to define a RPM post intallation script
***************
*** 248,251 ****
--- 297,342 ----
ENDIF(CPACK_RPM_SPEC_INSTALL_POST)
+ # CPACK_RPM_POST_INSTALL_SCRIPT_FILE
+ # CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
+ # May be used to embbed a post (un)installation script in the spec file.
+ # The refered script file(s) will be read and directly
+ # put after the %post or %postun section
+ if(CPACK_RPM_POST_INSTALL_SCRIPT_FILE)
+ if(EXISTS ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE})
+ file(READ ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_POSTINSTALL)
+ else(EXISTS ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE})
+ message("CPackRPM:Warning: CPACK_RPM_POST_INSTALL_SCRIPT_FILE <${CPACK_RPM_POST_INSTALL_SCRIPT_FILE}> does not exists - ignoring")
+ endif(EXISTS ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_POST_INSTALL_SCRIPT_FILE)
+
+ if(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE)
+ if(EXISTS ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE})
+ file(READ ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_POSTUNINSTALL)
+ else(EXISTS ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE})
+ message("CPackRPM:Warning: CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE <${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE}> does not exists - ignoring")
+ endif(EXISTS ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE)
+
+ # CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
+ # CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
+ # May be used to embbed a pre (un)installation script in the spec file.
+ # The refered script file(s) will be read and directly
+ # put after the %pre or %preun section
+ if(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE)
+ if(EXISTS ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE})
+ file(READ ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_PREINSTALL)
+ else(EXISTS ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE})
+ message("CPackRPM:Warning: CPACK_RPM_PRE_INSTALL_SCRIPT_FILE <${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE}> does not exists - ignoring")
+ endif(EXISTS ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE)
+
+ if(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE)
+ if(EXISTS ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE})
+ file(READ ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_PREUNINSTALL)
+ else(EXISTS ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE})
+ message("CPackRPM:Warning: CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE <${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE}> does not exists - ignoring")
+ endif(EXISTS ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE)
+
# CPACK_RPM_SPEC_MORE_DEFINE
# This is a generated spec rpm file spaceholder
***************
*** 256,263 ****
ENDIF(CPACK_RPM_SPEC_MORE_DEFINE)
- # CPACK_RPM_USER_BINARY_SPECFILE
- # FIXME when this is set then CPack should us the
- # user provided file.
-
# Now we may create the RPM build tree structure
SET(CPACK_RPM_ROOTDIR "${CPACK_TOPLEVEL_DIRECTORY}")
--- 347,350 ----
***************
*** 280,352 ****
# Use files tree to construct files command (spec file)
! EXECUTE_PROCESS(COMMAND find -type f
COMMAND sed {s/\\.//}
WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
-
- SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec")
- IF(CPACK_RPM_USER_BINARY_SPECFILE)
- # User may have specified SPECFILE just use it
- MESSAGE("CPackRPM: Will use user specified spec file: ${CPACK_RPM_USER_BINARY_SPECFILE}")
- # Note that user provided file is processed for @var replacement
- CONFIGURE_FILE(${CPACK_RPM_USER_BINARY_SPECFILE} ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
- ELSE(CPACK_RPM_USER_BINARY_SPECFILE)
- # No User specified spec file generate a valid one using var values
- IF(CPACK_RPM_PACKAGE_DEBUG)
- MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}")
- MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_TAG = ${CPACK_TOPLEVEL_TAG}")
- MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_DIRECTORY = ${CPACK_TEMPORARY_DIRECTORY}")
- MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_NAME = ${CPACK_OUTPUT_FILE_NAME}")
- MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_PATH = ${CPACK_OUTPUT_FILE_PATH}")
- MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}")
- MESSAGE("CPackRPM:Debug: CPACK_RPM_BINARY_SPECFILE = ${CPACK_RPM_BINARY_SPECFILE}")
- MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY = ${CPACK_PACKAGE_INSTALL_DIRECTORY}")
- MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
- ENDIF(CPACK_RPM_PACKAGE_DEBUG)
- FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE}
- "# -*- rpm-spec -*-
- Buildroot: ${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}
- Summary: ${CPACK_RPM_PACKAGE_SUMMARY}
- Name: ${CPACK_RPM_PACKAGE_NAME}
- Version: ${CPACK_RPM_PACKAGE_VERSION}
- Release: ${CPACK_RPM_PACKAGE_RELEASE}
- License: ${CPACK_RPM_PACKAGE_LICENSE}
- Group: ${CPACK_RPM_PACKAGE_GROUP}
- Vendor: ${CPACK_RPM_PACKAGE_VENDOR}
- ${TMP_RPM_REQUIRES}
- ${TMP_RPM_BUILDARCH}
! #p define prefix ${CMAKE_INSTALL_PREFIX}
! %define _rpmdir ${CPACK_RPM_DIRECTORY}
! %define _rpmfilename ${CPACK_RPM_FILE_NAME}
%define _unpackaged_files_terminate_build 0
! %define _topdir ${CPACK_RPM_DIRECTORY}
! ${TMP_RPM_SPEC_INSTALL_POST}
! ${CPACK_RPM_SPEC_MORE_DEFINE}
!
%description
! ${CPACK_RPM_PACKAGE_DESCRIPTION}
! # This is a shortcutted spec file
! # generated by CMake RPM generator
! # we skip the _prepn _build and _install
! # steps because CPack does that for us
! # WE MUST NOT DO ANYTHING in those steps because they
! # may fail for non-privileged user
! #p prep
#p build
! #p install
%clean
%files
%defattr(-,root,root,-)
- #p dir %{prefix}
- #p {prefix}/*
${CPACK_RPM_INSTALL_FILES}
%changelog
* Sat Oct 03 2009 Kami <cmoidavid at gmail.com>
Update to handle more precisely the files section
--- 367,475 ----
# Use files tree to construct files command (spec file)
! # We should not forget to include symlinks (thus -o -type l)
! # We must remove the './' due to the local search (thus the sed)
! # Then we must authorize any man pages extension (adding * at the end)
! # because rpmbuild may automatically compress those files
! EXECUTE_PROCESS(COMMAND find -type f -o -type l
COMMAND sed {s/\\.//}
+ COMMAND sed {s/.*man.*\\/.*/&*/}
WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
! # The name of the final spec file to be used by rpmbuild
! SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec")
!
! # Print out some debug information if we were asked for that
! IF(CPACK_RPM_PACKAGE_DEBUG)
! MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}")
! MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_TAG = ${CPACK_TOPLEVEL_TAG}")
! MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_DIRECTORY = ${CPACK_TEMPORARY_DIRECTORY}")
! MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_NAME = ${CPACK_OUTPUT_FILE_NAME}")
! MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_PATH = ${CPACK_OUTPUT_FILE_PATH}")
! MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}")
! MESSAGE("CPackRPM:Debug: CPACK_RPM_BINARY_SPECFILE = ${CPACK_RPM_BINARY_SPECFILE}")
! MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY = ${CPACK_PACKAGE_INSTALL_DIRECTORY}")
! MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
! ENDIF(CPACK_RPM_PACKAGE_DEBUG)
!
! # USER generated spec file handling.
! # We should generate a spec file template:
! # - either because the user asked for it : CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
! # - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
! #
! IF(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY_SPECFILE)
! FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
! "# -*- rpm-spec -*-
! Buildroot: \@CPACK_RPM_DIRECTORY\@/\@CPACK_PACKAGE_FILE_NAME\@
! Summary: \@CPACK_RPM_PACKAGE_SUMMARY\@
! Name: \@CPACK_RPM_PACKAGE_NAME\@
! Version: \@CPACK_RPM_PACKAGE_VERSION\@
! Release: \@CPACK_RPM_PACKAGE_RELEASE\@
! License: \@CPACK_RPM_PACKAGE_LICENSE\@
! Group: \@CPACK_RPM_PACKAGE_GROUP\@
! Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
! \@TMP_RPM_REQUIRES\@
! \@TMP_RPM_PROVIDES\@
! \@TMP_RPM_BUILDARCH\@
!
! #p define prefix \@CMAKE_INSTALL_PREFIX\@
! %define _rpmdir \@CPACK_RPM_DIRECTORY\@
! %define _rpmfilename \@CPACK_RPM_FILE_NAME\@
%define _unpackaged_files_terminate_build 0
! %define _topdir \@CPACK_RPM_DIRECTORY\@
! \@TMP_RPM_SPEC_INSTALL_POST\@
! \@CPACK_RPM_SPEC_MORE_DEFINE\@
!
%description
! \@CPACK_RPM_PACKAGE_DESCRIPTION\@
! # This is a shortcutted spec file generated by CMake RPM generator
! # we skip _install step because CPack does that for us.
! # We do only save CPack installed tree in _prepr
! # and then restore it in build.
! %prep
! mv $RPM_BUILD_ROOT \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot
#p build
! %install
! if [ -e $RPM_BUILD_ROOT ];
! then
! mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/* $RPM_BUILD_ROOT
! else
! mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT
! fi
%clean
+ %post
+ \@CPACK_RPM_SPEC_POSTINSTALL\@
+
+ %postun
+ \@CPACK_RPM_SPEC_POSTUNINSTALL\@
+
+ %pre
+ \@CPACK_RPM_SPEC_PREINSTALL\@
+
+ %preun
+ \@CPACK_RPM_SPEC_PREUNINSTALL\@
+
%files
%defattr(-,root,root,-)
${CPACK_RPM_INSTALL_FILES}
%changelog
+ * Sat Nov 28 2009 Erk <eric.noulard at gmail.com>
+ Refix backup/restore install tree for OpenSuSE 11.2
+ * Sun Nov 22 2009 Erk <eric.noulard at gmail.com>
+ Include symlinks in the file list.
+ * Sat Nov 14 2009 Erk <eric.noulard at gmail.com>
+ Replace prep and build step with backup and restore
+ of the previously CPack installed tree. This should
+ mimic what is expected in rpmbuild usual steps
+ * Wed Nov 11 2009 Erk <eric.noulard at gmail.com>
+ Add support for USER defined pre/post[un]install scripts
+ * Wed Oct 07 2009 Erk <eric.noulard at gmail.com>
+ Add user custom spec file support
* Sat Oct 03 2009 Kami <cmoidavid at gmail.com>
Update to handle more precisely the files section
***************
*** 359,364 ****
Generated by CPack RPM Generator and associated macros
")
! ENDIF(CPACK_RPM_USER_BINARY_SPECFILE)
IF(RPMBUILD_EXECUTABLE)
--- 482,506 ----
Generated by CPack RPM Generator and associated macros
")
! # Stop here if we were asked to only generate a template USER spec file
! # The generated file may then be used as a template by user who wants
! # to customize their own spec file.
! IF(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE)
! MESSAGE(FATAL_ERROR "CPackRPM: STOP here Generated USER binary spec file templare is: ${CPACK_RPM_BINARY_SPECFILE}.in")
! ENDIF(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE)
! ENDIF(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY_SPECFILE)
+ # After that we may either use a user provided spec file
+ # or generate one using appropriate variables value.
+ IF(CPACK_RPM_USER_BINARY_SPECFILE)
+ # User may have specified SPECFILE just use it
+ MESSAGE("CPackRPM: Will use USER specified spec file: ${CPACK_RPM_USER_BINARY_SPECFILE}")
+ # The user provided file is processed for @var replacement
+ CONFIGURE_FILE(${CPACK_RPM_USER_BINARY_SPECFILE} ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
+ ELSE(CPACK_RPM_USER_BINARY_SPECFILE)
+ # No User specified spec file, will use the generated spec file
+ MESSAGE("CPackRPM: Will use GENERATED spec file: ${CPACK_RPM_BINARY_SPECFILE}")
+ # Note the just created file is processed for @var replacement
+ CONFIGURE_FILE(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
+ ENDIF(CPACK_RPM_USER_BINARY_SPECFILE)
IF(RPMBUILD_EXECUTABLE)
--- NEW FILE: CheckTypeSizeMap.cmake.in ---
set(@var at _KEYS "@keys@")@code@
Index: CMakeSystemSpecificInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystemSpecificInformation.cmake,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -C 2 -d -r1.44.2.1 -r1.44.2.2
*** CMakeSystemSpecificInformation.cmake 1 Oct 2009 21:20:21 -0000 1.44.2.1
--- CMakeSystemSpecificInformation.cmake 28 Jan 2010 21:47:34 -0000 1.44.2.2
***************
*** 64,69 ****
SET(CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
SET(CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}")
- SET(CMAKE_SHARED_MODULE_RUNTIME_C_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
- SET(CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
ENDIF(NOT CMAKE_MODULE_EXISTS)
--- 64,67 ----
Index: CMakeCCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompiler.cmake.in,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C 2 -d -r1.22 -r1.22.2.1
*** CMakeCCompiler.cmake.in 19 Sep 2009 14:14:29 -0000 1.22
--- CMakeCCompiler.cmake.in 28 Jan 2010 21:47:33 -0000 1.22.2.1
***************
*** 3,8 ****
--- 3,10 ----
SET(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@")
SET(CMAKE_C_PLATFORM_ID "@CMAKE_C_PLATFORM_ID@")
+ @SET_MSVC_C_ARCHITECTURE_ID@
SET(CMAKE_AR "@CMAKE_AR@")
SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
+ SET(CMAKE_LINKER "@CMAKE_LINKER@")
SET(CMAKE_COMPILER_IS_GNUCC @CMAKE_COMPILER_IS_GNUCC@)
SET(CMAKE_C_COMPILER_LOADED 1)
Index: CMakeCCompilerId.c.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompilerId.c.in,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** CMakeCCompilerId.c.in 7 Aug 2009 14:13:02 -0000 1.6
--- CMakeCCompilerId.c.in 28 Jan 2010 21:47:34 -0000 1.6.2.1
***************
*** 37,40 ****
--- 37,43 ----
# define COMPILER_ID "PGI"
+ #elif defined(__PATHSCALE__)
+ # define COMPILER_ID "PathScale"
+
#elif defined(__GNUC__)
# define COMPILER_ID "GNU"
***************
*** 94,97 ****
--- 97,101 ----
require += info_compiler[argc];
require += info_platform[argc];
+ require += info_arch[argc];
(void)argv;
return require;
Index: DartConfiguration.tcl.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/DartConfiguration.tcl.in,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C 2 -d -r1.11.2.1 -r1.11.2.2
*** DartConfiguration.tcl.in 28 Oct 2009 16:14:54 -0000 1.11.2.1
--- DartConfiguration.tcl.in 28 Jan 2010 21:47:34 -0000 1.11.2.2
***************
*** 16,19 ****
--- 16,20 ----
# Submission information
IsCDash: @CTEST_DROP_SITE_CDASH@
+ CDashVersion: @CTEST_CDASH_VERSION@
DropSite: @DROP_SITE@
DropLocation: @DROP_LOCATION@
***************
*** 31,34 ****
--- 32,36 ----
ConfigureCommand: "@CMAKE_COMMAND@" "@PROJECT_SOURCE_DIR@"
MakeCommand: @MAKECOMMAND@
+ DefaultCTestConfigurationType: @DEFAULT_CTEST_CONFIGURATION_TYPE@
# CVS options
Index: GetPrerequisites.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/GetPrerequisites.cmake,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C 2 -d -r1.7.2.1 -r1.7.2.2
*** GetPrerequisites.cmake 1 Oct 2009 21:20:34 -0000 1.7.2.1
--- GetPrerequisites.cmake 28 Jan 2010 21:47:42 -0000 1.7.2.2
***************
*** 390,394 ****
string(REGEX REPLACE "\\\\" "/" windir "${windir}")
! if(lower MATCHES "^(${sysroot}/system|${windir}/system|(.*/)*msvc[^/]+dll)")
set(is_system 1)
endif()
--- 390,394 ----
string(REGEX REPLACE "\\\\" "/" windir "${windir}")
! if(lower MATCHES "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+dll)")
set(is_system 1)
endif()
--- NEW FILE: Qt4Macros.cmake ---
# This file is included by FindQt4.cmake, don't include it directly.
#=============================================================================
# Copyright 2005-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
######################################
#
# Macros for building Qt files
#
######################################
MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
SET(${_qt4_files})
SET(${_qt4_options})
SET(_QT4_DOING_OPTIONS FALSE)
FOREACH(_currentArg ${ARGN})
IF ("${_currentArg}" STREQUAL "OPTIONS")
SET(_QT4_DOING_OPTIONS TRUE)
ELSE ("${_currentArg}" STREQUAL "OPTIONS")
IF(_QT4_DOING_OPTIONS)
LIST(APPEND ${_qt4_options} "${_currentArg}")
ELSE(_QT4_DOING_OPTIONS)
LIST(APPEND ${_qt4_files} "${_currentArg}")
ENDIF(_QT4_DOING_OPTIONS)
ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
ENDFOREACH(_currentArg)
ENDMACRO (QT4_EXTRACT_OPTIONS)
# macro used to create the names of output files preserving relative dirs
MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
STRING(LENGTH ${infile} _infileLength)
SET(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
IF(_infileLength GREATER _binlength)
STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
IF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
ELSE(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
ENDIF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
ELSE(_infileLength GREATER _binlength)
FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
ENDIF(_infileLength GREATER _binlength)
IF(WIN32 AND rel MATCHES "^[a-zA-Z]:") # absolute path
STRING(REGEX REPLACE "^([a-zA-Z]):(.*)$" "\\1_\\2" rel "${rel}")
ENDIF(WIN32 AND rel MATCHES "^[a-zA-Z]:")
SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
STRING(REPLACE ".." "__" _outfile ${_outfile})
GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)
GET_FILENAME_COMPONENT(_outfile ${_outfile} NAME_WE)
FILE(MAKE_DIRECTORY ${outpath})
SET(${outfile} ${outpath}/${prefix}${_outfile}.${ext})
ENDMACRO (QT4_MAKE_OUTPUT_FILE )
MACRO (QT4_GET_MOC_FLAGS _moc_flags)
SET(${_moc_flags})
GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
FOREACH(_current ${_inc_DIRS})
IF("${_current}" MATCHES ".framework/?$")
STRING(REGEX REPLACE "/[^/]+.framework" "" framework_path "${_current}")
SET(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
ELSE("${_current}" MATCHES ".framework/?$")
SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
ENDIF("${_current}" MATCHES ".framework/?$")
ENDFOREACH(_current ${_inc_DIRS})
GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
FOREACH(_current ${_defines})
SET(${_moc_flags} ${${_moc_flags}} "-D${_current}")
ENDFOREACH(_current ${_defines})
IF(Q_WS_WIN)
SET(${_moc_flags} ${${_moc_flags}} -DWIN32)
ENDIF(Q_WS_WIN)
ENDMACRO(QT4_GET_MOC_FLAGS)
# helper macro to set up a moc rule
MACRO (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
# For Windows, create a parameters file to work around command line length limit
IF (WIN32)
# Pass the parameters in a file. Set the working directory to
# be that containing the parameters file and reference it by
# just the file name. This is necessary because the moc tool on
# MinGW builds does not seem to handle spaces in the path to the
# file given with the @ syntax.
GET_FILENAME_COMPONENT(_moc_outfile_name "${outfile}" NAME)
GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
IF(_moc_outfile_dir)
SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
ENDIF(_moc_outfile_dir)
SET (_moc_parameters_file ${outfile}_parameters)
SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
FILE (REMOVE ${_moc_parameters_file})
FOREACH(arg ${_moc_parameters})
FILE (APPEND ${_moc_parameters_file} "${arg}\n")
ENDFOREACH(arg)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
DEPENDS ${infile}
${_moc_working_dir}
VERBATIM)
ELSE (WIN32)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
DEPENDS ${infile})
ENDIF (WIN32)
ENDMACRO (QT4_CREATE_MOC_COMMAND)
MACRO (QT4_GENERATE_MOC infile outfile )
# get include dirs and flags
QT4_GET_MOC_FLAGS(moc_flags)
GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
ENDMACRO (QT4_GENERATE_MOC)
# QT4_WRAP_CPP(outfiles inputfile ... )
MACRO (QT4_WRAP_CPP outfiles )
# get include dirs
QT4_GET_MOC_FLAGS(moc_flags)
QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
FOREACH (it ${moc_files})
GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
ENDMACRO (QT4_WRAP_CPP)
# QT4_WRAP_UI(outfiles inputfile ... )
MACRO (QT4_WRAP_UI outfiles )
QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
FOREACH (it ${ui_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_UIC_EXECUTABLE}
ARGS ${ui_options} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile})
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH (it)
ENDMACRO (QT4_WRAP_UI)
# QT4_ADD_RESOURCES(outfiles inputfile ... )
MACRO (QT4_ADD_RESOURCES outfiles )
QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
FOREACH (it ${rcc_files})
GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
# parse file for dependencies
# all files are absolute paths or relative to the location of the qrc file
FILE(READ "${infile}" _RC_FILE_CONTENTS)
STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
SET(_RC_DEPENDS)
FOREACH(_RC_FILE ${_RC_FILES})
STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
IF(NOT _ABS_PATH_INDICATOR)
SET(_RC_FILE "${rc_path}/${_RC_FILE}")
ENDIF(NOT _ABS_PATH_INDICATOR)
SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
ENDFOREACH(_RC_FILE)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_RCC_EXECUTABLE}
ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile}
DEPENDS ${_RC_DEPENDS})
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH (it)
ENDMACRO (QT4_ADD_RESOURCES)
MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE)
SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
# handling more arguments (as in FindQt4.cmake from KDE4) will come soon, then
# _params will be used for more than just -m
SET(_params -m)
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}
DEPENDS ${_infile})
SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
QT4_GENERATE_MOC(${_header} ${_moc})
SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
ENDMACRO(QT4_ADD_DBUS_INTERFACE)
MACRO(QT4_ADD_DBUS_INTERFACES _sources)
FOREACH (_current_FILE ${ARGN})
GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE)
# get the part before the ".xml" suffix
STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2" _basename ${_current_FILE})
STRING(TOLOWER ${_basename} _basename)
QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
ENDFOREACH (_current_FILE)
ENDMACRO(QT4_ADD_DBUS_INTERFACES)
MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options )
QT4_EXTRACT_OPTIONS(_customName _qt4_dbus_options ${ARGN})
GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
IF (_customName)
SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
ELSE (_customName)
SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
ENDIF (_customName)
ADD_CUSTOM_COMMAND(OUTPUT ${_target}
COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} -o ${_target}
DEPENDS ${_in_file}
)
ENDMACRO(QT4_GENERATE_DBUS_INTERFACE)
MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
SET(_optionalBasename "${ARGV4}")
IF (_optionalBasename)
SET(_basename ${_optionalBasename} )
ELSE (_optionalBasename)
STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile})
STRING(TOLOWER ${_basename} _basename)
ENDIF (_optionalBasename)
SET(_optionalClassName "${ARGV5}")
SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
IF(_optionalClassName)
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
DEPENDS ${_infile}
)
ELSE(_optionalClassName)
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile}
DEPENDS ${_infile}
)
ENDIF(_optionalClassName)
QT4_GENERATE_MOC(${_header} ${_moc})
SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
ENDMACRO(QT4_ADD_DBUS_ADAPTOR)
MACRO(QT4_AUTOMOC)
QT4_GET_MOC_FLAGS(_moc_INCS)
SET(_matching_FILES )
FOREACH (_current_FILE ${ARGN})
GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
# if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
# This is required to make uic work correctly:
# we need to add generated .cpp files to the sources (to compile them),
# but we cannot let automoc handle them, as the .cpp files don't exist yet when
# cmake is run for the very first time on them -> however the .cpp files might
# exist at a later run. at that time we need to skip them, so that we don't add two
# different rules for the same moc file
GET_SOURCE_FILE_PROPERTY(_skip ${_abs_FILE} SKIP_AUTOMOC)
IF ( NOT _skip AND EXISTS ${_abs_FILE} )
FILE(READ ${_abs_FILE} _contents)
GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
STRING(REGEX MATCHALL "# *include +[^ ]+\\.moc[\">]" _match "${_contents}")
IF(_match)
FOREACH (_current_MOC_INC ${_match})
STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
IF(EXISTS ${_abs_PATH}/${_basename}.hpp)
SET(_header ${_abs_PATH}/${_basename}.hpp)
ELSE(EXISTS ${_abs_PATH}/${_basename}.hpp)
SET(_header ${_abs_PATH}/${_basename}.h)
ENDIF(EXISTS ${_abs_PATH}/${_basename}.hpp)
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
ENDFOREACH (_current_MOC_INC)
ENDIF(_match)
ENDIF ( NOT _skip AND EXISTS ${_abs_FILE} )
ENDFOREACH (_current_FILE)
ENDMACRO(QT4_AUTOMOC)
MACRO(QT4_CREATE_TRANSLATION _qm_files)
QT4_EXTRACT_OPTIONS(_lupdate_files _lupdate_options ${ARGN})
SET(_my_sources)
SET(_my_dirs)
SET(_my_tsfiles)
SET(_ts_pro)
FOREACH (_file ${_lupdate_files})
GET_FILENAME_COMPONENT(_ext ${_file} EXT)
GET_FILENAME_COMPONENT(_abs_FILE ${_file} ABSOLUTE)
IF(_ext MATCHES "ts")
LIST(APPEND _my_tsfiles ${_abs_FILE})
ELSE(_ext MATCHES "ts")
IF(NOT _ext)
LIST(APPEND _my_dirs ${_abs_FILE})
ELSE(NOT _ext)
LIST(APPEND _my_sources ${_abs_FILE})
ENDIF(NOT _ext)
ENDIF(_ext MATCHES "ts")
ENDFOREACH(_file)
FOREACH(_ts_file ${_my_tsfiles})
IF(_my_sources)
# make a .pro file to call lupdate on, so we don't make our commands too
# long for some systems
GET_FILENAME_COMPONENT(_ts_name ${_ts_file} NAME_WE)
SET(_ts_pro ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_ts_name}_lupdate.pro)
SET(_pro_srcs)
FOREACH(_pro_src ${_my_sources})
SET(_pro_srcs "${_pro_srcs} \"${_pro_src}\"")
ENDFOREACH(_pro_src ${_my_sources})
FILE(WRITE ${_ts_pro} "SOURCES = ${_pro_srcs}")
ENDIF(_my_sources)
ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
COMMAND ${QT_LUPDATE_EXECUTABLE}
ARGS ${_lupdate_options} ${_ts_pro} ${_my_dirs} -ts ${_ts_file}
DEPENDS ${_my_sources} ${_ts_pro})
ENDFOREACH(_ts_file)
QT4_ADD_TRANSLATION(${_qm_files} ${_my_tsfiles})
ENDMACRO(QT4_CREATE_TRANSLATION)
MACRO(QT4_ADD_TRANSLATION _qm_files)
FOREACH (_current_FILE ${ARGN})
GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE)
GET_SOURCE_FILE_PROPERTY(output_location ${_abs_FILE} OUTPUT_LOCATION)
IF(output_location)
FILE(MAKE_DIRECTORY "${output_location}")
SET(qm "${output_location}/${qm}.qm")
ELSE(output_location)
SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
ENDIF(output_location)
ADD_CUSTOM_COMMAND(OUTPUT ${qm}
COMMAND ${QT_LRELEASE_EXECUTABLE}
ARGS ${_abs_FILE} -qm ${qm}
DEPENDS ${_abs_FILE}
)
SET(${_qm_files} ${${_qm_files}} ${qm})
ENDFOREACH (_current_FILE)
ENDMACRO(QT4_ADD_TRANSLATION)
Index: FindLibXslt.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXslt.cmake,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C 2 -d -r1.3.4.1 -r1.3.4.2
*** FindLibXslt.cmake 1 Oct 2009 21:20:30 -0000 1.3.4.1
--- FindLibXslt.cmake 28 Jan 2010 21:47:37 -0000 1.3.4.2
***************
*** 1,3 ****
! # - Try to find LibXslt
# Once done this will define
#
--- 1,3 ----
! # - Try to find the LibXslt library
# Once done this will define
#
***************
*** 21,44 ****
# License text for the above reference.)
! IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
! # in cache already
! SET(LibXslt_FIND_QUIETLY TRUE)
! ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
- IF (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
- PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags)
- SET(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
- ENDIF (NOT WIN32)
! FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
! ${_LibXsltIncDir}
)
FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
! PATHS
! ${_LibXsltLinkDir}
)
--- 21,41 ----
# License text for the above reference.)
! # use pkg-config to get the directories and then use these values
! # in the FIND_PATH() and FIND_LIBRARY() calls
! 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
! ${PC_LIBXSLT_INCLUDEDIR}
! ${PC_LIBXSLT_INCLUDE_DIRS}
)
FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
! HINTS
! ${PC_LIBXSLT_LIBDIR}
! ${PC_LIBXSLT_LIBRARY_DIRS}
)
More information about the Cmake-commits
mailing list