Skip to content
Permalink
Browse files

cmake: update release to 3.14.0 and devel to 2efecea4 (20190314)

  • Loading branch information...
michaelld committed Mar 15, 2019
1 parent 4dc71e6 commit 96714bed88ddb2eb42105fe4b0b546c6d55d77e1
@@ -32,16 +32,16 @@ dist_subdir cmake

subport cmake-devel {}

set branch 3.13
set branch 3.14

if {${subport} eq ${name}} {

# release

version ${branch}.4
checksums rmd160 6211b5315071015d2a949af077e4301c47e36fd4 \
sha256 fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b \
size 8617881
version ${branch}.0
checksums rmd160 9edfb583b9417b12e95cdcb56776a41d4d0b2663 \
sha256 aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502 \
size 8846626
revision 0

master_sites ${homepage}/files/v${branch}/
@@ -66,11 +66,11 @@ if {${subport} eq ${name}} {

# devel

version 20190309
set commit 5c106bfc42a5eb068719c3dec28ddc6dfc493973
checksums rmd160 82111ce8138e8226fb7866b77bdc94ab259592c0 \
sha256 e80c24da0346db8fe185d49956c19ece03a00fdb1281491a666895a502d20eb2 \
size 6610127
version 20190314
set commit 2efecea485a76df149ecc5d644cc2a1ec6c33cf3
checksums rmd160 1fa0a04427c14830387d0af026e565d4f3ca972f \
sha256 8c23d5cd7cd72f5b89c5a9291292747ca022fe0ccfd46a16e37ca05bce56588a \
size 6827156
revision 0

use_bzip2 yes
@@ -1,6 +1,6 @@
--- Modules/CMakeFindFrameworks.cmake.orig
+++ Modules/CMakeFindFrameworks.cmake
@@ -18,6 +18,7 @@
@@ -19,6 +19,7 @@
if(APPLE)
foreach(dir
~/Library/Frameworks/${fwk}.framework
@@ -1,8 +1,8 @@
--- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
@@ -17,15 +17,3 @@
set(PACKAGE_VERSION_EXACT TRUE)
endif()
@@ -23,15 +23,3 @@
if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
@@ -18,12 +18,11 @@
-endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
@@ -32,16 +32,3 @@
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
set(PACKAGE_VERSION_EXACT TRUE)
@@ -38,15 +38,3 @@
if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
-
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
- return()
@@ -37,11 +36,28 @@
-endif()
--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
@@ -31,16 +31,3 @@
set(PACKAGE_VERSION_EXACT TRUE)
endif()
@@ -37,15 +37,3 @@
if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
- return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
- set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
--- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in
@@ -41,15 +41,3 @@
if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
@@ -1,7 +1,8 @@
--- Source/Checks/cm_cxx14_check.cpp.orig
+++ Source/Checks/cm_cxx14_check.cpp
@@ -1,8 +1,16 @@
@@ -1,15 +1,16 @@
-#include <cstdio>
-#include <iterator>
+// actually use c++14 feature to force the compiler to do something,
+// since it might otherwise try to optimize all of this out even if it
+// doesn't understand it.
@@ -14,46 +15,60 @@
+main
+(void)
{
- int a[] = { 0, 1, 2 };
- auto ai = std::cbegin(a);
-
- int b[] = { 2, 1, 0 };
- auto bi = std::cend(b);
-
- std::unique_ptr<int> u(new int(0));
- return *u;
- return *u + *ai + *(bi - 1);
+ std::unique_ptr < int > foo = std::make_unique < int > (4);
+ std::cout << "std::make_unique < int >(4) is '"
+ << *foo << "'" << std::endl;
+ return 0;
}
--- Source/Checks/cm_cxx17_check.cpp.orig
+++ Source/Checks/cm_cxx17_check.cpp
@@ -1,9 +1,27 @@
@@ -1,18 +1,27 @@
-#include <cstdio>
-#include <iterator>
-#include <memory>
-#include <unordered_map>
+// requires c++17 or newer, so will fail tests of c++14 or earlier
+#include <optional>

-int main()
-{
- int a[] = { 0, 1, 2 };
- auto ai = std::cbegin(a);
-
- int b[] = { 2, 1, 0 };
- auto bi = std::cend(b);
+#include <iostream>
+#include <string>
+

- auto ci = std::size(a);
+std::optional < std::string >
+create
+(bool b) {
+ if (b) {
+ return "foo!";
+ }
+ return {};
+ if (b) {
+ return "foo!";
+ }
+ return {};
+}
+

- std::unique_ptr<int> u(new int(0));
- return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci));
+int
+main
+(void)
{
- std::unique_ptr<int> u(new int(0));
- return *u;
+ std::cout << "create(false) returned "
+ << create(false).value_or("empty")
+ << std::endl;
+ std::cout << "create(true) returned "
+ << create(true).value_or("empty")
+ << std::endl;
+ return 0;
+{
+ std::cout << "create(false) returned "
+ << create(false).value_or("empty")
+ << std::endl;
+ std::cout << "create(true) returned "
+ << create(true).value_or("empty")
+ << std::endl;
+ return 0;
}
@@ -157,7 +157,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -691,12 +691,6 @@
@@ -708,12 +708,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
@@ -6,89 +6,6 @@
@@ -6,100 +6,6 @@
cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
@@ -17,9 +17,20 @@
- macro(qt4_add_resources)
- qt5_add_resources(${ARGN})
- endmacro()
-
- set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
- set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
-
- # Try to find the package WinExtras for the task bar progress
- if(WIN32)
- find_package(Qt5WinExtras QUIET)
- if (Qt5WinExtras_FOUND)
- include_directories(${Qt5WinExtras_INCLUDE_DIRS})
- add_definitions(-DQT_WINEXTRAS)
- list(APPEND CMake_QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
- endif()
- endif()
-
- # Remove this when the minimum version of Qt is 4.6.
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
-
@@ -90,7 +101,7 @@
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
@@ -100,8 +17,6 @@
@@ -111,8 +17,6 @@

set(CMake_QT_LIBRARIES ${QT_LIBRARIES})

@@ -99,7 +110,7 @@
set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
@@ -146,7 +61,7 @@
@@ -157,7 +61,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -108,7 +119,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
@@ -163,7 +78,7 @@
@@ -174,7 +78,7 @@

set(CMAKE_INCLUDE_CURRENT_DIR ON)

@@ -117,7 +128,7 @@
target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})

if(WIN32)
@@ -189,7 +104,7 @@
@@ -200,7 +104,7 @@
...
")

@@ -126,7 +137,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")

@@ -235,7 +150,7 @@
@@ -246,7 +150,7 @@
${COMPONENT})
endif()

@@ -135,7 +146,7 @@
install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
@@ -246,7 +161,7 @@
@@ -257,7 +161,7 @@
# install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
@@ -146,7 +157,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -702,12 +702,6 @@
@@ -699,12 +699,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
@@ -78,7 +78,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -691,12 +691,6 @@
@@ -708,12 +708,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
@@ -11,7 +11,7 @@
include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
macro(qt4_wrap_ui)
@@ -88,19 +90,6 @@
@@ -99,19 +101,6 @@
get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
endif()
endif()
@@ -31,7 +31,7 @@

set(SRCS
AddCacheEntry.cxx
@@ -146,7 +135,7 @@
@@ -157,7 +146,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -40,7 +40,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
@@ -163,7 +152,7 @@
@@ -174,7 +163,7 @@

set(CMAKE_INCLUDE_CURRENT_DIR ON)

@@ -49,7 +49,7 @@
target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})

if(WIN32)
@@ -189,7 +178,7 @@
@@ -200,7 +189,7 @@
...
")

@@ -58,7 +58,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")

@@ -235,7 +224,7 @@
@@ -246,7 +235,7 @@
${COMPONENT})
endif()

@@ -67,7 +67,7 @@
install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
@@ -246,7 +235,7 @@
@@ -257,7 +246,7 @@
# install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
@@ -78,7 +78,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -702,12 +702,6 @@
@@ -699,12 +699,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")

0 comments on commit 96714be

Please sign in to comment.
You can’t perform that action at this time.