Changes 3.2.1:

* CMake learned to support unicode characters *encoded as UTF-8* on
  Windows.  This was already supported on platforms whose system APIs
  accept UTF-8 encoded strings. Unicode characters may now be used in
  CMake code, paths to source files, configured files such as ".h.in"
  files, and other files read and written by CMake.  Note that because
  CMake interoperates with many other tools, there may still be some
  limitations when using certain unicode characters.

* The "Compile Features" functionality is now aware of features
  supported by more compilers, including:

  * Apple Clang ("AppleClang") for Xcode versions 4.4 though 6.1.

  * GNU compiler versions 4.4 through 5.0 on UNIX and Apple ("GNU").

  * Microsoft Visual Studio ("MSVC") for versions 2010 through 2015.

  * Oracle SolarisStudio ("SunPro") version 12.4.

* The "add_custom_command()" and "add_custom_target()" commands
  learned a new "BYPRODUCTS" option to specify files produced as side
  effects of the custom commands.  These are not outputs because they
  do not always have to be newer than inputs.

* The "file(GENERATE)" command can now generate files which are used
  as source files for buildsystem targets.  Generated files
  automatically get their "GENERATED" property set to "TRUE".

Deprecated and Removed Features:

* Files written in the "cmake-language(7)", such as "CMakeLists.txt"
  or "*.cmake" files, are now expected to be encoded as UTF-8.  If
  files are already ASCII, they will be compatible.  If files were in
  a different encoding, including Latin 1, they will need to be
  converted.

* The "FindOpenGL" module no longer explicitly searches for any
  dependency on X11 libraries with the "FindX11" module.  Such
  dependencies should not need to be explicit. Applications using X11
  APIs themselves should find and link to X11 libraries explicitly.
This commit is contained in:
adam 2015-04-07 20:53:48 +00:00
parent d22692c4a1
commit d5e893e8cb
4 changed files with 52 additions and 18 deletions

