Here's the update to CMake-3.2.1. It wants the new port for devel/jsoncpp I've sent attached to my previous mail.
As usual, put it in your next bulk if you can so we'll be sure to
not break anything.
Cheers!
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.123
diff -u -p -u -p -r1.123 Makefile
--- Makefile 13 Feb 2015 14:17:36 -0000 1.123
+++ Makefile 18 Mar 2015 14:11:14 -0000
@@ -9,7 +9,7 @@ CFLAGS += -O1 -fno-stack-protector
COMMENT = portable build system
-VER = 3.1.3
+VER = 3.2.1
DISTNAME = cmake-${VER}
CATEGORIES = devel
@@ -23,8 +23,8 @@ MASTER_SITES = ${HOMEPAGE}files/v${VER:R
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = archive c curl expat form m ncurses \
- stdc++ z
+WANTLIB = archive c curl expat form jsoncpp \
+ m ncurses stdc++ z
# XXX: CMake's built-in ELF parser is broken on arm
# XXX: Ninja is broken on m88k
@@ -35,6 +35,7 @@ BUILD_DEPENDS = devel/ninja>=1.5.1
BUILD_DEPENDS += textproc/py-sphinx>=1.1.3p1
LIB_DEPENDS = archivers/libarchive \
+ devel/jsoncpp \
net/curl
CONFIGURE_STYLE = simple
@@ -61,7 +62,6 @@ TEST_TARGET = test
MAKE_FLAGS += VERBOSE=1
pre-configure:
- rm -f ${WRKSRC}/Help/manual/cmake-gui.1.rst
cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
${SUBST_CMD} ${WRKSRC}/Modules/CMakeDetermineJavaCompiler.cmake \
${WRKSRC}/Modules/FindJNI.cmake \
@@ -90,8 +90,7 @@ do-test:
.endif
post-install:
- rm ${WRKINST}${LOCALBASE}/share/cmake/Help/*.orig \
- ${WRKINST}${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig}
\
+ rm ${WRKINST}${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig} \
${WRKINST}${LOCALBASE}/share/cmake/Modules/Compiler/*.orig \
${WRKINST}${LOCALBASE}/share/cmake/Modules/Platform/*.orig
Index: cmake.port.mk
===================================================================
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 cmake.port.mk
--- cmake.port.mk 13 Feb 2015 14:17:36 -0000 1.41
+++ cmake.port.mk 18 Mar 2015 14:11:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: cmake.port.mk,v 1.41 2015/02/13 14:17:36 dcoppa Exp $
-BUILD_DEPENDS+= devel/cmake>=3.1.3
+BUILD_DEPENDS+= devel/cmake>=3.2.1
.for _n _v in ${SHARED_LIBS}
CONFIGURE_ENV+=LIB${_n}_VERSION=${_v}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 distinfo
--- distinfo 13 Feb 2015 14:17:36 -0000 1.31
+++ distinfo 18 Mar 2015 14:11:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.1.3.tar.gz) = RfTT+oovYcwJKuRhqsTKwbq0rGcG+YJ06n8xTdMVxtA=
-SIZE (cmake-3.1.3.tar.gz) = 5959549
+SHA256 (cmake-3.2.1.tar.gz) = dZ8c9rGiawN3Jqmsym2lASNcIK02cd8p1D8pBS7xUCw=
+SIZE (cmake-3.2.1.tar.gz) = 6437801
Index: files/FindLibintl.cmake
===================================================================
RCS file: files/FindLibintl.cmake
diff -N files/FindLibintl.cmake
--- files/FindLibintl.cmake 15 Jun 2012 10:26:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-# Try to find Libintl functionality
-# Once done this will define
-#
-# LIBINTL_FOUND - system has Libintl
-# LIBINTL_INCLUDE_DIR - Libintl include directory
-# LIBINTL_LIBRARIES - Libraries needed to use Libintl
-#
-# TODO: This will enable translations only if Gettext functionality is
-# present in libc. Must have more robust system for release, where Gettext
-# functionality can also reside in standalone Gettext library, or the one
-# embedded within kdelibs (cf. gettext.m4 from Gettext source).
-
-# Copyright (c) 2006, Chusslove Illich, <[email protected]>
-# Copyright (c) 2007, Alexander Neundorf, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
- set(Libintl_FIND_QUIETLY TRUE)
-endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
-
-find_path(LIBINTL_INCLUDE_DIR libintl.h)
-
-set(LIBINTL_LIB_FOUND FALSE)
-
-if(LIBINTL_INCLUDE_DIR)
- include(CheckFunctionExists)
- check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT)
-
- if (LIBINTL_LIBC_HAS_DGETTEXT)
- set(LIBINTL_LIBRARIES)
- set(LIBINTL_LIB_FOUND TRUE)
- else (LIBINTL_LIBC_HAS_DGETTEXT)
- find_library(LIBINTL_LIBRARIES NAMES intl libintl )
- if(LIBINTL_LIBRARIES)
- set(LIBINTL_LIB_FOUND TRUE)
- endif(LIBINTL_LIBRARIES)
- endif (LIBINTL_LIBC_HAS_DGETTEXT)
-
-endif(LIBINTL_INCLUDE_DIR)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_INCLUDE_DIR
LIBINTL_LIB_FOUND)
-
-mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES
LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND)
-
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 31 Dec 2014 11:06:02 -0000 1.15
+++ patches/patch-CMakeLists_txt 18 Mar 2015 14:11:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.15 2014/12/31 11:06:02 dcoppa Exp $
---- CMakeLists.txt.orig Mon Dec 15 14:07:43 2014
-+++ CMakeLists.txt Thu Dec 18 05:37:11 2014
-@@ -239,6 +239,15 @@ macro (CMAKE_BUILD_UTILITIES)
+--- CMakeLists.txt.orig Tue Mar 10 09:38:44 2015
++++ CMakeLists.txt Wed Mar 18 06:23:59 2015
+@@ -249,6 +249,15 @@ macro (CMAKE_BUILD_UTILITIES)
# (a macro defined in this file)
CMAKE_HANDLE_SYSTEM_LIBRARIES()
@@ -17,13 +17,3 @@ $OpenBSD: patch-CMakeLists_txt,v 1.15 20
#---------------------------------------------------------------------
# Build zlib library for Curl, CMake, and CTest.
set(CMAKE_ZLIB_HEADER "cm_zlib.h")
-@@ -396,9 +405,6 @@ macro (CMAKE_BUILD_UTILITIES)
- else ()
- set(BUILD_CursesDialog 0)
- endif ()
-- if(BUILD_CursesDialog)
-- add_subdirectory(Source/CursesDialog/form)
-- endif()
- endmacro ()
-
- #-----------------------------------------------------------------------
Index: patches/patch-Help_index_rst
===================================================================
RCS file: patches/patch-Help_index_rst
diff -N patches/patch-Help_index_rst
--- patches/patch-Help_index_rst 11 Sep 2014 10:24:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Help_index_rst,v 1.1 2014/09/11 10:24:38 dcoppa Exp $
---- Help/index.rst.orig Wed Sep 3 19:47:02 2014
-+++ Help/index.rst Wed Sep 3 19:47:12 2014
-@@ -16,7 +16,6 @@ Interactive Dialogs
- .. toctree::
- :maxdepth: 1
-
-- /manual/cmake-gui.1
- /manual/ccmake.1
-
- Reference Manuals
Index: patches/patch-Modules_Compiler_GNU-Fortran_cmake
===================================================================
RCS file:
/cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Modules_Compiler_GNU-Fortran_cmake
--- patches/patch-Modules_Compiler_GNU-Fortran_cmake 11 Nov 2012 17:13:31
-0000 1.3
+++ patches/patch-Modules_Compiler_GNU-Fortran_cmake 18 Mar 2015 14:11:14
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_Compiler_GNU-Fortran_cmake,v 1.3 2012/11/11 17:13:31
dcoppa Exp $
---- Modules/Compiler/GNU-Fortran.cmake.orig Fri Nov 2 08:16:46 2012
-+++ Modules/Compiler/GNU-Fortran.cmake Fri Nov 2 08:17:05 2012
-@@ -4,10 +4,6 @@ __compiler_gnu(Fortran)
+--- Modules/Compiler/GNU-Fortran.cmake.orig Tue Mar 10 09:38:44 2015
++++ Modules/Compiler/GNU-Fortran.cmake Wed Mar 18 06:15:27 2015
+@@ -4,9 +4,5 @@ __compiler_gnu(Fortran)
set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-ffixed-form")
set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
@@ -9,6 +9,5 @@ $OpenBSD: patch-Modules_Compiler_GNU-For
-set(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os")
-set(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3")
-
- # We require updates to CMake C++ code to support preprocessing rules
- # for Fortran.
- set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE)
+ # Fortran-specific feature flags.
+ set(CMAKE_Fortran_MODDIR_FLAG -J)
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 11 Sep 2014 14:45:12 -0000 1.14
+++ patches/patch-Modules_FindJNI_cmake 18 Mar 2015 14:11:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.14 2014/09/11 14:45:12 dcoppa Exp $
---- Modules/FindJNI.cmake.orig Wed Sep 3 09:13:14 2014
-+++ Modules/FindJNI.cmake Wed Sep 3 09:28:03 2014
+--- Modules/FindJNI.cmake.orig Tue Mar 10 09:38:44 2015
++++ Modules/FindJNI.cmake Wed Mar 18 06:23:04 2015
@@ -35,6 +35,8 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
@@ -23,7 +23,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
endif()
# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -109,50 +113,56 @@ if(_JAVA_HOME_EXPLICIT)
+@@ -109,51 +113,57 @@ if(_JAVA_HOME_EXPLICIT)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()
@@ -34,6 +34,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
- ${_JAVA_HOME}/jre/lib/{libarch}
- ${_JAVA_HOME}/jre/lib
+- ${_JAVA_HOME}/lib/{libarch}
- ${_JAVA_HOME}/lib
- ${_JAVA_HOME}
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
@@ -45,6 +46,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${_JAVA_HOME}/jre/lib/{libarch}
+ ${_JAVA_HOME}/jre/lib
++ ${_JAVA_HOME}/lib/{libarch}
+ ${_JAVA_HOME}/lib
+ ${_JAVA_HOME}
+ )
@@ -120,7 +122,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
set(JAVA_JVM_LIBRARY_DIRECTORIES)
foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
list(APPEND JAVA_JVM_LIBRARY_DIRECTORIES
-@@ -162,33 +172,39 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+@@ -163,33 +173,39 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
)
endforeach()
Index: patches/patch-Modules_Qt4ConfigDependentSettings_cmake
===================================================================
RCS file:
/cvs/ports/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Modules_Qt4ConfigDependentSettings_cmake
--- patches/patch-Modules_Qt4ConfigDependentSettings_cmake 11 Sep 2014
10:24:38 -0000 1.9
+++ patches/patch-Modules_Qt4ConfigDependentSettings_cmake 18 Mar 2015
14:11:14 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.9 2014/09/11
10:24:38 dcoppa Exp $
---- Modules/Qt4ConfigDependentSettings.cmake.orig Thu Jul 31 17:03:56 2014
-+++ Modules/Qt4ConfigDependentSettings.cmake Wed Sep 3 08:10:09 2014
+--- Modules/Qt4ConfigDependentSettings.cmake.orig Tue Mar 10 09:38:44 2015
++++ Modules/Qt4ConfigDependentSettings.cmake Wed Mar 18 07:12:09 2015
@@ -32,6 +32,10 @@
# if a user needs the dependencies, and they couldn't be found, they can set
# the variables themselves.
+include(FindIconv)
-+include(FindLibintl)
++include(FindIntl)
+include(FindLCMS)
+
set(QT_QTGUI_LIB_DEPENDENCIES "")
@@ -53,13 +53,13 @@ $OpenBSD: patch-Modules_Qt4ConfigDepende
+endif(ICONV_FOUND)
+
+## libintl
-+if(LIBINTL_FOUND)
++if(Intl_FOUND)
+ find_library(QT_INTL_LIBRARY NAMES intl)
+ mark_as_advanced(QT_INTL_LIBRARY)
+ if(QT_INTL_LIBRARY)
+ set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
${QT_INTL_LIBRARY})
+ endif(QT_INTL_LIBRARY)
-+endif(LIBINTL_FOUND)
++endif(Intl_FOUND)
## openssl
if(NOT Q_WS_WIN)
Index: patches/patch-Source_CursesDialog_CMakeLists_txt
===================================================================
RCS file: patches/patch-Source_CursesDialog_CMakeLists_txt
diff -N patches/patch-Source_CursesDialog_CMakeLists_txt
--- patches/patch-Source_CursesDialog_CMakeLists_txt 11 Sep 2014 10:24:38
-0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-Source_CursesDialog_CMakeLists_txt,v 1.5 2014/09/11 10:24:38
dcoppa Exp $
---- Source/CursesDialog/CMakeLists.txt.orig Thu Jul 31 17:03:56 2014
-+++ Source/CursesDialog/CMakeLists.txt Wed Sep 3 08:10:09 2014
-@@ -26,13 +26,15 @@ set( CURSES_SRCS
- CursesDialog/ccmake
- )
-
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- include_directories(${CURSES_INCLUDE_PATH})
-
-
- add_executable(ccmake ${CURSES_SRCS} )
- target_link_libraries(ccmake CMakeLib)
--target_link_libraries(ccmake cmForm)
-+target_link_libraries(ccmake form)
-+target_link_libraries(ccmake ${CURSES_LIBRARY})
-+if(CURSES_EXTRA_LIBRARY)
-+ target_link_libraries(ccmake ${CURSES_EXTRA_LIBRARY})
-+endif(CURSES_EXTRA_LIBRARY)
-
- install(TARGETS ccmake DESTINATION bin)
Index: patches/patch-Source_CursesDialog_cmCursesStandardIncludes_h
===================================================================
RCS file: patches/patch-Source_CursesDialog_cmCursesStandardIncludes_h
diff -N patches/patch-Source_CursesDialog_cmCursesStandardIncludes_h
--- patches/patch-Source_CursesDialog_cmCursesStandardIncludes_h 28 May
2010 20:21:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Source_CursesDialog_cmCursesStandardIncludes_h,v 1.1
2010/05/28 20:21:48 dcoppa Exp $
---- Source/CursesDialog/cmCursesStandardIncludes.h.orig Tue Apr 6
16:45:36 2010
-+++ Source/CursesDialog/cmCursesStandardIncludes.h Fri Apr 23 16:01:44 2010
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file:
/cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Source_cmComputeLinkInformation_cxx
--- patches/patch-Source_cmComputeLinkInformation_cxx 31 Dec 2014 11:06:02
-0000 1.11
+++ patches/patch-Source_cmComputeLinkInformation_cxx 18 Mar 2015 14:11:14
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.11 2014/12/31 11:06:02
dcoppa Exp $
---- Source/cmComputeLinkInformation.cxx.orig Mon Dec 15 14:07:43 2014
-+++ Source/cmComputeLinkInformation.cxx Thu Dec 18 05:37:12 2014
-@@ -682,10 +682,19 @@ void cmComputeLinkInformation::AddItem(std::string con
+--- Source/cmComputeLinkInformation.cxx.orig Tue Mar 10 09:38:44 2015
++++ Source/cmComputeLinkInformation.cxx Wed Mar 18 06:24:00 2015
+@@ -667,10 +667,19 @@ void cmComputeLinkInformation::AddItem(std::string con
}
else
{
@@ -24,7 +24,7 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
}
}
else
-@@ -1079,12 +1088,21 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+@@ -1064,12 +1073,21 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
this->SharedLibrariesLinked.insert(target);
}
Index: patches/patch-Source_cmGlobalNinjaGenerator_cxx
===================================================================
RCS file: patches/patch-Source_cmGlobalNinjaGenerator_cxx
diff -N patches/patch-Source_cmGlobalNinjaGenerator_cxx
--- patches/patch-Source_cmGlobalNinjaGenerator_cxx 31 Dec 2014 11:06:02
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$OpenBSD: patch-Source_cmGlobalNinjaGenerator_cxx,v 1.2 2014/12/31 11:06:02
dcoppa Exp $
-
-Use Ninja-1.5's console pool to have visible output during long-running
-tasks which produce status updates on the console (such as test suites)
-
---- Source/cmGlobalNinjaGenerator.cxx.orig Mon Dec 15 14:07:43 2014
-+++ Source/cmGlobalNinjaGenerator.cxx Thu Dec 18 05:37:12 2014
-@@ -238,6 +238,7 @@ void cmGlobalNinjaGenerator::AddCustomCommandRule()
- "$COMMAND",
- "$DESC",
- "Rule for running custom commands.",
-+ /*pool*/ "console",
- /*depfile*/ "",
- /*deptype*/ "",
- /*rspfile*/ "",
-@@ -300,6 +301,7 @@ cmGlobalNinjaGenerator::AddMacOSXContentRule()
- cmd.str(),
- "Copying OS X Content $out",
- "Rule for copying OS X bundle content file.",
-+ /*pool*/ "",
- /*depfile*/ "",
- /*deptype*/ "",
- /*rspfile*/ "",
-@@ -335,6 +337,7 @@ void cmGlobalNinjaGenerator::WriteRule(std::ostream& o
- const std::string& command,
- const std::string& description,
- const std::string& comment,
-+ const std::string& pool,
- const std::string& depfile,
- const std::string& deptype,
- const std::string& rspfile,
-@@ -365,6 +368,13 @@ void cmGlobalNinjaGenerator::WriteRule(std::ostream& o
- // Write the rule.
- os << "rule " << name << "\n";
-
-+ // Write the pool if any.
-+ if(!pool.empty())
-+ {
-+ cmGlobalNinjaGenerator::Indent(os, 1);
-+ os << "pool = " << pool << "\n";
-+ }
-+
- // Write the depfile if any.
- if(!depfile.empty())
- {
-@@ -598,6 +608,7 @@ void cmGlobalNinjaGenerator::AddRule(const std::string
- const std::string& command,
- const std::string& description,
- const std::string& comment,
-+ const std::string& pool,
- const std::string& depfile,
- const std::string& deptype,
- const std::string& rspfile,
-@@ -617,6 +628,7 @@ void cmGlobalNinjaGenerator::AddRule(const std::string
- command,
- description,
- comment,
-+ pool,
- depfile,
- deptype,
- rspfile,
-@@ -1112,6 +1124,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifes
- cmd.str(),
- "Re-running CMake...",
- "Rule for re-running cmake.",
-+ /*pool=*/ "",
- /*depfile=*/ "",
- /*deptype=*/ "",
- /*rspfile=*/ "",
-@@ -1192,6 +1205,7 @@ void cmGlobalNinjaGenerator::WriteTargetClean(std::ost
- ninjaCmd() + " -t clean",
- "Cleaning all built files...",
- "Rule for cleaning all built files.",
-+ /*pool=*/ "",
- /*depfile=*/ "",
- /*deptype=*/ "",
- /*rspfile=*/ "",
-@@ -1215,6 +1229,7 @@ void cmGlobalNinjaGenerator::WriteTargetHelp(std::ostr
- ninjaCmd() + " -t targets",
- "All primary targets available:",
- "Rule for printing all primary targets available.",
-+ /*pool=*/ "",
- /*depfile=*/ "",
- /*deptype=*/ "",
- /*rspfile=*/ "",
Index: patches/patch-Source_cmGlobalNinjaGenerator_h
===================================================================
RCS file: patches/patch-Source_cmGlobalNinjaGenerator_h
diff -N patches/patch-Source_cmGlobalNinjaGenerator_h
--- patches/patch-Source_cmGlobalNinjaGenerator_h 31 Dec 2014 11:06:02
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Source_cmGlobalNinjaGenerator_h,v 1.2 2014/12/31 11:06:02
dcoppa Exp $
-
-Use Ninja-1.5's console pool to have visible output during long-running
-tasks which produce status updates on the console (such as test suites)
-
---- Source/cmGlobalNinjaGenerator.h.orig Mon Dec 15 14:07:43 2014
-+++ Source/cmGlobalNinjaGenerator.h Thu Dec 18 05:37:12 2014
-@@ -120,6 +120,7 @@ class cmGlobalNinjaGenerator : public cmGlobalGenerato
- const std::string& command,
- const std::string& description,
- const std::string& comment,
-+ const std::string& pool,
- const std::string& depfile,
- const std::string& deptype,
- const std::string& rspfile,
-@@ -240,6 +241,7 @@ class cmGlobalNinjaGenerator : public cmGlobalGenerato
- const std::string& command,
- const std::string& description,
- const std::string& comment,
-+ const std::string& pool,
- const std::string& depfile,
- const std::string& deptype,
- const std::string& rspfile,
Index: patches/patch-Source_cmNinjaNormalTargetGenerator_cxx
===================================================================
RCS file: patches/patch-Source_cmNinjaNormalTargetGenerator_cxx
diff -N patches/patch-Source_cmNinjaNormalTargetGenerator_cxx
--- patches/patch-Source_cmNinjaNormalTargetGenerator_cxx 23 Jan 2015
18:01:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-Source_cmNinjaNormalTargetGenerator_cxx,v 1.3 2015/01/23
18:01:09 dcoppa Exp $
-
-Use Ninja-1.5's console pool to have visible output during long-running
-tasks which produce status updates on the console (such as test suites)
-
---- Source/cmNinjaNormalTargetGenerator.cxx.orig Wed Jan 21 08:10:26 2015
-+++ Source/cmNinjaNormalTargetGenerator.cxx Fri Jan 23 11:10:11 2015
-@@ -270,6 +270,7 @@ cmNinjaNormalTargetGenerator
- linkCmd,
- description.str(),
- comment.str(),
-+ /*pool*/ "",
- /*depfile*/ "",
- /*deptype*/ "",
- rspfile,
-@@ -292,6 +293,7 @@ cmNinjaNormalTargetGenerator
- "Creating executable symlink $out",
- "Rule for creating "
- "executable symlink.",
-+ /*pool*/ "",
- /*depfile*/ "",
- /*deptype*/ "",
- /*rspfile*/ "",
-@@ -306,6 +308,7 @@ cmNinjaNormalTargetGenerator
- "Creating library symlink $out",
- "Rule for creating "
- "library symlink.",
-+ /*pool*/ "",
- /*depfile*/ "",
- /*deptype*/ "",
- /*rspfile*/ "",
Index: patches/patch-Source_cmNinjaTargetGenerator_cxx
===================================================================
RCS file: patches/patch-Source_cmNinjaTargetGenerator_cxx
diff -N patches/patch-Source_cmNinjaTargetGenerator_cxx
--- patches/patch-Source_cmNinjaTargetGenerator_cxx 23 Jan 2015 18:01:09
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Source_cmNinjaTargetGenerator_cxx,v 1.3 2015/01/23 18:01:09
dcoppa Exp $
-
-Use Ninja-1.5's console pool to have visible output during long-running
-tasks which produce status updates on the console (such as test suites)
-
---- Source/cmNinjaTargetGenerator.cxx.orig Wed Jan 21 08:10:26 2015
-+++ Source/cmNinjaTargetGenerator.cxx Fri Jan 23 11:10:11 2015
-@@ -472,10 +472,13 @@ cmNinjaTargetGenerator
- comment << "Rule for compiling " << lang << " files.";
- cmOStringStream description;
- description << "Building " << lang << " object $out";
-+ cmOStringStream pool;
-+ pool << "";
- this->GetGlobalGenerator()->AddRule(this->LanguageCompilerRule(lang),
- cmdLine,
- description.str(),
- comment.str(),
-+ pool.str(),
- depfile,
- deptype,
- /*rspfile*/ "",
Index: patches/patch-Source_cmTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 patch-Source_cmTarget_cxx
--- patches/patch-Source_cmTarget_cxx 23 Jan 2015 18:01:09 -0000 1.24
+++ patches/patch-Source_cmTarget_cxx 18 Mar 2015 14:11:14 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.24 2015/01/23 18:01:09 dcoppa Exp $
---- Source/cmTarget.cxx.orig Wed Jan 21 08:10:26 2015
-+++ Source/cmTarget.cxx Fri Jan 23 11:10:11 2015
-@@ -327,7 +327,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
- this->SetPropertyDefault("ANDROID_API", 0);
+--- Source/cmTarget.cxx.orig Tue Mar 10 09:38:44 2015
++++ Source/cmTarget.cxx Wed Mar 18 06:24:00 2015
+@@ -322,7 +322,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
+ this->SetPropertyDefault("ANDROID_API_MIN", 0);
this->SetPropertyDefault("INSTALL_NAME_DIR", 0);
this->SetPropertyDefault("INSTALL_RPATH", "");
- this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
@@ -10,7 +10,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");
this->SetPropertyDefault("BUILD_WITH_INSTALL_RPATH", "OFF");
this->SetPropertyDefault("ARCHIVE_OUTPUT_DIRECTORY", 0);
-@@ -3641,12 +3641,16 @@ std::string cmTarget::GetCompilePDBPath(const std::str
+@@ -3610,12 +3610,16 @@ std::string cmTarget::GetCompilePDBPath(const std::str
//----------------------------------------------------------------------------
bool cmTarget::HasSOName(const std::string& config) const
{
@@ -27,7 +27,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
}
//----------------------------------------------------------------------------
-@@ -4119,9 +4123,14 @@ void cmTarget::GetLibraryNames(std::string& name,
+@@ -4081,9 +4085,14 @@ void cmTarget::GetLibraryNames(std::string& name,
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
@@ -42,7 +42,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
{
// Versioning is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
-@@ -4149,6 +4158,36 @@ void cmTarget::GetLibraryNames(std::string& name,
+@@ -4111,6 +4120,36 @@ void cmTarget::GetLibraryNames(std::string& name,
// The library name.
name = prefix+base+suffix;
@@ -79,7 +79,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
if(this->IsFrameworkOnApple())
{
realName = prefix;
-@@ -4160,9 +4199,15 @@ void cmTarget::GetLibraryNames(std::string& name,
+@@ -4122,9 +4161,15 @@ void cmTarget::GetLibraryNames(std::string& name,
}
else
{
@@ -95,7 +95,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix,
name, version);
-@@ -4195,7 +4240,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
+@@ -4157,7 +4202,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
if(version)
{
vName += ".";
Index: patches/patch-Source_kwsys_SystemTools_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-Source_kwsys_SystemTools_cxx
--- patches/patch-Source_kwsys_SystemTools_cxx 31 Dec 2014 11:06:02 -0000
1.15
+++ patches/patch-Source_kwsys_SystemTools_cxx 18 Mar 2015 14:11:14 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Source_kwsys_SystemTools
Don't spam systrace by attempting to create dirs which already exist
---- Source/kwsys/SystemTools.cxx.orig Mon Dec 15 14:07:43 2014
-+++ Source/kwsys/SystemTools.cxx Thu Dec 18 05:37:12 2014
-@@ -261,11 +261,13 @@ inline void Realpath(const kwsys_stl::string& path, kw
+--- Source/kwsys/SystemTools.cxx.orig Tue Mar 10 09:38:44 2015
++++ Source/kwsys/SystemTools.cxx Wed Mar 18 06:24:00 2015
+@@ -268,11 +268,13 @@ inline void Realpath(const kwsys_stl::string& path, kw
}
#else
#include <sys/types.h>
Index: patches/patch-Tests_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Tests_CMakeLists_txt,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Tests_CMakeLists_txt
--- patches/patch-Tests_CMakeLists_txt 23 Jan 2015 18:01:09 -0000 1.11
+++ patches/patch-Tests_CMakeLists_txt 18 Mar 2015 14:11:14 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Tests_CMakeLists_txt,v 1
Disable CTestTestUpload test because it requires internet access
---- Tests/CMakeLists.txt.orig Wed Jan 21 08:10:26 2015
-+++ Tests/CMakeLists.txt Fri Jan 23 11:10:11 2015
-@@ -2197,17 +2197,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOU
+--- Tests/CMakeLists.txt.orig Wed Mar 18 06:28:42 2015
++++ Tests/CMakeLists.txt Wed Mar 18 06:29:28 2015
+@@ -2258,17 +2258,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOU
FAIL_REGULAR_EXPRESSION "SegFault")
configure_file(
@@ -19,6 +19,6 @@ Disable CTestTestUpload test because it
- PASS_REGULAR_EXPRESSION "Upload\\.xml")
-
- configure_file(
- "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in"
- "${CMake_BINARY_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake"
+ "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
@ONLY ESCAPE_QUOTES)
Index: patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in
===================================================================
RCS file:
/cvs/ports/devel/cmake/patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in
--- patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in 11 Sep 2014
10:24:38 -0000 1.6
+++ patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in 18 Mar 2015
14:11:14 -0000
@@ -1,13 +1,12 @@
$OpenBSD: patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v 1.6 2014/09/11
10:24:38 dcoppa Exp $
---- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Thu Jul 31 17:03:57 2014
-+++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Wed Sep 3 11:45:50 2014
-@@ -22,6 +22,9 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege
+--- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Tue Mar 10 09:38:44 2015
++++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Wed Mar 18 07:22:49 2015
+@@ -22,6 +22,8 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege
# Modules that do not require our notice.
set(notice_exceptions
FindCUDA.cmake # MIT License, distributed here from upstream project
+ FindIconv.cmake
+ FindLCMS.cmake
-+ FindLibintl.cmake
)
# Load the list of modules to check.
Index: patches/patch-bootstrap
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-bootstrap,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-bootstrap
--- patches/patch-bootstrap 31 Dec 2014 11:06:02 -0000 1.7
+++ patches/patch-bootstrap 18 Mar 2015 14:11:14 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-bootstrap,v 1.7 2014/12/
Use Ninja to build CMake
XXX: broken on arm and m88k
---- bootstrap.orig Mon Dec 15 14:07:45 2014
-+++ bootstrap Thu Dec 18 05:37:12 2014
-@@ -156,7 +156,11 @@ if ${cmake_system_mingw}; then
+--- bootstrap.orig Tue Mar 10 09:38:46 2015
++++ bootstrap Wed Mar 18 06:24:00 2015
+@@ -157,7 +157,11 @@ if ${cmake_system_mingw}; then
cmake_bootstrap_generator="MSYS Makefiles"
else
# Bootstrapping from a standard UNIX prompt.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/cmake/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 PLIST
--- pkg/PLIST 23 Jan 2015 18:01:09 -0000 1.29
+++ pkg/PLIST 18 Mar 2015 14:11:14 -0000
@@ -4,6 +4,7 @@
@bin bin/cpack
@bin bin/ctest
@man man/man1/ccmake.1
+@man man/man1/cmake-gui.1
@man man/man1/cmake.1
@man man/man1/cpack.1
@man man/man1/ctest.1
@@ -47,6 +48,7 @@ share/cmake/Help/command/cmake_host_syst
share/cmake/Help/command/cmake_minimum_required.rst
share/cmake/Help/command/cmake_policy.rst
share/cmake/Help/command/configure_file.rst
+share/cmake/Help/command/continue.rst
share/cmake/Help/command/create_test_sourcelist.rst
share/cmake/Help/command/ctest_build.rst
share/cmake/Help/command/ctest_configure.rst
@@ -172,6 +174,8 @@ share/cmake/Help/generator/Watcom WMake.
share/cmake/Help/generator/Xcode.rst
share/cmake/Help/include/
share/cmake/Help/include/COMPILE_DEFINITIONS_DISCLAIMER.txt
+share/cmake/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
+share/cmake/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
share/cmake/Help/index.rst
share/cmake/Help/manual/
share/cmake/Help/manual/LINKS.txt
@@ -184,6 +188,7 @@ share/cmake/Help/manual/cmake-compile-fe
share/cmake/Help/manual/cmake-developer.7.rst
share/cmake/Help/manual/cmake-generator-expressions.7.rst
share/cmake/Help/manual/cmake-generators.7.rst
+share/cmake/Help/manual/cmake-gui.1.rst
share/cmake/Help/manual/cmake-language.7.rst
share/cmake/Help/manual/cmake-modules.7.rst
share/cmake/Help/manual/cmake-packages.7.rst
@@ -226,6 +231,7 @@ share/cmake/Help/module/CPackPackageMake
share/cmake/Help/module/CPackRPM.rst
share/cmake/Help/module/CPackWIX.rst
share/cmake/Help/module/CTest.rst
+share/cmake/Help/module/CTestCoverageCollectGCOV.rst
share/cmake/Help/module/CTestScriptMode.rst
share/cmake/Help/module/CTestUseLaunchers.rst
share/cmake/Help/module/CheckCCompilerFlag.rst
@@ -287,6 +293,7 @@ share/cmake/Help/module/FindGDAL.rst
share/cmake/Help/module/FindGIF.rst
share/cmake/Help/module/FindGLEW.rst
share/cmake/Help/module/FindGLUT.rst
+share/cmake/Help/module/FindGSL.rst
share/cmake/Help/module/FindGTK.rst
share/cmake/Help/module/FindGTK2.rst
share/cmake/Help/module/FindGTest.rst
@@ -302,6 +309,7 @@ share/cmake/Help/module/FindITK.rst
share/cmake/Help/module/FindIce.rst
share/cmake/Help/module/FindIcotool.rst
share/cmake/Help/module/FindImageMagick.rst
+share/cmake/Help/module/FindIntl.rst
share/cmake/Help/module/FindJNI.rst
share/cmake/Help/module/FindJPEG.rst
share/cmake/Help/module/FindJasper.rst
@@ -476,6 +484,8 @@ share/cmake/Help/policy/CMP0051.rst
share/cmake/Help/policy/CMP0052.rst
share/cmake/Help/policy/CMP0053.rst
share/cmake/Help/policy/CMP0054.rst
+share/cmake/Help/policy/CMP0055.rst
+share/cmake/Help/policy/CMP0056.rst
share/cmake/Help/policy/DISALLOWED_COMMAND.txt
share/cmake/Help/prop_cache/
share/cmake/Help/prop_cache/ADVANCED.rst
@@ -564,6 +574,7 @@ share/cmake/Help/prop_sf/SYMBOLIC.rst
share/cmake/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
share/cmake/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
share/cmake/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
+share/cmake/Help/prop_sf/VS_SHADER_FLAGS.rst
share/cmake/Help/prop_sf/VS_SHADER_MODEL.rst
share/cmake/Help/prop_sf/VS_SHADER_TYPE.rst
share/cmake/Help/prop_sf/WRAP_EXCLUDE.rst
@@ -590,6 +601,7 @@ share/cmake/Help/prop_test/WORKING_DIREC
share/cmake/Help/prop_tgt/
share/cmake/Help/prop_tgt/ALIASED_TARGET.rst
share/cmake/Help/prop_tgt/ANDROID_API.rst
+share/cmake/Help/prop_tgt/ANDROID_API_MIN.rst
share/cmake/Help/prop_tgt/ANDROID_GUI.rst
share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
@@ -668,6 +680,7 @@ share/cmake/Help/prop_tgt/INSTALL_NAME_D
share/cmake/Help/prop_tgt/INSTALL_RPATH.rst
share/cmake/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst
share/cmake/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
+share/cmake/Help/prop_tgt/INTERFACE_BUILD_PROPERTY.txt
share/cmake/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
share/cmake/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
share/cmake/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
@@ -761,8 +774,9 @@ share/cmake/Help/prop_tgt/XCODE_ATTRIBUT
share/cmake/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
share/cmake/Help/prop_tgt/XXX_OUTPUT_NAME.txt
share/cmake/Help/release/
-share/cmake/Help/release/3.0.0.rst
-share/cmake/Help/release/3.1.0.rst
+share/cmake/Help/release/3.0.rst
+share/cmake/Help/release/3.1.rst
+share/cmake/Help/release/3.2.rst
share/cmake/Help/release/dev.txt
share/cmake/Help/release/index.rst
share/cmake/Help/variable/
@@ -771,6 +785,7 @@ share/cmake/Help/variable/BORLAND.rst
share/cmake/Help/variable/BUILD_SHARED_LIBS.rst
share/cmake/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
share/cmake/Help/variable/CMAKE_ANDROID_API.rst
+share/cmake/Help/variable/CMAKE_ANDROID_API_MIN.rst
share/cmake/Help/variable/CMAKE_ANDROID_GUI.rst
share/cmake/Help/variable/CMAKE_APPBUNDLE_PATH.rst
share/cmake/Help/variable/CMAKE_AR.rst
@@ -930,6 +945,7 @@ share/cmake/Help/variable/CMAKE_MACOSX_R
share/cmake/Help/variable/CMAKE_MAJOR_VERSION.rst
share/cmake/Help/variable/CMAKE_MAKE_PROGRAM.rst
share/cmake/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
+share/cmake/Help/variable/CMAKE_MATCH_COUNT.rst
share/cmake/Help/variable/CMAKE_MFC_FLAG.rst
share/cmake/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
share/cmake/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -1068,6 +1084,7 @@ share/cmake/Help/variable/CYGWIN.rst
share/cmake/Help/variable/ENV.rst
share/cmake/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
share/cmake/Help/variable/LIBRARY_OUTPUT_PATH.rst
+share/cmake/Help/variable/MINGW.rst
share/cmake/Help/variable/MSVC.rst
share/cmake/Help/variable/MSVC10.rst
share/cmake/Help/variable/MSVC11.rst
@@ -1235,6 +1252,7 @@ share/cmake/Modules/CPackRPM.cmake
share/cmake/Modules/CPackWIX.cmake
share/cmake/Modules/CPackZIP.cmake
share/cmake/Modules/CTest.cmake
+share/cmake/Modules/CTestCoverageCollectGCOV.cmake
share/cmake/Modules/CTestScriptMode.cmake
share/cmake/Modules/CTestTargets.cmake
share/cmake/Modules/CTestUseLaunchers.cmake
@@ -1272,7 +1290,9 @@ share/cmake/Modules/Compiler/
share/cmake/Modules/Compiler/ADSP-DetermineCompiler.cmake
share/cmake/Modules/Compiler/Absoft-Fortran.cmake
share/cmake/Modules/Compiler/AppleClang-ASM.cmake
+share/cmake/Modules/Compiler/AppleClang-C-FeatureTests.cmake
share/cmake/Modules/Compiler/AppleClang-C.cmake
+share/cmake/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
share/cmake/Modules/Compiler/AppleClang-CXX.cmake
share/cmake/Modules/Compiler/AppleClang-DetermineCompiler.cmake
share/cmake/Modules/Compiler/Borland-DetermineCompiler.cmake
@@ -1280,6 +1300,7 @@ share/cmake/Modules/Compiler/Clang-ASM.c
share/cmake/Modules/Compiler/Clang-C-FeatureTests.cmake
share/cmake/Modules/Compiler/Clang-C.cmake
share/cmake/Modules/Compiler/Clang-CXX-FeatureTests.cmake
+share/cmake/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
share/cmake/Modules/Compiler/Clang-CXX.cmake
share/cmake/Modules/Compiler/Clang-DetermineCompiler.cmake
share/cmake/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
@@ -1324,6 +1345,8 @@ share/cmake/Modules/Compiler/MIPSpro-C.c
share/cmake/Modules/Compiler/MIPSpro-CXX.cmake
share/cmake/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
share/cmake/Modules/Compiler/MIPSpro-Fortran.cmake
+share/cmake/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+share/cmake/Modules/Compiler/MSVC-CXX.cmake
share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake
share/cmake/Modules/Compiler/NAG-Fortran.cmake
share/cmake/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
@@ -1349,6 +1372,7 @@ share/cmake/Modules/Compiler/SunPro-ASM.
share/cmake/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
share/cmake/Modules/Compiler/SunPro-C.cmake
share/cmake/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
+share/cmake/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
share/cmake/Modules/Compiler/SunPro-CXX.cmake
share/cmake/Modules/Compiler/SunPro-Fortran.cmake
share/cmake/Modules/Compiler/TI-ASM.cmake
@@ -1429,6 +1453,7 @@ share/cmake/Modules/FindGIF.cmake
share/cmake/Modules/FindGLEW.cmake
share/cmake/Modules/FindGLU.cmake
share/cmake/Modules/FindGLUT.cmake
+share/cmake/Modules/FindGSL.cmake
share/cmake/Modules/FindGTK.cmake
share/cmake/Modules/FindGTK2.cmake
share/cmake/Modules/FindGTest.cmake
@@ -1444,6 +1469,7 @@ share/cmake/Modules/FindIce.cmake
share/cmake/Modules/FindIconv.cmake
share/cmake/Modules/FindIcotool.cmake
share/cmake/Modules/FindImageMagick.cmake
+share/cmake/Modules/FindIntl.cmake
share/cmake/Modules/FindJNI.cmake
share/cmake/Modules/FindJPEG.cmake
share/cmake/Modules/FindJasper.cmake
@@ -1457,7 +1483,6 @@ share/cmake/Modules/FindLibArchive.cmake
share/cmake/Modules/FindLibLZMA.cmake
share/cmake/Modules/FindLibXml2.cmake
share/cmake/Modules/FindLibXslt.cmake
-share/cmake/Modules/FindLibintl.cmake
share/cmake/Modules/FindLua.cmake
share/cmake/Modules/FindLua50.cmake
share/cmake/Modules/FindLua51.cmake
@@ -1873,6 +1898,7 @@ share/doc/cmake/html/_sources/command/cm
share/doc/cmake/html/_sources/command/cmake_minimum_required.txt
share/doc/cmake/html/_sources/command/cmake_policy.txt
share/doc/cmake/html/_sources/command/configure_file.txt
+share/doc/cmake/html/_sources/command/continue.txt
share/doc/cmake/html/_sources/command/create_test_sourcelist.txt
share/doc/cmake/html/_sources/command/ctest_build.txt
share/doc/cmake/html/_sources/command/ctest_configure.txt
@@ -2005,6 +2031,7 @@ share/doc/cmake/html/_sources/manual/cma
share/doc/cmake/html/_sources/manual/cmake-developer.7.txt
share/doc/cmake/html/_sources/manual/cmake-generator-expressions.7.txt
share/doc/cmake/html/_sources/manual/cmake-generators.7.txt
+share/doc/cmake/html/_sources/manual/cmake-gui.1.txt
share/doc/cmake/html/_sources/manual/cmake-language.7.txt
share/doc/cmake/html/_sources/manual/cmake-modules.7.txt
share/doc/cmake/html/_sources/manual/cmake-packages.7.txt
@@ -2047,6 +2074,7 @@ share/doc/cmake/html/_sources/module/CPa
share/doc/cmake/html/_sources/module/CPackRPM.txt
share/doc/cmake/html/_sources/module/CPackWIX.txt
share/doc/cmake/html/_sources/module/CTest.txt
+share/doc/cmake/html/_sources/module/CTestCoverageCollectGCOV.txt
share/doc/cmake/html/_sources/module/CTestScriptMode.txt
share/doc/cmake/html/_sources/module/CTestUseLaunchers.txt
share/doc/cmake/html/_sources/module/CheckCCompilerFlag.txt
@@ -2108,6 +2136,7 @@ share/doc/cmake/html/_sources/module/Fin
share/doc/cmake/html/_sources/module/FindGIF.txt
share/doc/cmake/html/_sources/module/FindGLEW.txt
share/doc/cmake/html/_sources/module/FindGLUT.txt
+share/doc/cmake/html/_sources/module/FindGSL.txt
share/doc/cmake/html/_sources/module/FindGTK.txt
share/doc/cmake/html/_sources/module/FindGTK2.txt
share/doc/cmake/html/_sources/module/FindGTest.txt
@@ -2123,6 +2152,7 @@ share/doc/cmake/html/_sources/module/Fin
share/doc/cmake/html/_sources/module/FindIce.txt
share/doc/cmake/html/_sources/module/FindIcotool.txt
share/doc/cmake/html/_sources/module/FindImageMagick.txt
+share/doc/cmake/html/_sources/module/FindIntl.txt
share/doc/cmake/html/_sources/module/FindJNI.txt
share/doc/cmake/html/_sources/module/FindJPEG.txt
share/doc/cmake/html/_sources/module/FindJasper.txt
@@ -2297,6 +2327,8 @@ share/doc/cmake/html/_sources/policy/CMP
share/doc/cmake/html/_sources/policy/CMP0052.txt
share/doc/cmake/html/_sources/policy/CMP0053.txt
share/doc/cmake/html/_sources/policy/CMP0054.txt
+share/doc/cmake/html/_sources/policy/CMP0055.txt
+share/doc/cmake/html/_sources/policy/CMP0056.txt
share/doc/cmake/html/_sources/prop_cache/
share/doc/cmake/html/_sources/prop_cache/ADVANCED.txt
share/doc/cmake/html/_sources/prop_cache/HELPSTRING.txt
@@ -2384,6 +2416,7 @@ share/doc/cmake/html/_sources/prop_sf/SY
share/doc/cmake/html/_sources/prop_sf/VS_DEPLOYMENT_CONTENT.txt
share/doc/cmake/html/_sources/prop_sf/VS_DEPLOYMENT_LOCATION.txt
share/doc/cmake/html/_sources/prop_sf/VS_SHADER_ENTRYPOINT.txt
+share/doc/cmake/html/_sources/prop_sf/VS_SHADER_FLAGS.txt
share/doc/cmake/html/_sources/prop_sf/VS_SHADER_MODEL.txt
share/doc/cmake/html/_sources/prop_sf/VS_SHADER_TYPE.txt
share/doc/cmake/html/_sources/prop_sf/WRAP_EXCLUDE.txt
@@ -2410,6 +2443,7 @@ share/doc/cmake/html/_sources/prop_test/
share/doc/cmake/html/_sources/prop_tgt/
share/doc/cmake/html/_sources/prop_tgt/ALIASED_TARGET.txt
share/doc/cmake/html/_sources/prop_tgt/ANDROID_API.txt
+share/doc/cmake/html/_sources/prop_tgt/ANDROID_API_MIN.txt
share/doc/cmake/html/_sources/prop_tgt/ANDROID_GUI.txt
share/doc/cmake/html/_sources/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.txt
share/doc/cmake/html/_sources/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.txt
@@ -2576,8 +2610,9 @@ share/doc/cmake/html/_sources/prop_tgt/V
share/doc/cmake/html/_sources/prop_tgt/WIN32_EXECUTABLE.txt
share/doc/cmake/html/_sources/prop_tgt/XCODE_ATTRIBUTE_an-attribute.txt
share/doc/cmake/html/_sources/release/
-share/doc/cmake/html/_sources/release/3.0.0.txt
-share/doc/cmake/html/_sources/release/3.1.0.txt
+share/doc/cmake/html/_sources/release/3.0.txt
+share/doc/cmake/html/_sources/release/3.1.txt
+share/doc/cmake/html/_sources/release/3.2.txt
share/doc/cmake/html/_sources/release/index.txt
share/doc/cmake/html/_sources/variable/
share/doc/cmake/html/_sources/variable/APPLE.txt
@@ -2585,6 +2620,7 @@ share/doc/cmake/html/_sources/variable/B
share/doc/cmake/html/_sources/variable/BUILD_SHARED_LIBS.txt
share/doc/cmake/html/_sources/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.txt
share/doc/cmake/html/_sources/variable/CMAKE_ANDROID_API.txt
+share/doc/cmake/html/_sources/variable/CMAKE_ANDROID_API_MIN.txt
share/doc/cmake/html/_sources/variable/CMAKE_ANDROID_GUI.txt
share/doc/cmake/html/_sources/variable/CMAKE_APPBUNDLE_PATH.txt
share/doc/cmake/html/_sources/variable/CMAKE_AR.txt
@@ -2743,6 +2779,7 @@ share/doc/cmake/html/_sources/variable/C
share/doc/cmake/html/_sources/variable/CMAKE_MAJOR_VERSION.txt
share/doc/cmake/html/_sources/variable/CMAKE_MAKE_PROGRAM.txt
share/doc/cmake/html/_sources/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.txt
+share/doc/cmake/html/_sources/variable/CMAKE_MATCH_COUNT.txt
share/doc/cmake/html/_sources/variable/CMAKE_MFC_FLAG.txt
share/doc/cmake/html/_sources/variable/CMAKE_MINIMUM_REQUIRED_VERSION.txt
share/doc/cmake/html/_sources/variable/CMAKE_MINOR_VERSION.txt
@@ -2880,6 +2917,7 @@ share/doc/cmake/html/_sources/variable/C
share/doc/cmake/html/_sources/variable/ENV.txt
share/doc/cmake/html/_sources/variable/EXECUTABLE_OUTPUT_PATH.txt
share/doc/cmake/html/_sources/variable/LIBRARY_OUTPUT_PATH.txt
+share/doc/cmake/html/_sources/variable/MINGW.txt
share/doc/cmake/html/_sources/variable/MSVC.txt
share/doc/cmake/html/_sources/variable/MSVC10.txt
share/doc/cmake/html/_sources/variable/MSVC11.txt
@@ -2955,6 +2993,7 @@ share/doc/cmake/html/command/cmake_host_
share/doc/cmake/html/command/cmake_minimum_required.html
share/doc/cmake/html/command/cmake_policy.html
share/doc/cmake/html/command/configure_file.html
+share/doc/cmake/html/command/continue.html
share/doc/cmake/html/command/create_test_sourcelist.html
share/doc/cmake/html/command/ctest_build.html
share/doc/cmake/html/command/ctest_configure.html
@@ -3088,6 +3127,7 @@ share/doc/cmake/html/manual/cmake-compil
share/doc/cmake/html/manual/cmake-developer.7.html
share/doc/cmake/html/manual/cmake-generator-expressions.7.html
share/doc/cmake/html/manual/cmake-generators.7.html
+share/doc/cmake/html/manual/cmake-gui.1.html
share/doc/cmake/html/manual/cmake-language.7.html
share/doc/cmake/html/manual/cmake-modules.7.html
share/doc/cmake/html/manual/cmake-packages.7.html
@@ -3130,6 +3170,7 @@ share/doc/cmake/html/module/CPackPackage
share/doc/cmake/html/module/CPackRPM.html
share/doc/cmake/html/module/CPackWIX.html
share/doc/cmake/html/module/CTest.html
+share/doc/cmake/html/module/CTestCoverageCollectGCOV.html
share/doc/cmake/html/module/CTestScriptMode.html
share/doc/cmake/html/module/CTestUseLaunchers.html
share/doc/cmake/html/module/CheckCCompilerFlag.html
@@ -3191,6 +3232,7 @@ share/doc/cmake/html/module/FindGDAL.htm
share/doc/cmake/html/module/FindGIF.html
share/doc/cmake/html/module/FindGLEW.html
share/doc/cmake/html/module/FindGLUT.html
+share/doc/cmake/html/module/FindGSL.html
share/doc/cmake/html/module/FindGTK.html
share/doc/cmake/html/module/FindGTK2.html
share/doc/cmake/html/module/FindGTest.html
@@ -3206,6 +3248,7 @@ share/doc/cmake/html/module/FindITK.html
share/doc/cmake/html/module/FindIce.html
share/doc/cmake/html/module/FindIcotool.html
share/doc/cmake/html/module/FindImageMagick.html
+share/doc/cmake/html/module/FindIntl.html
share/doc/cmake/html/module/FindJNI.html
share/doc/cmake/html/module/FindJPEG.html
share/doc/cmake/html/module/FindJasper.html
@@ -3380,6 +3423,8 @@ share/doc/cmake/html/policy/CMP0051.html
share/doc/cmake/html/policy/CMP0052.html
share/doc/cmake/html/policy/CMP0053.html
share/doc/cmake/html/policy/CMP0054.html
+share/doc/cmake/html/policy/CMP0055.html
+share/doc/cmake/html/policy/CMP0056.html
share/doc/cmake/html/prop_cache/
share/doc/cmake/html/prop_cache/ADVANCED.html
share/doc/cmake/html/prop_cache/HELPSTRING.html
@@ -3467,6 +3512,7 @@ share/doc/cmake/html/prop_sf/SYMBOLIC.ht
share/doc/cmake/html/prop_sf/VS_DEPLOYMENT_CONTENT.html
share/doc/cmake/html/prop_sf/VS_DEPLOYMENT_LOCATION.html
share/doc/cmake/html/prop_sf/VS_SHADER_ENTRYPOINT.html
+share/doc/cmake/html/prop_sf/VS_SHADER_FLAGS.html
share/doc/cmake/html/prop_sf/VS_SHADER_MODEL.html
share/doc/cmake/html/prop_sf/VS_SHADER_TYPE.html
share/doc/cmake/html/prop_sf/WRAP_EXCLUDE.html
@@ -3493,6 +3539,7 @@ share/doc/cmake/html/prop_test/WORKING_D
share/doc/cmake/html/prop_tgt/
share/doc/cmake/html/prop_tgt/ALIASED_TARGET.html
share/doc/cmake/html/prop_tgt/ANDROID_API.html
+share/doc/cmake/html/prop_tgt/ANDROID_API_MIN.html
share/doc/cmake/html/prop_tgt/ANDROID_GUI.html
share/doc/cmake/html/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.html
share/doc/cmake/html/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.html
@@ -3659,8 +3706,9 @@ share/doc/cmake/html/prop_tgt/VS_WINRT_R
share/doc/cmake/html/prop_tgt/WIN32_EXECUTABLE.html
share/doc/cmake/html/prop_tgt/XCODE_ATTRIBUTE_an-attribute.html
share/doc/cmake/html/release/
-share/doc/cmake/html/release/3.0.0.html
-share/doc/cmake/html/release/3.1.0.html
+share/doc/cmake/html/release/3.0.html
+share/doc/cmake/html/release/3.1.html
+share/doc/cmake/html/release/3.2.html
share/doc/cmake/html/release/index.html
share/doc/cmake/html/search.html
share/doc/cmake/html/searchindex.js
@@ -3670,6 +3718,7 @@ share/doc/cmake/html/variable/BORLAND.ht
share/doc/cmake/html/variable/BUILD_SHARED_LIBS.html
share/doc/cmake/html/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.html
share/doc/cmake/html/variable/CMAKE_ANDROID_API.html
+share/doc/cmake/html/variable/CMAKE_ANDROID_API_MIN.html
share/doc/cmake/html/variable/CMAKE_ANDROID_GUI.html
share/doc/cmake/html/variable/CMAKE_APPBUNDLE_PATH.html
share/doc/cmake/html/variable/CMAKE_AR.html
@@ -3828,6 +3877,7 @@ share/doc/cmake/html/variable/CMAKE_MACO
share/doc/cmake/html/variable/CMAKE_MAJOR_VERSION.html
share/doc/cmake/html/variable/CMAKE_MAKE_PROGRAM.html
share/doc/cmake/html/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.html
+share/doc/cmake/html/variable/CMAKE_MATCH_COUNT.html
share/doc/cmake/html/variable/CMAKE_MFC_FLAG.html
share/doc/cmake/html/variable/CMAKE_MINIMUM_REQUIRED_VERSION.html
share/doc/cmake/html/variable/CMAKE_MINOR_VERSION.html
@@ -3965,6 +4015,7 @@ share/doc/cmake/html/variable/CYGWIN.htm
share/doc/cmake/html/variable/ENV.html
share/doc/cmake/html/variable/EXECUTABLE_OUTPUT_PATH.html
share/doc/cmake/html/variable/LIBRARY_OUTPUT_PATH.html
+share/doc/cmake/html/variable/MINGW.html
share/doc/cmake/html/variable/MSVC.html
share/doc/cmake/html/variable/MSVC10.html
share/doc/cmake/html/variable/MSVC11.html
cmake-3.2.1.diff.gz
Description: Binary data
