Hi, The usual CMake update. To be tested in a bulk, I suppose...
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/cmake/Makefile,v retrieving revision 1.51 diff -u -p -r1.51 Makefile --- Makefile 29 Mar 2012 13:38:13 -0000 1.51 +++ Makefile 2 May 2012 14:29:47 -0000 @@ -6,8 +6,7 @@ BROKEN-arm = build fails since move to g HOMEPAGE = http://www.cmake.org/ CATEGORIES = devel COMMENT = portable build system -DISTNAME = cmake-2.8.7 -REVISION = 0 +DISTNAME = cmake-2.8.8 MASTER_SITES = ${HOMEPAGE}files/v2.8/ MAINTAINER = David Coppa <dco...@openbsd.org> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/cmake/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 7 Jan 2012 22:14:51 -0000 1.14 +++ distinfo 2 May 2012 14:29:47 -0000 @@ -1,5 +1,5 @@ -MD5 (cmake-2.8.7.tar.gz) = 4bI3rq7YgPZd7JwgYCRS9g== -RMD160 (cmake-2.8.7.tar.gz) = E7GI51FS/u9OVpKAfjqefDSyb+M= -SHA1 (cmake-2.8.7.tar.gz) = 0gYYK0VPTR3esPEdfRvopm5cJGQ= -SHA256 (cmake-2.8.7.tar.gz) = EwkjBT2P4aKuAyo/CQIfkCS/KdegTtEK4EZH/wDs9Z8= -SIZE (cmake-2.8.7.tar.gz) = 5667409 +MD5 (cmake-2.8.8.tar.gz) = unSyLHiKDIVHl2uIDNArFw== +RMD160 (cmake-2.8.8.tar.gz) = 22CZn9TRs+Lig2jUUDWgWO1+djk= +SHA1 (cmake-2.8.8.tar.gz) = p038PgoNf4V6xd2gO7mevwdnbaE= +SHA256 (cmake-2.8.8.tar.gz) = K1mJeGTWIg/yCqjqxkysiZTgBImKHA+JnIy017dXC0Y= +SIZE (cmake-2.8.8.tar.gz) = 5691656 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v retrieving revision 1.9 diff -u -p -r1.9 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 7 Jan 2012 22:14:51 -0000 1.9 +++ patches/patch-CMakeLists_txt 2 May 2012 14:29:47 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-CMakeLists_txt,v 1.9 2012/01/07 22:14:51 dcoppa Exp $ ---- CMakeLists.txt.orig Fri Dec 30 17:49:56 2011 -+++ CMakeLists.txt Mon Jan 2 14:50:01 2012 +--- CMakeLists.txt.orig Wed Apr 18 20:10:54 2012 ++++ CMakeLists.txt Mon Apr 30 11:07:24 2012 @@ -258,6 +258,15 @@ MACRO (CMAKE_BUILD_UTILITIES) # (a macro defined in this file) CMAKE_HANDLE_SYSTEM_LIBRARIES() @@ -17,7 +17,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.9 201 #--------------------------------------------------------------------- # Build zlib library for Curl, CMake, and CTest. SET(CMAKE_ZLIB_HEADER "cm_zlib.h") -@@ -396,26 +405,7 @@ MACRO (CMAKE_BUILD_UTILITIES) +@@ -397,26 +406,7 @@ MACRO (CMAKE_BUILD_UTILITIES) ELSE (UNIX) SET(BUILD_CursesDialog 0) ENDIF (UNIX) Index: patches/patch-Modules_Compiler_GNU_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules_Compiler_GNU_cmake --- patches/patch-Modules_Compiler_GNU_cmake 15 Nov 2010 11:39:08 -0000 1.2 +++ patches/patch-Modules_Compiler_GNU_cmake 2 May 2012 14:29:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.2 2010/11/15 11:39:08 dcoppa Exp $ ---- Modules/Compiler/GNU.cmake.orig Wed Nov 3 20:58:27 2010 -+++ Modules/Compiler/GNU.cmake Wed Nov 10 10:35:50 2010 -@@ -27,8 +27,8 @@ macro(__compiler_gnu lang) +--- Modules/Compiler/GNU.cmake.orig Wed Apr 18 20:10:54 2012 ++++ Modules/Compiler/GNU.cmake Mon Apr 30 11:07:25 2012 +@@ -39,8 +39,8 @@ macro(__compiler_gnu lang) # Initial configuration flags. set(CMAKE_${lang}_FLAGS_INIT "") set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g") Index: patches/patch-Modules_FindBoost_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindBoost_cmake,v retrieving revision 1.3 diff -u -p -r1.3 patch-Modules_FindBoost_cmake --- patches/patch-Modules_FindBoost_cmake 13 Mar 2011 18:23:02 -0000 1.3 +++ patches/patch-Modules_FindBoost_cmake 2 May 2012 14:29:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Modules_FindBoost_cmake,v 1.3 2011/03/13 18:23:02 dcoppa Exp $ ---- Modules/FindBoost.cmake.orig Tue Feb 15 18:47:27 2011 -+++ Modules/FindBoost.cmake Mon Mar 7 10:07:46 2011 -@@ -72,7 +72,9 @@ +--- Modules/FindBoost.cmake.orig Wed Apr 18 20:10:54 2012 ++++ Modules/FindBoost.cmake Mon Apr 30 11:07:25 2012 +@@ -73,7 +73,9 @@ # omit the 3rd version number from include paths if it is 0 although not all # binary Boost releases do so. # Index: patches/patch-Modules_FindPythonInterp_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake,v retrieving revision 1.4 diff -u -p -r1.4 patch-Modules_FindPythonInterp_cmake --- patches/patch-Modules_FindPythonInterp_cmake 14 Oct 2011 17:22:10 -0000 1.4 +++ patches/patch-Modules_FindPythonInterp_cmake 2 May 2012 14:29:47 -0000 @@ -1,24 +1,31 @@ $OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.4 2011/10/14 17:22:10 dcoppa Exp $ ---- Modules/FindPythonInterp.cmake.orig Tue Oct 4 18:09:24 2011 -+++ Modules/FindPythonInterp.cmake Fri Oct 7 09:15:16 2011 -@@ -29,11 +29,17 @@ - # Search for the current active python version first - find_program(PYTHON_EXECUTABLE NAMES python) +--- Modules/FindPythonInterp.cmake.orig Mon Apr 30 11:57:33 2012 ++++ Modules/FindPythonInterp.cmake Mon Apr 30 12:07:14 2012 +@@ -29,6 +29,8 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) +SET(MODPY_VERSION $ENV{MODPY_VERSION}) + + unset(_Python_NAMES) + + set(_PYTHON1_VERSIONS 1.6 1.5) +@@ -65,10 +67,14 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) + # Set up the versions we know about, in the order we will search. Always add # the user supplied additional versions to the front. -set(_Python_VERSIONS - ${Python_ADDITIONAL_VERSIONS} -- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) +- ${_PYTHON_FIND_OTHER_VERSIONS} +- ) +IF(MODPY_VERSION) + set(_Python_VERSIONS ${MODPY_VERSION}) +ELSE(MODPY_VERSION) + set(_Python_VERSIONS + ${Python_ADDITIONAL_VERSIONS} -+ 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++ ${_PYTHON_FIND_OTHER_VERSIONS} ++ ) +ENDIF(MODPY_VERSION) - # Search for newest python version if python executable isn't found - if(NOT PYTHON_EXECUTABLE) + unset(_PYTHON_FIND_OTHER_VERSIONS) + unset(_PYTHON1_VERSIONS) Index: patches/patch-Modules_FindPythonLibs_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v retrieving revision 1.3 diff -u -p -r1.3 patch-Modules_FindPythonLibs_cmake --- patches/patch-Modules_FindPythonLibs_cmake 13 Mar 2011 18:23:02 -0000 1.3 +++ patches/patch-Modules_FindPythonLibs_cmake 2 May 2012 14:29:47 -0000 @@ -1,29 +1,36 @@ $OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.3 2011/03/13 18:23:02 dcoppa Exp $ ---- Modules/FindPythonLibs.cmake.orig Tue Feb 15 18:47:27 2011 -+++ Modules/FindPythonLibs.cmake Mon Mar 7 11:42:19 2011 -@@ -27,11 +27,18 @@ INCLUDE(CMakeFindFrameworks) +--- Modules/FindPythonLibs.cmake.orig Mon Apr 30 11:57:25 2012 ++++ Modules/FindPythonLibs.cmake Mon Apr 30 12:04:05 2012 +@@ -31,6 +31,9 @@ INCLUDE(CMakeFindFrameworks) # Search for the python framework on Apple. CMAKE_FIND_FRAMEWORKS(Python) +SET(MODPY_VERSION $ENV{MODPY_VERSION}) +SET(MODPY_INCDIR $ENV{MODPY_INCDIR}) + + SET(_PYTHON1_VERSIONS 1.6 1.5) + SET(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) + SET(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) +@@ -58,10 +61,14 @@ ENDIF(PythonLibs_FIND_VERSION) + # Set up the versions we know about, in the order we will search. Always add # the user supplied additional versions to the front. --set(_Python_VERSIONS +-SET(_Python_VERSIONS - ${Python_ADDITIONAL_VERSIONS} -- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) +- ${_PYTHON_FIND_OTHER_VERSIONS} +- ) +IF(MODPY_VERSION) -+ set(_Python_VERSIONS ${MODPY_VERSION}) ++ SET(_Python_VERSIONS ${MODPY_VERSION}) +ELSE(MODPY_VERSION) -+ set(_Python_VERSIONS ++ SET(_Python_VERSIONS + ${Python_ADDITIONAL_VERSIONS} -+ 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++ ${_PYTHON_FIND_OTHER_VERSIONS} ++ ) +ENDIF(MODPY_VERSION) - FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) -@@ -74,14 +81,18 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) + UNSET(_PYTHON_FIND_OTHER_VERSIONS) + UNSET(_PYTHON1_VERSIONS) +@@ -113,15 +120,19 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) ENDFOREACH(dir) ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR) @@ -32,6 +39,7 @@ $OpenBSD: patch-Modules_FindPythonLibs_c - PATHS - ${PYTHON_FRAMEWORK_INCLUDES} - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include +- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include - PATH_SUFFIXES - python${_CURRENT_VERSION} - ) @@ -43,6 +51,7 @@ $OpenBSD: patch-Modules_FindPythonLibs_c + PATHS + ${PYTHON_FRAMEWORK_INCLUDES} + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include ++ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include + PATH_SUFFIXES + python${_CURRENT_VERSION} + ) Index: patches/patch-Modules_FindQt3_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt3_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindQt3_cmake --- patches/patch-Modules_FindQt3_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindQt3_cmake 2 May 2012 14:29:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/FindQt3.cmake.orig Tue Apr 6 16:45:31 2010 -+++ Modules/FindQt3.cmake Fri Apr 23 22:50:51 2010 -@@ -60,6 +60,7 @@ FIND_PATH(QT_INCLUDE_DIR qt.h +--- Modules/FindQt3.cmake.orig Wed Apr 18 20:10:54 2012 ++++ Modules/FindQt3.cmake Mon Apr 30 11:07:25 2012 +@@ -64,6 +64,7 @@ FIND_PATH(QT_INCLUDE_DIR qt.h /usr/share/qt3/include C:/Progra~1/qt/include /usr/include/qt3 @@ -9,7 +9,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v ) # if qglobal.h is not in the qt_include_dir then set -@@ -138,7 +139,7 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY +@@ -143,7 +144,7 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY # qt 3 should prefer QTDIR over the PATH FIND_PROGRAM(QT_MOC_EXECUTABLE @@ -18,7 +18,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v HINTS $ENV{QTDIR}/bin PATHS -@@ -147,6 +148,7 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE +@@ -152,6 +153,7 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" $ENV{QTDIR}/bin ${GLOB_PATHS_BIN} @@ -26,7 +26,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v /usr/local/qt/bin /usr/lib/qt/bin /usr/lib/qt3/bin -@@ -161,7 +163,7 @@ ENDIF(QT_MOC_EXECUTABLE) +@@ -166,7 +168,7 @@ ENDIF(QT_MOC_EXECUTABLE) # qt 3 should prefer QTDIR over the PATH FIND_PROGRAM(QT_UIC_EXECUTABLE @@ -35,7 +35,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v HINTS $ENV{QTDIR}/bin PATHS -@@ -169,6 +171,7 @@ FIND_PROGRAM(QT_UIC_EXECUTABLE +@@ -174,6 +176,7 @@ FIND_PROGRAM(QT_UIC_EXECUTABLE "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" ${GLOB_PATHS_BIN} Index: patches/patch-Modules_FindQt4_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v retrieving revision 1.12 diff -u -p -r1.12 patch-Modules_FindQt4_cmake --- patches/patch-Modules_FindQt4_cmake 14 Oct 2011 17:22:10 -0000 1.12 +++ patches/patch-Modules_FindQt4_cmake 2 May 2012 14:29:47 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v 1.12 2011/10/14 17:22:10 dcoppa Exp $ ---- Modules/FindQt4.cmake.orig Tue Oct 4 18:09:24 2011 -+++ Modules/FindQt4.cmake Fri Oct 7 09:15:17 2011 +--- Modules/FindQt4.cmake.orig Wed Apr 18 20:10:54 2012 ++++ Modules/FindQt4.cmake Mon Apr 30 11:07:25 2012 @@ -473,13 +473,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE # check for qmake # Debian uses qmake-qt4 @@ -29,7 +29,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v # double check that it was a Qt4 qmake, if not, re-find with different names IF (QT_QMAKE_EXECUTABLE) -@@ -921,6 +928,12 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) +@@ -922,6 +929,12 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) _QT4_ADJUST_LIB_VARS(QAxContainer) ENDIF(Q_WS_WIN) @@ -42,7 +42,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v ####################################### # -@@ -945,13 +958,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) +@@ -946,13 +959,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) ENDIF(QT_QMAKE_CHANGED) FIND_PROGRAM(QT_MOC_EXECUTABLE Index: patches/patch-Modules_FindRuby_cmake =================================================================== RCS file: patches/patch-Modules_FindRuby_cmake diff -N patches/patch-Modules_FindRuby_cmake --- patches/patch-Modules_FindRuby_cmake 12 Jan 2012 13:14:33 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,107 +0,0 @@ -$OpenBSD: patch-Modules_FindRuby_cmake,v 1.4 2012/01/12 13:14:33 dcoppa Exp $ - -Use 'RbConfig::CONFIG' instead of deprecated 'Config::CONFIG' - -Fix usage of RUBY_VERSION_MAJOR -(upstream git commit 93c55ec1421a2cf43dbcaf9afd0528c8dda42de5) - -Add more possible library names -(upstream git commit 3db2c8b9eafe4cc1d3a6e9d1f3bfc90764544d01) - -Add more debug output -(upstream git commit a9bca052f8ff013d8f47cf365495d2c8d0a2e70f) - ---- Modules/FindRuby.cmake.orig Fri Dec 30 17:49:56 2011 -+++ Modules/FindRuby.cmake Thu Jan 12 13:29:30 2012 -@@ -60,38 +60,38 @@ ENDIF("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS - FIND_PROGRAM(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}) - - --IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION) -+IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) - # query the ruby version -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MAJOR']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MAJOR']" - OUTPUT_VARIABLE RUBY_VERSION_MAJOR) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['MINOR']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MINOR']" - OUTPUT_VARIABLE RUBY_VERSION_MINOR) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['TEENY']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['TEENY']" - OUTPUT_VARIABLE RUBY_VERSION_PATCH) - - # query the different directories -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['archdir']" - OUTPUT_VARIABLE RUBY_ARCH_DIR) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['arch']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']" - OUTPUT_VARIABLE RUBY_ARCH) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubyhdrdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir']" - OUTPUT_VARIABLE RUBY_HDR_DIR) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']" - OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']" - OUTPUT_VARIABLE RUBY_RUBY_LIB_DIR) - - # site_ruby -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['sitearchdir']" - OUTPUT_VARIABLE RUBY_SITEARCH_DIR) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['sitelibdir']" - OUTPUT_VARIABLE RUBY_SITELIB_DIR) - - # vendor_ruby available ? -@@ -99,10 +99,10 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION) - OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) - - IF(RUBY_HAS_VENDOR_RUBY) -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendorlibdir']" - OUTPUT_VARIABLE RUBY_VENDORLIB_DIR) - -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir']" - OUTPUT_VARIABLE RUBY_VENDORARCH_DIR) - ENDIF(RUBY_HAS_VENDOR_RUBY) - -@@ -135,7 +135,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION) - RUBY_VERSION_MINOR - RUBY_VERSION_PATCH - ) --ENDIF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION) -+ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) - - # In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling) - # try to detect which version we found. This is not too good. -@@ -180,7 +180,7 @@ ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR - - - # Determine the list of possible names for the ruby library --SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT}) -+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION}) - - IF(WIN32) - SET( _RUBY_MSVC_RUNTIME "" ) -@@ -224,6 +224,10 @@ IF(_RUBY_DEBUG_OUTPUT) - MESSAGE(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}") - MESSAGE(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"") - MESSAGE(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}") -+ MESSAGE(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}") -+ MESSAGE(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}") -+ MESSAGE(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}") -+ MESSAGE(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}") - MESSAGE(STATUS "--------------------") - ENDIF(_RUBY_DEBUG_OUTPUT) - Index: patches/patch-Modules_FindSDL_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindSDL_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindSDL_cmake --- patches/patch-Modules_FindSDL_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindSDL_cmake 2 May 2012 14:29:47 -0000 @@ -1,20 +1,20 @@ $OpenBSD: patch-Modules_FindSDL_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/FindSDL.cmake.orig Tue Apr 6 16:45:31 2010 -+++ Modules/FindSDL.cmake Mon Apr 26 14:10:36 2010 -@@ -81,6 +81,11 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h - /opt/csw # Blastwave +--- Modules/FindSDL.cmake.orig Mon Apr 30 11:22:09 2012 ++++ Modules/FindSDL.cmake Mon Apr 30 11:23:36 2012 +@@ -82,6 +82,11 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h /opt ) -+# On OpenBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, -+# which is located in ${LOCALBASE}/include. Append {LOCALBASE}/include + ++# On OpenBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, ++# which is located in ${LOCALBASE}/include. Append {LOCALBASE}/include +# to the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box. +LIST(APPEND SDL_INCLUDE_DIR ${LOCALBASE}/include) + - #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") - # SDL-1.1 is the name used by FreeBSD ports... -@@ -100,7 +105,7 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP - #MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}") + # don't confuse it for the version number. + FIND_LIBRARY(SDL_LIBRARY_TEMP +@@ -97,7 +102,7 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP + ) IF(NOT SDL_BUILDING_LIBRARY) - IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") @@ -22,7 +22,7 @@ $OpenBSD: patch-Modules_FindSDL_cmake,v # Non-OS X framework versions expect you to also dynamically link to # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms # seem to provide SDLmain for compatibility even though they don't -@@ -116,7 +121,7 @@ IF(NOT SDL_BUILDING_LIBRARY) +@@ -113,7 +118,7 @@ IF(NOT SDL_BUILDING_LIBRARY) /opt/csw /opt ) Index: patches/patch-Modules_FindTCL_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTCL_cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules_FindTCL_cmake --- patches/patch-Modules_FindTCL_cmake 13 Mar 2011 18:23:02 -0000 1.2 +++ patches/patch-Modules_FindTCL_cmake 2 May 2012 14:29:47 -0000 @@ -1,10 +1,18 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.2 2011/03/13 18:23:02 dcoppa Exp $ ---- Modules/FindTCL.cmake.orig Tue Feb 15 18:47:27 2011 -+++ Modules/FindTCL.cmake Wed Mar 9 14:36:39 2011 -@@ -48,15 +48,32 @@ INCLUDE(CMakeFindFrameworks) +--- Modules/FindTCL.cmake.orig Mon Apr 30 11:24:38 2012 ++++ Modules/FindTCL.cmake Mon Apr 30 11:35:24 2012 +@@ -48,19 +48,36 @@ INCLUDE(CMakeFindFrameworks) INCLUDE(FindTclsh) INCLUDE(FindWish) +-IF(TCLSH_VERSION_STRING) +- SET(TCL_TCLSH_VERSION "${TCLSH_VERSION_STRING}") +-ELSE(TCLSH_VERSION_STRING) +- GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) +- GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) +- STRING(REGEX REPLACE +- "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") +-ENDIF(TCLSH_VERSION_STRING) +SET(MODTCL_VERSION $ENV{MODTCL_VERSION}) +SET(MODTK_VERSION $ENV{MODTK_VERSION}) +SET(MODTCL_INCDIR $ENV{MODTCL_INCDIR}) @@ -13,18 +21,20 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v +SET(MODTK_LIB $ENV{MODTK_LIB}) +SET(MODTCL_LIBDIR $ENV{MODTCL_LIBDIR}) +SET(MODTK_LIBDIR $ENV{MODTK_LIBDIR}) -+ - GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) - GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) --STRING(REGEX REPLACE -- "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") + +IF(MODTCL_VERSION) + SET(TCL_TCLSH_VERSION "${MODTCL_VERSION}") +ELSE(MODTCL_VERSION) -+ STRING(REGEX REPLACE -+ "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") ++ IF(TCLSH_VERSION_STRING) ++ SET(TCL_TCLSH_VERSION "${TCLSH_VERSION_STRING}") ++ ELSE(TCLSH_VERSION_STRING) ++ GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) ++ GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) ++ STRING(REGEX REPLACE ++ "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") ++ ENDIF(TCLSH_VERSION_STRING) +ENDIF(MODTCL_VERSION) - ++ GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH) GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH) -STRING(REGEX REPLACE @@ -38,7 +48,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH) -@@ -71,17 +88,37 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI +@@ -75,17 +92,37 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI STRING(REGEX REPLACE "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}") @@ -86,7 +96,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v IF(WIN32) GET_FILENAME_COMPONENT( ActiveTcl_CurrentVersion -@@ -101,31 +138,47 @@ IF(WIN32) +@@ -105,31 +142,47 @@ IF(WIN32) ) ENDIF(WIN32) @@ -158,7 +168,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v CMAKE_FIND_FRAMEWORKS(Tcl) CMAKE_FIND_FRAMEWORKS(Tk) -@@ -149,26 +202,46 @@ IF(Tk_FRAMEWORKS) +@@ -153,26 +206,46 @@ IF(Tk_FRAMEWORKS) ENDIF(NOT TK_INCLUDE_PATH) ENDIF(Tk_FRAMEWORKS) Index: patches/patch-Modules_FindThreads_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindThreads_cmake,v retrieving revision 1.3 diff -u -p -r1.3 patch-Modules_FindThreads_cmake --- patches/patch-Modules_FindThreads_cmake 12 Jul 2010 19:19:30 -0000 1.3 +++ patches/patch-Modules_FindThreads_cmake 2 May 2012 14:29:47 -0000 @@ -1,39 +1,47 @@ $OpenBSD: patch-Modules_FindThreads_cmake,v 1.3 2010/07/12 19:19:30 dcoppa Exp $ ---- Modules/FindThreads.cmake.orig Mon Jun 28 17:15:57 2010 -+++ Modules/FindThreads.cmake Mon Jul 5 11:23:18 2010 -@@ -42,72 +42,9 @@ ELSE() +--- Modules/FindThreads.cmake.orig Mon Apr 30 11:43:02 2012 ++++ Modules/FindThreads.cmake Mon Apr 30 11:48:51 2012 +@@ -43,80 +43,9 @@ ELSE() # We have pthread.h # Let's check for the library now. # - SET(CMAKE_HAVE_THREADS_LIBRARY) - IF(NOT THREADS_HAVE_PTHREAD_ARG) -- -- # Do we have -lpthreads -- CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE) -- IF(CMAKE_HAVE_PTHREADS_CREATE) -- SET(CMAKE_THREAD_LIBS_INIT "-lpthreads") +- # Check if pthread functions are in normal C library +- CHECK_SYMBOL_EXISTS(pthread_create pthread.h CMAKE_HAVE_LIBC_CREATE) +- IF(CMAKE_HAVE_LIBC_CREATE) +- SET(CMAKE_THREAD_LIBS_INIT "") - SET(CMAKE_HAVE_THREADS_LIBRARY 1) - SET(Threads_FOUND TRUE) - ENDIF() - -- # Ok, how about -lpthread -- CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE) -- IF(CMAKE_HAVE_PTHREAD_CREATE) -- SET(CMAKE_THREAD_LIBS_INIT "-lpthread") -- SET(Threads_FOUND TRUE) -- SET(CMAKE_HAVE_THREADS_LIBRARY 1) -- ENDIF() +- IF(NOT CMAKE_HAVE_THREADS_LIBRARY) +- # Do we have -lpthreads +- CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE) +- IF(CMAKE_HAVE_PTHREADS_CREATE) +- SET(CMAKE_THREAD_LIBS_INIT "-lpthreads") +- SET(CMAKE_HAVE_THREADS_LIBRARY 1) +- SET(Threads_FOUND TRUE) +- ENDIF() - -- IF(CMAKE_SYSTEM MATCHES "SunOS.*") -- # On sun also check for -lthread -- CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE) -- IF(CMAKE_HAVE_THR_CREATE) -- SET(CMAKE_THREAD_LIBS_INIT "-lthread") +- # Ok, how about -lpthread +- CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE) +- IF(CMAKE_HAVE_PTHREAD_CREATE) +- SET(CMAKE_THREAD_LIBS_INIT "-lpthread") - SET(CMAKE_HAVE_THREADS_LIBRARY 1) - SET(Threads_FOUND TRUE) - ENDIF() -- ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*") - +- IF(CMAKE_SYSTEM MATCHES "SunOS.*") +- # On sun also check for -lthread +- CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE) +- IF(CMAKE_HAVE_THR_CREATE) +- SET(CMAKE_THREAD_LIBS_INIT "-lthread") +- SET(CMAKE_HAVE_THREADS_LIBRARY 1) +- SET(Threads_FOUND TRUE) +- ENDIF() +- ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*") +- ENDIF(NOT CMAKE_HAVE_THREADS_LIBRARY) - ENDIF(NOT THREADS_HAVE_PTHREAD_ARG) - - IF(NOT CMAKE_HAVE_THREADS_LIBRARY) Index: patches/patch-Modules_GenerateExportHeader_cmake =================================================================== RCS file: patches/patch-Modules_GenerateExportHeader_cmake diff -N patches/patch-Modules_GenerateExportHeader_cmake --- patches/patch-Modules_GenerateExportHeader_cmake 12 Jan 2012 13:14:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-Modules_GenerateExportHeader_cmake,v 1.1 2012/01/12 13:14:33 dcoppa Exp $ - -Fix wrong use of IS_ABSOLUTE -(upstream git commit 9f92cdf24d661fa46c19387fdc400c8d19c9a15d) - ---- Modules/GenerateExportHeader.cmake.orig Thu Jan 12 13:38:25 2012 -+++ Modules/GenerateExportHeader.cmake Thu Jan 12 13:39:18 2012 -@@ -298,7 +298,7 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY) - set(EXPORT_MACRO_NAME ${_GEH_PREFIX_NAME}${_GEH_EXPORT_MACRO_NAME}) - endif() - if(_GEH_EXPORT_FILE_NAME) -- if(IS_ABSOLUTE _GEH_EXPORT_FILE_NAME) -+ if(IS_ABSOLUTE ${_GEH_EXPORT_FILE_NAME}) - set(EXPORT_FILE_NAME ${_GEH_EXPORT_FILE_NAME}) - else() - set(EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/${_GEH_EXPORT_FILE_NAME}") Index: patches/patch-Modules_UseJava_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_UseJava_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_UseJava_cmake --- patches/patch-Modules_UseJava_cmake 14 Oct 2011 17:22:10 -0000 1.1 +++ patches/patch-Modules_UseJava_cmake 2 May 2012 14:29:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Modules_UseJava_cmake,v 1.1 2011/10/14 17:22:10 dcoppa Exp $ ---- Modules/UseJava.cmake.orig Fri Oct 7 11:27:56 2011 -+++ Modules/UseJava.cmake Fri Oct 7 11:28:32 2011 -@@ -445,7 +445,7 @@ function (find_jar VARIABLE) +--- Modules/UseJava.cmake.orig Wed Apr 18 20:10:54 2012 ++++ Modules/UseJava.cmake Mon Apr 30 11:07:26 2012 +@@ -465,7 +465,7 @@ function (find_jar VARIABLE) set(_jar_versions) set(_jar_paths /usr/share/java/ Index: patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx =================================================================== RCS file: patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx diff -N patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx --- patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx 12 Jan 2012 13:14:33 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-Source_cmLocalUnixMakefileGenerator3_cxx,v 1.6 2012/01/12 13:14:33 dcoppa Exp $ - -Fix: exit the loop when we have determined the language -(upstream git commit c9597259eac7bf894dbf88a3b78bebedc183440b) - ---- Source/cmLocalUnixMakefileGenerator3.cxx.orig Thu Jan 12 13:50:29 2012 -+++ Source/cmLocalUnixMakefileGenerator3.cxx Thu Jan 12 13:51:02 2012 -@@ -232,6 +232,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile - if(ei->Language == "C" || ei->Language == "CXX") - { - lang_is_c_or_cxx = true; -+ break; - } - } - Index: patches/patch-Source_cmTarget_cxx =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v retrieving revision 1.11 diff -u -p -r1.11 patch-Source_cmTarget_cxx --- patches/patch-Source_cmTarget_cxx 7 Jan 2012 22:14:51 -0000 1.11 +++ patches/patch-Source_cmTarget_cxx 2 May 2012 14:29:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.11 2012/01/07 22:14:51 dcoppa Exp $ ---- Source/cmTarget.cxx.orig Fri Dec 30 17:49:57 2011 -+++ Source/cmTarget.cxx Sat Jan 7 22:13:14 2012 -@@ -3379,9 +3379,43 @@ void cmTarget::GetLibraryNames(std::string& name, +--- Source/cmTarget.cxx.orig Wed Apr 18 20:10:54 2012 ++++ Source/cmTarget.cxx Mon Apr 30 11:07:26 2012 +@@ -3371,9 +3371,43 @@ void cmTarget::GetLibraryNames(std::string& name, // The library name. name = prefix+base+suffix; @@ -45,7 +45,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1. // The library's real name on disk. this->ComputeVersionedName(realName, prefix, base, suffix, -@@ -3414,7 +3448,23 @@ void cmTarget::ComputeVersionedName(std::string& vName +@@ -3406,7 +3440,23 @@ void cmTarget::ComputeVersionedName(std::string& vName if(version) { vName += "."; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/cmake/pkg/PLIST,v retrieving revision 1.16 diff -u -p -r1.16 PLIST --- pkg/PLIST 7 Jan 2012 22:14:51 -0000 1.16 +++ pkg/PLIST 2 May 2012 14:29:47 -0000 @@ -20,6 +20,7 @@ share/cmake/Modules/ share/cmake/Modules/AddFileDependencies.cmake share/cmake/Modules/AutomocInfo.cmake.in share/cmake/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in +share/cmake/Modules/BasicConfigVersion-ExactVersion.cmake.in share/cmake/Modules/BasicConfigVersion-SameMajorVersion.cmake.in share/cmake/Modules/BundleUtilities.cmake share/cmake/Modules/CMake.cmake @@ -28,6 +29,10 @@ share/cmake/Modules/CMakeASMCompiler.cma share/cmake/Modules/CMakeASMInformation.cmake share/cmake/Modules/CMakeASM_MASMInformation.cmake share/cmake/Modules/CMakeASM_NASMInformation.cmake +share/cmake/Modules/CMakeAddFortranSubdirectory/ +share/cmake/Modules/CMakeAddFortranSubdirectory.cmake +share/cmake/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in +share/cmake/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in share/cmake/Modules/CMakeAddNewLanguage.txt share/cmake/Modules/CMakeBackwardCompatibilityC.cmake share/cmake/Modules/CMakeBackwardCompatibilityCXX.cmake @@ -58,6 +63,7 @@ share/cmake/Modules/CMakeDetermineJavaCo share/cmake/Modules/CMakeDetermineRCCompiler.cmake share/cmake/Modules/CMakeDetermineSystem.cmake share/cmake/Modules/CMakeDetermineVSServicePack.cmake +share/cmake/Modules/CMakeExpandImportedTargets.cmake share/cmake/Modules/CMakeExportBuildSettings.cmake share/cmake/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake share/cmake/Modules/CMakeFindBinUtils.cmake @@ -81,6 +87,8 @@ share/cmake/Modules/CMakeJavaInformation share/cmake/Modules/CMakeMSYSFindMake.cmake share/cmake/Modules/CMakeMinGWFindMake.cmake share/cmake/Modules/CMakeNMakeFindMake.cmake +share/cmake/Modules/CMakeNinjaFindMake.cmake +share/cmake/Modules/CMakePackageConfigHelpers.cmake share/cmake/Modules/CMakeParseArguments.cmake share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake share/cmake/Modules/CMakePlatformId.h.in @@ -130,8 +138,11 @@ share/cmake/Modules/CPack.cmake share/cmake/Modules/CPack.distribution.dist.in share/cmake/Modules/CPackBundle.cmake share/cmake/Modules/CPackComponent.cmake +share/cmake/Modules/CPackCygwin.cmake +share/cmake/Modules/CPackDMG.cmake share/cmake/Modules/CPackDeb.cmake share/cmake/Modules/CPackNSIS.cmake +share/cmake/Modules/CPackPackageMaker.cmake share/cmake/Modules/CPackRPM.cmake share/cmake/Modules/CPackZIP.cmake share/cmake/Modules/CTest.cmake @@ -153,6 +164,7 @@ share/cmake/Modules/CheckIncludeFile.cma share/cmake/Modules/CheckIncludeFile.cxx.in share/cmake/Modules/CheckIncludeFileCXX.cmake share/cmake/Modules/CheckIncludeFiles.cmake +share/cmake/Modules/CheckLanguage.cmake share/cmake/Modules/CheckLibraryExists.cmake share/cmake/Modules/CheckLibraryExists.lists.in share/cmake/Modules/CheckPrototypeDefinition.c.in @@ -348,7 +360,9 @@ share/cmake/Modules/FindosgGA.cmake share/cmake/Modules/FindosgIntrospection.cmake share/cmake/Modules/FindosgManipulator.cmake share/cmake/Modules/FindosgParticle.cmake +share/cmake/Modules/FindosgPresentation.cmake share/cmake/Modules/FindosgProducer.cmake +share/cmake/Modules/FindosgQt.cmake share/cmake/Modules/FindosgShadow.cmake share/cmake/Modules/FindosgSim.cmake share/cmake/Modules/FindosgTerrain.cmake @@ -525,7 +539,9 @@ share/cmake/Modules/Platform/UnixPaths.c share/cmake/Modules/Platform/UnixWare.cmake share/cmake/Modules/Platform/Windows-Borland-C.cmake share/cmake/Modules/Platform/Windows-Borland-CXX.cmake -share/cmake/Modules/Platform/Windows-Borland.cmake +share/cmake/Modules/Platform/Windows-Embarcadero-C.cmake +share/cmake/Modules/Platform/Windows-Embarcadero-CXX.cmake +share/cmake/Modules/Platform/Windows-Embarcadero.cmake share/cmake/Modules/Platform/Windows-G95-Fortran.cmake share/cmake/Modules/Platform/Windows-GNU-C-ABI.cmake share/cmake/Modules/Platform/Windows-GNU-C.cmake
cmake-2.8.8.diff.gz
Description: Binary data