View file

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.95 2015/02/13 14:03:48 adam Exp $
# $NetBSD: Makefile,v 1.96 2015/04/07 20:53:48 adam Exp $
DISTNAME= cmake-${CMAKE_API}.3
DISTNAME= cmake-${CMAKE_API}.1
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/
CMAKE_API= 3.1
CMAKE_API= 3.2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cmake.org/
@ -13,7 +13,7 @@ LICENSE= modified-bsd
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_NCURSES= wsyncup
USE_NCURSES= yes
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= bootstrap
@ -24,6 +24,8 @@ CONFIGURE_ARGS+= --mandir=/${PKGMANDIR}
CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API}
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --system-libs
# jsoncpp requires cmake to build, so use the one provided with cmake
CONFIGURE_ARGS+= --no-system-jsoncpp
LDFLAGS.SunOS+= -lsocket -lnsl
@ -58,11 +60,10 @@ pre-configure:
${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig
${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake
BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.4
BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.0.0
.include "../../archivers/libarchive/buildlink3.mk"
.include "../../devel/libexecinfo/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.36 2015/01/24 16:55:20 wiz Exp $
@comment $NetBSD: PLIST,v 1.37 2015/04/07 20:53:48 adam Exp $
bin/ccmake
bin/cmake
bin/cpack
@ -25,6 +25,7 @@ share/cmake-${CMAKE_API}/Help/command/cmake_host_system_information.rst
share/cmake-${CMAKE_API}/Help/command/cmake_minimum_required.rst
share/cmake-${CMAKE_API}/Help/command/cmake_policy.rst
share/cmake-${CMAKE_API}/Help/command/configure_file.rst
share/cmake-${CMAKE_API}/Help/command/continue.rst
share/cmake-${CMAKE_API}/Help/command/create_test_sourcelist.rst
share/cmake-${CMAKE_API}/Help/command/ctest_build.rst
share/cmake-${CMAKE_API}/Help/command/ctest_configure.rst
@ -148,6 +149,8 @@ share/cmake-${CMAKE_API}/Help/generator/Visual Studio 9 2008.rst
share/cmake-${CMAKE_API}/Help/generator/Watcom WMake.rst
share/cmake-${CMAKE_API}/Help/generator/Xcode.rst
share/cmake-${CMAKE_API}/Help/include/COMPILE_DEFINITIONS_DISCLAIMER.txt
share/cmake-${CMAKE_API}/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
share/cmake-${CMAKE_API}/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
share/cmake-${CMAKE_API}/Help/index.rst
share/cmake-${CMAKE_API}/Help/manual/LINKS.txt
share/cmake-${CMAKE_API}/Help/manual/OPTIONS_BUILD.txt
@ -201,6 +204,7 @@ share/cmake-${CMAKE_API}/Help/module/CPackPackageMaker.rst
share/cmake-${CMAKE_API}/Help/module/CPackRPM.rst
share/cmake-${CMAKE_API}/Help/module/CPackWIX.rst
share/cmake-${CMAKE_API}/Help/module/CTest.rst
share/cmake-${CMAKE_API}/Help/module/CTestCoverageCollectGCOV.rst
share/cmake-${CMAKE_API}/Help/module/CTestScriptMode.rst
share/cmake-${CMAKE_API}/Help/module/CTestUseLaunchers.rst
share/cmake-${CMAKE_API}/Help/module/CheckCCompilerFlag.rst
@ -262,6 +266,7 @@ share/cmake-${CMAKE_API}/Help/module/FindGDAL.rst
share/cmake-${CMAKE_API}/Help/module/FindGIF.rst
share/cmake-${CMAKE_API}/Help/module/FindGLEW.rst
share/cmake-${CMAKE_API}/Help/module/FindGLUT.rst
share/cmake-${CMAKE_API}/Help/module/FindGSL.rst
share/cmake-${CMAKE_API}/Help/module/FindGTK.rst
share/cmake-${CMAKE_API}/Help/module/FindGTK2.rst
share/cmake-${CMAKE_API}/Help/module/FindGTest.rst
@ -277,6 +282,7 @@ share/cmake-${CMAKE_API}/Help/module/FindITK.rst
share/cmake-${CMAKE_API}/Help/module/FindIce.rst
share/cmake-${CMAKE_API}/Help/module/FindIcotool.rst
share/cmake-${CMAKE_API}/Help/module/FindImageMagick.rst
share/cmake-${CMAKE_API}/Help/module/FindIntl.rst
share/cmake-${CMAKE_API}/Help/module/FindJNI.rst
share/cmake-${CMAKE_API}/Help/module/FindJPEG.rst
share/cmake-${CMAKE_API}/Help/module/FindJasper.rst
@ -450,6 +456,8 @@ share/cmake-${CMAKE_API}/Help/policy/CMP0051.rst
share/cmake-${CMAKE_API}/Help/policy/CMP0052.rst
share/cmake-${CMAKE_API}/Help/policy/CMP0053.rst
share/cmake-${CMAKE_API}/Help/policy/CMP0054.rst
share/cmake-${CMAKE_API}/Help/policy/CMP0055.rst
share/cmake-${CMAKE_API}/Help/policy/CMP0056.rst
share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
share/cmake-${CMAKE_API}/Help/prop_cache/HELPSTRING.rst
@ -533,6 +541,7 @@ share/cmake-${CMAKE_API}/Help/prop_sf/SYMBOLIC.rst
share/cmake-${CMAKE_API}/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
share/cmake-${CMAKE_API}/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_FLAGS.rst
share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_MODEL.rst
share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_TYPE.rst
share/cmake-${CMAKE_API}/Help/prop_sf/WRAP_EXCLUDE.rst
@ -557,6 +566,7 @@ share/cmake-${CMAKE_API}/Help/prop_test/WILL_FAIL.rst
share/cmake-${CMAKE_API}/Help/prop_test/WORKING_DIRECTORY.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ALIASED_TARGET.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_API.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_API_MIN.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_GUI.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
@ -635,6 +645,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_NAME_DIR.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_RPATH.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_BUILD_PROPERTY.txt
share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
@ -727,8 +738,9 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/WIN32_EXECUTABLE.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_NAME.txt
share/cmake-${CMAKE_API}/Help/release/3.0.0.rst
share/cmake-${CMAKE_API}/Help/release/3.1.0.rst
share/cmake-${CMAKE_API}/Help/release/3.0.rst
share/cmake-${CMAKE_API}/Help/release/3.1.rst
share/cmake-${CMAKE_API}/Help/release/3.2.rst
share/cmake-${CMAKE_API}/Help/release/dev.txt
share/cmake-${CMAKE_API}/Help/release/index.rst
share/cmake-${CMAKE_API}/Help/variable/APPLE.rst
@ -736,6 +748,7 @@ share/cmake-${CMAKE_API}/Help/variable/BORLAND.rst
share/cmake-${CMAKE_API}/Help/variable/BUILD_SHARED_LIBS.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_API.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_API_MIN.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_GUI.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_APPBUNDLE_PATH.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_AR.rst
@ -895,6 +908,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_MACOSX_RPATH.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAJOR_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAKE_PROGRAM.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MATCH_COUNT.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MFC_FLAG.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINOR_VERSION.rst
@ -1033,6 +1047,7 @@ share/cmake-${CMAKE_API}/Help/variable/CYGWIN.rst
share/cmake-${CMAKE_API}/Help/variable/ENV.rst
share/cmake-${CMAKE_API}/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
share/cmake-${CMAKE_API}/Help/variable/LIBRARY_OUTPUT_PATH.rst
share/cmake-${CMAKE_API}/Help/variable/MINGW.rst
share/cmake-${CMAKE_API}/Help/variable/MSVC.rst
share/cmake-${CMAKE_API}/Help/variable/MSVC10.rst
share/cmake-${CMAKE_API}/Help/variable/MSVC11.rst
@ -1199,6 +1214,7 @@ share/cmake-${CMAKE_API}/Modules/CPackRPM.cmake
share/cmake-${CMAKE_API}/Modules/CPackWIX.cmake
share/cmake-${CMAKE_API}/Modules/CPackZIP.cmake
share/cmake-${CMAKE_API}/Modules/CTest.cmake
share/cmake-${CMAKE_API}/Modules/CTestCoverageCollectGCOV.cmake
share/cmake-${CMAKE_API}/Modules/CTestScriptMode.cmake
share/cmake-${CMAKE_API}/Modules/CTestTargets.cmake
share/cmake-${CMAKE_API}/Modules/CTestUseLaunchers.cmake
@ -1235,7 +1251,9 @@ share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/ADSP-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Absoft-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-ASM.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-C-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Borland-DetermineCompiler.cmake
@ -1243,6 +1261,7 @@ share/cmake-${CMAKE_API}/Modules/Compiler/Clang-ASM.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
@ -1287,6 +1306,8 @@ share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/NAG-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
@ -1312,6 +1333,7 @@ share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-ASM.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/SunPro-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/TI-ASM.cmake
@ -1390,6 +1412,7 @@ share/cmake-${CMAKE_API}/Modules/FindGIF.cmake
share/cmake-${CMAKE_API}/Modules/FindGLEW.cmake
share/cmake-${CMAKE_API}/Modules/FindGLU.cmake
share/cmake-${CMAKE_API}/Modules/FindGLUT.cmake
share/cmake-${CMAKE_API}/Modules/FindGSL.cmake
share/cmake-${CMAKE_API}/Modules/FindGTK.cmake
share/cmake-${CMAKE_API}/Modules/FindGTK2.cmake
share/cmake-${CMAKE_API}/Modules/FindGTest.cmake
@ -1404,6 +1427,7 @@ share/cmake-${CMAKE_API}/Modules/FindHg.cmake
share/cmake-${CMAKE_API}/Modules/FindIce.cmake
share/cmake-${CMAKE_API}/Modules/FindIcotool.cmake
share/cmake-${CMAKE_API}/Modules/FindImageMagick.cmake
share/cmake-${CMAKE_API}/Modules/FindIntl.cmake
share/cmake-${CMAKE_API}/Modules/FindJNI.cmake
share/cmake-${CMAKE_API}/Modules/FindJPEG.cmake
share/cmake-${CMAKE_API}/Modules/FindJasper.cmake

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.68 2015/02/13 14:03:48 adam Exp $
$NetBSD: distinfo,v 1.69 2015/04/07 20:53:48 adam Exp $
SHA1 (cmake-3.1.3.tar.gz) = 5b9bb6e6f8c93335a0ef7b6c2d00a5273c2ea6cc
RMD160 (cmake-3.1.3.tar.gz) = 2693ac550a2e08fbc34601e5d8b60f2abec99d1f
Size (cmake-3.1.3.tar.gz) = 5959549 bytes
SHA1 (cmake-3.2.1.tar.gz) = 53c1fe2aaae3b2042c0fe5de177f73ef6f7b267f
RMD160 (cmake-3.2.1.tar.gz) = 8c102bce34d3c9ccb328ec8b629dcc91142a7243
Size (cmake-3.2.1.tar.gz) = 6437801 bytes
SHA1 (patch-Modules_FindX11.cmake) = 07a831744fc1de15d2fe4f57399339200e572dc5
SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
@ -10,6 +10,6 @@ SHA1 (patch-Source_cmELF.cxx) = 5eb9dc0b3567b5685596ddf0a03ca8e5c76e6f92
SHA1 (patch-Source_kwsys_SystemInformation.cxx) = e259da70601cf1b4641f253de3d4f3aaec5e68f6
SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9
SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05

View file

@ -1,10 +1,19 @@
$NetBSD: patch-aa,v 1.10 2012/11/15 19:31:55 adam Exp $
$NetBSD: patch-aa,v 1.11 2015/04/07 20:53:48 adam Exp $
Patch in pkgsrc paths for finding stuff.
--- Modules/Platform/UnixPaths.cmake.orig 2012-10-31 15:32:05.000000000 +0000
--- Modules/Platform/UnixPaths.cmake.orig 2015-03-10 14:38:44.000000000 +0000
+++ Modules/Platform/UnixPaths.cmake
@@ -48,10 +48,10 @@ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
@@ -33,7 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DI
# search types.
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
# Standard
- /usr/local /usr /
+ @LOCALBASE@ /usr/local /usr /
# CMake install location
"${_CMAKE_INSTALL_DIR}"
@@ -57,10 +57,10 @@ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
/usr/include/w32api
# X11
@ -17,7 +26,7 @@ Patch in pkgsrc paths for finding stuff.
/opt/csw/include /opt/include
/usr/openwin/include
)
@@ -61,16 +61,16 @@ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
@@ -70,16 +70,16 @@ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
/usr/lib/w32api
# X11