cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backout to cmake 3.10.2 to unbreak ports at least on i386, maybe others, ok jca

Browse Source 
3.11.2 has issues along these lines:

cmQtAutoGeneratorMocUic.cxx:(.text+0x8e8b): undefined reference to `operator new(unsigned long, std::align_val_t)'
cmQtAutoGeneratorMocUic.cxx:(.text+0x8ebf): undefined reference to `operator delete(void*, std::align_val_t)'
This commit is contained in:
sthen 2018-06-14 17:04:45 +00:00
parent a1b2bcf572
commit c7b1925252
31 changed files with 302 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/cmake/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.169 2018/06/12 05:12:01 rsadowski Exp $
# $OpenBSD: Makefile,v 1.170 2018/06/14 17:04:45 sthen Exp $
DPB_PROPERTIES =parallel
COMMENT = portable build system
VER = 3.11.2
VER = 3.10.2
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel

4
devel/cmake/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cmake-3.11.2.tar.gz) = Xrwiu88rTHogxBkNQsCEzzhoCoWxp5gKLx1bSlK/Ukg=
SIZE (cmake-3.11.2.tar.gz) = 7953913
SHA256 (cmake-3.10.2.tar.gz) = gND6rUq1beB6ohp/xpLIjEzmFW1CsFecaWIASnCjIYs=
SIZE (cmake-3.10.2.tar.gz) = 7824452

10
devel/cmake/patches/patch-CMakeLists_txt
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-CMakeLists_txt,v 1.25 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.26 2018/06/14 17:04:45 sthen Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -337,6 +337,15 @@ macro (CMAKE_BUILD_UTILITIES)
@@ -317,6 +317,15 @@ macro (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
endif()
@ -18,7 +18,7 @@ Index: CMakeLists.txt
#---------------------------------------------------------------------
# Setup third-party libraries.
# Everything in the tree should be able to include files from the
@@ -370,7 +379,8 @@ macro (CMAKE_BUILD_UTILITIES)
@@ -350,7 +359,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
endif()
@ -28,7 +28,7 @@ Index: CMakeLists.txt
else()
set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
add_subdirectory(Utilities/cmlibrhash)
@@ -536,7 +546,8 @@ macro (CMAKE_BUILD_UTILITIES)
@@ -516,7 +526,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
endif()
@ -38,7 +38,7 @@ Index: CMakeLists.txt
else()
set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
add_subdirectory(Utilities/cmjsoncpp)
@@ -551,7 +562,8 @@ macro (CMAKE_BUILD_UTILITIES)
@@ -531,7 +542,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
endif()

4
devel/cmake/patches/patch-Modules_CMakeCInformation_cmake
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.7 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.8 2018/06/14 17:04:45 sthen Exp $
Index: Modules/CMakeCInformation.cmake
--- Modules/CMakeCInformation.cmake.orig
+++ Modules/CMakeCInformation.cmake
@@ -142,7 +142,7 @@ include(CMakeCommonLanguageInclude)
@@ -165,7 +165,7 @@ include(CMakeCommonLanguageInclude)
# create a C shared library
if(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
set(CMAKE_C_CREATE_SHARED_LIBRARY

9
devel/cmake/patches/patch-Modules_CMakeCXXInformation_cmake
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.6 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/CMakeCXXInformation.cmake
--- Modules/CMakeCXXInformation.cmake.orig
+++ Modules/CMakeCXXInformation.cmake
$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
--- Modules/CMakeCXXInformation.cmake.orig Fri Nov 11 15:37:13 2016
+++ Modules/CMakeCXXInformation.cmake Fri Nov 25 22:31:44 2016
@@ -134,10 +134,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
set(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
endif()
@ -13,7 +12,7 @@ Index: Modules/CMakeCXXInformation.cmake
if(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG)
set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
endif()
@@ -232,7 +228,7 @@ include(CMakeCommonLanguageInclude)
@@ -253,7 +249,7 @@ include(CMakeCommonLanguageInclude)
# create a shared C++ library
if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
set(CMAKE_CXX_CREATE_SHARED_LIBRARY

11
devel/cmake/patches/patch-Modules_CMakeFortranInformation_cmake
View File

@ -1,8 +1,7 @@
$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.6 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/CMakeFortranInformation.cmake
--- Modules/CMakeFortranInformation.cmake.orig
+++ Modules/CMakeFortranInformation.cmake
@@ -110,10 +110,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
--- Modules/CMakeFortranInformation.cmake.orig Fri Nov 11 15:37:13 2016
+++ Modules/CMakeFortranInformation.cmake Fri Nov 25 22:31:44 2016
@@ -115,10 +115,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
set(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
endif()
@ -13,7 +12,7 @@ Index: Modules/CMakeFortranInformation.cmake
# for most systems a module is the same as a shared library
# so unless the variable CMAKE_MODULE_EXISTS is set just
# copy the values from the LIBRARY variables
@@ -168,7 +164,7 @@ include(CMakeCommonLanguageInclude)
@@ -182,7 +178,7 @@ include(CMakeCommonLanguageInclude)
# create a Fortran shared library
if(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
set(CMAKE_Fortran_CREATE_SHARED_LIBRARY

161
devel/cmake/patches/patch-Modules_FindJNI_cmake
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.22 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.23 2018/06/14 17:04:45 sthen Exp $
Index: Modules/FindJNI.cmake
--- Modules/FindJNI.cmake.orig
+++ Modules/FindJNI.cmake
@ -8,10 +8,10 @@ Index: Modules/FindJNI.cmake
+set(MODJAVA_VER $ENV{MODJAVA_VER})
+
# Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
macro(java_append_library_directories _var)
# Determine java arch-specific library subdir
@@ -73,8 +75,10 @@ macro(java_append_library_directories _var)
@@ -70,8 +72,10 @@ macro(java_append_library_directories _var)
# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
# system is non-Linux (where the code above has not been well tested)
@ -24,13 +24,13 @@ Index: Modules/FindJNI.cmake
endif()
# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
@@ -110,17 +114,67 @@ if(_JAVA_HOME_EXPLICIT)
@@ -107,60 +111,66 @@ if(_JAVA_HOME_EXPLICIT)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()
-set(JAVA_AWT_LIBRARY_DIRECTORIES)
-if(_JAVA_HOME)
+if (MODJAVA_VER)
+if(MODJAVA_VER)
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
- ${_JAVA_HOME}/jre/lib/{libarch}
@ -41,6 +41,9 @@ Index: Modules/FindJNI.cmake
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
)
-endif()
-get_filename_component(java_install_version
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+else(MODJAVA_VER)
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
+ if(_JAVA_HOME)
@ -51,59 +54,18 @@ Index: Modules/FindJNI.cmake
+ ${_JAVA_HOME}/lib
+ ${_JAVA_HOME}
+ )
endif()
+list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
+ )
+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ /usr/lib
+ /usr/local/lib
+ /usr/lib/jvm/java/lib
+ /usr/lib/java/jre/lib/{libarch}
+ /usr/lib/jvm/jre/lib/{libarch}
+ /usr/local/lib/java/jre/lib/{libarch}
+ /usr/local/share/java/jre/lib/{libarch}
+ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
+ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
+ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
+ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed ac
+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
+ # Debian specific paths for default JVM
+ /usr/lib/jvm/default-java/jre/lib/{libarch}
+ /usr/lib/jvm/default-java/jre/lib
+ /usr/lib/jvm/default-java/lib
+ # Arch Linux specific paths for default JVM
+ /usr/lib/jvm/default/jre/lib/{libarch}
+ /usr/lib/jvm/default/lib/{libarch}
+ # Ubuntu specific paths for default JVM
+ /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
+ /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
+ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
+ # OpenBSD specific paths for default JVM
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
+ # SuSE specific paths for default JVM
+ /usr/lib64/jvm/java/jre/lib/{libarch}
+ /usr/lib64/jvm/jre/lib/{libarch}
+ )
+endif(MODJAVA_VER)
+get_filename_component(java_install_version
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+
if (WIN32)
set (_JNI_HINTS)
execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
@@ -165,40 +219,6 @@ if (WIN32)
)
endif()
+ endif()
+ get_filename_component(java_install_version
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
-list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
- )
-JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
- /usr/lib
- /usr/local/lib
- /usr/lib/jvm/java/lib
- /usr/lib/java/jre/lib/{libarch}
- /usr/lib/jvm/jre/lib/{libarch}
@ -137,10 +99,50 @@ Index: Modules/FindJNI.cmake
- /usr/lib64/jvm/java/jre/lib/{libarch}
- /usr/lib64/jvm/jre/lib/{libarch}
- )
+ list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
+ )
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ /usr/lib
+ /usr/local/lib
+ /usr/lib/jvm/java/lib
+ /usr/lib/java/jre/lib/{libarch}
+ /usr/lib/jvm/jre/lib/{libarch}
+ /usr/local/lib/java/jre/lib/{libarch}
+ /usr/local/share/java/jre/lib/{libarch}
+ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
+ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
+ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
+ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
+ # Debian specific paths for default JVM
+ /usr/lib/jvm/default-java/jre/lib/{libarch}
+ /usr/lib/jvm/default-java/jre/lib
+ /usr/lib/jvm/default-java/lib
+ # Arch Linux specific paths for default JVM
+ /usr/lib/jvm/default/jre/lib/{libarch}
+ /usr/lib/jvm/default/lib/{libarch}
+ # Ubuntu specific paths for default JVM
+ /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
+ /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
+ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
+ # OpenBSD specific paths for default JVM
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
+ # SuSE specific paths for default JVM
+ /usr/lib64/jvm/java/jre/lib/{libarch}
+ /usr/lib64/jvm/jre/lib/{libarch}
+ )
+endif(MODJAVA_VER)
set(JAVA_JVM_LIBRARY_DIRECTORIES)
foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
@@ -212,52 +232,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
@@ -174,43 +184,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
)
endforeach()
@ -148,27 +150,15 @@ Index: Modules/FindJNI.cmake
-if(_JAVA_HOME)
- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
-endif()
-if (WIN32)
- foreach (_JNI_HINT IN LISTS _JNI_HINTS)
- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "${_JNI_HINT}/include")
- endforeach()
- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+if(MODJAVA_VER)
+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${LOCALBASE}/jdk-1.8.0/include
)
-endif()
-list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
-)
-
-JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
- /usr/include
- /usr/local/include
- /usr/lib/java/include
- /usr/local/lib/java/include
- /usr/lib/jvm/java/include
@ -192,18 +182,23 @@ Index: Modules/FindJNI.cmake
- /usr/local/jdk-1.6.0/include
- # SuSE specific paths for default JVM
- /usr/lib64/jvm/java/include
+if(MODJAVA_VER)
+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${LOCALBASE}/jdk-1.8.0/include
+ )
+else(MODJAVA_VER)
+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
+ if(_JAVA_HOME)
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
+ endif()
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_versio
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_versio
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
)
+
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
+ /usr/include
+ /usr/local/include
@ -212,7 +207,7 @@ Index: Modules/FindJNI.cmake
+ /usr/lib/jvm/java/include
+ /usr/lib/jvm/java-6-sun/include
+ /usr/lib/jvm/java-1.5.0-sun/include
+ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to
+ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
+ /usr/lib/jvm/java-6-openjdk/include
+ /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10
+ /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10
@ -231,6 +226,6 @@ Index: Modules/FindJNI.cmake
+ /usr/lib64/jvm/java/include
+ )
+endif(MODJAVA_VER)
foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
get_filename_component(jpath "${JAVA_PROG}" PATH)
foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)

6
devel/cmake/patches/patch-Modules_FindJava_cmake
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Modules_FindJava_cmake,v 1.23 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_FindJava_cmake,v 1.24 2018/06/14 17:04:45 sthen Exp $
Index: Modules/FindJava.cmake
--- Modules/FindJava.cmake.orig
+++ Modules/FindJava.cmake
@ -11,8 +11,8 @@ Index: Modules/FindJava.cmake
# The HINTS option should only be used for values computed from the system.
set(_JAVA_HINTS)
if(_JAVA_HOME)
@@ -127,19 +129,22 @@ endif()
@@ -97,19 +99,22 @@ list(APPEND _JAVA_HINTS
)
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
-set(_JAVA_PATHS

4
devel/cmake/patches/patch-Modules_FindKDE3_cmake
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.5 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.6 2018/06/14 17:04:45 sthen Exp $
Index: Modules/FindKDE3.cmake
--- Modules/FindKDE3.cmake.orig
+++ Modules/FindKDE3.cmake
@@ -293,12 +293,6 @@ if(KDE3_FOUND)
@@ -294,12 +294,6 @@ if(KDE3_FOUND)
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
endif ()

33
devel/cmake/patches/patch-Modules_FindMPEG2_cmake
View File

@ -1,8 +1,37 @@
$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.9 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.10 2018/06/14 17:04:45 sthen Exp $
Index: Modules/FindMPEG2.cmake
--- Modules/FindMPEG2.cmake.orig
+++ Modules/FindMPEG2.cmake
@@ -46,4 +46,4 @@ if(MPEG2_FOUND)
@@ -23,24 +23,19 @@
# MPEG2_vo_LIBRARY, where to find the vo library.
find_path(MPEG2_INCLUDE_DIR
- NAMES mpeg2.h mpeg2dec/mpeg2.h
- PATHS /usr/local/livid
+ NAMES mpeg2dec/mpeg2.h
+ PATHS ${LOCALBASE}/include
)
find_library(MPEG2_mpeg2_LIBRARY mpeg2
- /usr/local/livid/mpeg2dec/libmpeg2/.libs
+ ${LOCALBASE}/lib
)
-find_library( MPEG2_vo_LIBRARY vo
- /usr/local/livid/mpeg2dec/libvo/.libs
-)
-
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
if(MPEG2_FOUND)
- set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
- ${MPEG2_vo_LIBRARY})
+ set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY})
#some native mpeg2 installations will depend
#on libSDL, if found, add it in.
@@ -50,4 +45,4 @@ if(MPEG2_FOUND)
endif()
endif()

29
devel/cmake/patches/patch-Modules_FindMPEG_cmake
View File

@ -1,18 +1,33 @@
$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.10 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
Index: Modules/FindMPEG.cmake
--- Modules/FindMPEG.cmake.orig
+++ Modules/FindMPEG.cmake
@@ -27,8 +27,6 @@ find_path(MPEG_INCLUDE_DIR
@@ -22,23 +22,19 @@
# MPEG_mpeg2_LIBRARY, where to find the MPEG library.
# MPEG_vo_LIBRARY, where to find the vo library.
find_library(MPEG_mpeg2_LIBRARY mpeg2)
-find_path(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
- /usr/local/livid
+find_path(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
+ ${LOCALBASE}/include
)
-find_library(MPEG_vo_LIBRARY vo)
find_library(MPEG_mpeg2_LIBRARY mpeg2
- /usr/local/livid/mpeg2dec/libmpeg2/.libs
+ ${LOCALBASE}/lib
)
-find_library( MPEG_vo_LIBRARY vo
- /usr/local/livid/mpeg2dec/libvo/.libs
-)
-
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
@@ -39,4 +37,4 @@ if(MPEG_FOUND)
endif()
if(MPEG_FOUND)
- set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
+ set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
endif()
-mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)

4
devel/cmake/patches/patch-Modules_FindPythonLibs_cmake
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.16 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.17 2018/06/14 17:04:45 sthen Exp $
Index: Modules/FindPythonLibs.cmake
--- Modules/FindPythonLibs.cmake.orig
+++ Modules/FindPythonLibs.cmake
@ -33,7 +33,7 @@ Index: Modules/FindPythonLibs.cmake
unset(_PYTHON_FIND_OTHER_VERSIONS)
unset(_PYTHON1_VERSIONS)
@@ -190,20 +197,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
@@ -191,20 +198,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
endforeach()
endif()

11
devel/cmake/patches/patch-Modules_FindQt3_cmake
View File

@ -1,8 +1,7 @@
$OpenBSD: patch-Modules_FindQt3_cmake,v 1.10 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindQt3.cmake
--- Modules/FindQt3.cmake.orig
+++ Modules/FindQt3.cmake
@@ -139,7 +139,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
$OpenBSD: patch-Modules_FindQt3_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
--- Modules/FindQt3.cmake.orig Fri Nov 11 15:37:13 2016
+++ Modules/FindQt3.cmake Fri Nov 25 22:31:45 2016
@@ -151,7 +151,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_MOC_EXECUTABLE
@ -11,7 +10,7 @@ Index: Modules/FindQt3.cmake
HINTS
ENV QTDIR
PATHS
@@ -159,7 +159,7 @@ endif()
@@ -176,7 +176,7 @@ endif()
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_UIC_EXECUTABLE

8
devel/cmake/patches/patch-Modules_FindQt4_cmake
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.29 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.30 2018/06/14 17:04:45 sthen Exp $
Index: Modules/FindQt4.cmake
--- Modules/FindQt4.cmake.orig
+++ Modules/FindQt4.cmake
@@ -517,7 +517,12 @@ endfunction()
@@ -516,7 +516,12 @@ endfunction()
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
@ -16,7 +16,7 @@ Index: Modules/FindQt4.cmake
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
if (QT_QMAKE_EXECUTABLE AND
@@ -697,6 +702,8 @@ if (QT_QMAKE_EXECUTABLE AND
@@ -696,6 +701,8 @@ if (QT_QMAKE_EXECUTABLE AND
# Set QT_INCLUDES
set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
@ -25,7 +25,7 @@ Index: Modules/FindQt4.cmake
# ask qmake for the documentation directory
@@ -1140,17 +1147,17 @@ if (QT_QMAKE_EXECUTABLE AND
@@ -1139,17 +1146,17 @@ if (QT_QMAKE_EXECUTABLE AND
endif()
endmacro()

72
devel/cmake/patches/patch-Modules_FindRuby_cmake
View File

@ -1,13 +1,12 @@
$OpenBSD: patch-Modules_FindRuby_cmake,v 1.15 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindRuby.cmake
--- Modules/FindRuby.cmake.orig
+++ Modules/FindRuby.cmake
@@ -41,10 +41,18 @@
$OpenBSD: patch-Modules_FindRuby_cmake,v 1.16 2018/06/14 17:04:45 sthen Exp $
--- Modules/FindRuby.cmake.orig Fri Nov 11 15:37:13 2016
+++ Modules/FindRuby.cmake Fri Nov 25 22:31:45 2016
@@ -42,35 +42,53 @@
# uncomment the following line to get debug output for this file
# set(_RUBY_DEBUG_OUTPUT TRUE)
+set(MODRUBY_REV $ENV{MODRUBY_REV})
+set(MODRUBY_REV $ENV{MODRUBY_REV})
+
+if(MODRUBY_REV AND MODRUBY_REV MATCHES "^[0-9]+\\.[0-9]$")
+ string(REPLACE "." "" MODRUBY_REV_NO_DOTS ${MODRUBY_REV})
+ string(REPLACE "." ";" MODRUBY_REV_LIST ${MODRUBY_REV})
@ -22,24 +21,41 @@ Index: Modules/FindRuby.cmake
# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
@@ -59,12 +67,9 @@ else()
set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
# we can't construct that if only major version is given
set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
- ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
+ ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
else()
- set(Ruby_FIND_VERSION_SHORT_NODOT "18")
+ if(MODRUBY_REV_NO_DOTS)
+ set(Ruby_FIND_VERSION_SHORT_NODOT "${MODRUBY_REV_NO_DOTS}")
+ else(MODRUBY_REV_NO_DOTS)
+ set(Ruby_FIND_VERSION_SHORT_NODOT "18")
+ endif(MODRUBY_REV_NO_DOTS)
endif()
if(NOT Ruby_FIND_VERSION_EXACT)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby25 ruby2.4)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby24 ruby2.4)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby23 ruby2.3)
+ if(MODRUBY_REV AND MODRUBY_REV_NO_DOTS)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby${MODRUBY_REV_NO_DOTS} ruby${MODRUBY_REV})
+ endif()
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby22 ruby2.2)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby21 ruby2.1)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby20 ruby2.0)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby19 ruby1.9)
# if we want a version below 1.9, also look for ruby 1.8
if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
@@ -74,6 +79,9 @@ if(NOT Ruby_FIND_VERSION_EXACT)
list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby18 ruby1.8)
endif()
-
- list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
endif()
+list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
@ -48,25 +64,35 @@ Index: Modules/FindRuby.cmake
find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
@@ -188,6 +196,11 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
@@ -155,6 +173,10 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MAJOR 1)
set(RUBY_VERSION_MINOR 8)
set(RUBY_VERSION_PATCH 0)
+ if(${RUBY_EXECUTABLE} MATCHES "ruby${MODRUBY_REV_NO_DOTS}")
+ set(RUBY_VERSION_MAJOR ${MODRUBY_REV_MAJOR})
+ set(RUBY_VERSION_MINOR ${MODRUBY_REV_MINOR})
+ endif()
# check whether we found 1.9.x
if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
set(RUBY_VERSION_MAJOR 1)
@@ -170,6 +192,11 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 4)
set(RUBY_VERSION_MINOR 1)
endif()
+ # check whether we found 2.5.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
+ # check whether we found 2.2.x
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?2")
+ set(RUBY_VERSION_MAJOR 2)
+ set(RUBY_VERSION_MINOR 4)
+ set(RUBY_VERSION_MINOR 2)
+ endif()
endif()
if(RUBY_VERSION_MAJOR)
@@ -221,7 +234,8 @@ endif()
@@ -203,7 +230,7 @@ endif()
# 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} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
+set(_RUBY_POSSIBLE_LIB_NAMES ruby${_RUBY_VERSION_SHORT_NODOT} ruby${_RUBY_VERSION_SHORT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION} ruby ruby-static)
+
if(WIN32)
set( _RUBY_MSVC_RUNTIME "" )

52
devel/cmake/patches/patch-Modules_FindTCL_cmake
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-Modules_FindTCL_cmake,v 1.14 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindTCL.cmake
--- Modules/FindTCL.cmake.orig
+++ Modules/FindTCL.cmake
$OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
--- Modules/FindTCL.cmake.orig Fri Nov 11 15:37:13 2016
+++ Modules/FindTCL.cmake Fri Nov 25 22:31:45 2016
@@ -48,19 +48,36 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
include(${CMAKE_CURRENT_LIST_DIR}/FindTclsh.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/FindWish.cmake)
@ -43,7 +42,7 @@ Index: Modules/FindTCL.cmake
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -75,15 +92,37 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
@@ -75,19 +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}")
@ -54,7 +53,11 @@ Index: Modules/FindTCL.cmake
- "${TK_LIBRARY_PATH}"
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
-)
- /usr/local/lib/tcl/tcl8.5
- /usr/local/lib/tcl/tk8.5
- /usr/local/lib/tcl/tcl8.4
- /usr/local/lib/tcl/tk8.4
- )
+set(TCLTK_OPENBSD_LIB_PATHS)
+if(MODTCL_LIBDIR)
@ -86,10 +89,10 @@ Index: Modules/FindTCL.cmake
+ )
+endif()
+
set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES
lib/tcl/tcl8.6
lib/tcl/tk8.6
@@ -112,33 +151,47 @@ if(WIN32)
if(WIN32)
get_filename_component(
ActiveTcl_CurrentVersion
@@ -107,31 +142,47 @@ if(WIN32)
)
endif()
@ -97,14 +100,13 @@ Index: Modules/FindTCL.cmake
- NAMES
- tcl
- tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
- tcl86 tcl8.6 tcl86t tcl8.6t
- tcl86 tcl8.6
- tcl85 tcl8.5
- tcl84 tcl8.4
- tcl83 tcl8.3
- tcl82 tcl8.2
- tcl80 tcl8.0
- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
- PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
- )
+if(MODTCL_LIB)
+ find_library(TCL_LIBRARY
@ -131,14 +133,13 @@ Index: Modules/FindTCL.cmake
- NAMES
- tk
- tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
- tk86 tk8.6 tk86t tk8.6t
- tk86 tk8.6
- tk85 tk8.5
- tk84 tk8.4
- tk83 tk8.3
- tk82 tk8.2
- tk80 tk8.0
- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
- PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
- )
+if(MODTK_LIB)
+ find_library(TK_LIBRARY
@ -163,7 +164,7 @@ Index: Modules/FindTCL.cmake
CMAKE_FIND_FRAMEWORKS(Tcl)
CMAKE_FIND_FRAMEWORKS(Tk)
@@ -162,16 +215,6 @@ if(Tk_FRAMEWORKS)
@@ -155,30 +206,46 @@ if(Tk_FRAMEWORKS)
endif()
endif()
@ -176,14 +177,21 @@ Index: Modules/FindTCL.cmake
- ${TK_FRAMEWORK_INCLUDES}
- "${TCL_TCLSH_PATH_PARENT}/include"
- "${TK_WISH_PATH_PARENT}/include"
- /usr/include/tcl${TK_LIBRARY_VERSION}
- /usr/include/tcl${TCL_LIBRARY_VERSION}
- /usr/include/tcl8.6
- /usr/include/tcl8.5
- /usr/include/tcl8.4
- /usr/include/tcl8.3
- /usr/include/tcl8.2
- /usr/include/tcl8.0
- /usr/local/include/tcl8.6
- /usr/local/include/tk8.6
- /usr/local/include/tcl8.5
- /usr/local/include/tk8.5
- /usr/local/include/tcl8.4
- /usr/local/include/tk8.4
- )
set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
include/tcl${TK_LIBRARY_VERSION}
@@ -186,6 +229,46 @@ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
include/tcl8.2
include/tcl8.0
)
+set(TCLTK_OPENBSD_INCLUDE_PATHS)
+
+if(MODTCL_INCDIR)

4
devel/cmake/patches/patch-Source_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_CMakeLists_txt,v 1.11 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_CMakeLists_txt,v 1.12 2018/06/14 17:04:45 sthen Exp $
Index: Source/CMakeLists.txt
--- Source/CMakeLists.txt.orig
+++ Source/CMakeLists.txt
@ -12,7 +12,7 @@ Index: Source/CMakeLists.txt
${CMAKE_TAR_INCLUDES}
${CMAKE_COMPRESS_INCLUDES}
${CMake_HAIKU_INCLUDE_DIRS}
@@ -275,7 +278,6 @@ set(SRCS
@@ -273,7 +276,6 @@ set(SRCS
cmRulePlaceholderExpander.cxx
cmRulePlaceholderExpander.h
cmLocalUnixMakefileGenerator3.cxx

6
devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.21 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.22 2018/06/14 17:04:45 sthen Exp $
Index: Source/cmComputeLinkInformation.cxx
--- Source/cmComputeLinkInformation.cxx.orig
+++ Source/cmComputeLinkInformation.cxx
@ -60,7 +60,7 @@ Index: Source/cmComputeLinkInformation.cxx
}
} else {
// This is a library or option specified by the user.
@@ -980,11 +996,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
@@ -982,11 +998,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
this->SharedLibrariesLinked.insert(target);
}
@ -84,7 +84,7 @@ Index: Source/cmComputeLinkInformation.cxx
}
// If this platform wants a flag before the full path, add it.
@@ -1537,6 +1560,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
@@ -1539,6 +1562,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
if (const char* implicitDirs =
this->Makefile->GetDefinition(implicitDirVar)) {
cmSystemTools::ExpandListArgument(implicitDirs, implicitDirVec);

14
devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.9 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.10 2018/06/14 17:04:45 sthen Exp $
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
@@ -1196,11 +1196,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
@@ -1195,11 +1195,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
bool cmGeneratorTarget::HasSOName(const std::string& config) const
{
@ -18,7 +18,7 @@ Index: Source/cmGeneratorTarget.cxx
}
bool cmGeneratorTarget::NeedRelinkBeforeInstall(
@@ -2978,9 +2982,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
@@ -2974,9 +2978,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
@ -35,7 +35,7 @@ Index: Source/cmGeneratorTarget.cxx
// Versioning is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
version = nullptr;
@@ -3006,6 +3016,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
@@ -3002,6 +3012,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// The library name.
name = prefix + base + suffix;
@ -69,8 +69,8 @@ Index: Source/cmGeneratorTarget.cxx
+
if (this->IsFrameworkOnApple()) {
realName = prefix;
if (!this->Makefile->PlatformIsAppleEmbedded()) {
@@ -3017,7 +3055,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
if (!this->Makefile->PlatformIsAppleIos()) {
@@ -3013,7 +3051,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
soName = realName;
} else {
// The library's soname.
@ -82,7 +82,7 @@ Index: Source/cmGeneratorTarget.cxx
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix, name, version);
@@ -4146,7 +4188,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
@@ -4142,7 +4184,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
vName = this->Makefile->IsOn("APPLE") ? (prefix + base) : name;
if (version) {
vName += ".";

22
devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.8 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.9 2018/06/14 17:04:45 sthen Exp $
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
@@ -2369,6 +2369,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCTestCommand());
singleLine.push_back("--force-new-ctest-process");
+ // Skip tests requiring internet access
+ singleLine.push_back("--exclude-regex");
+ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
singleLine.push_back("-C");
singleLine.push_back(cmakeCfgIntDir);
@@ -2227,6 +2227,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCTestCommand());
singleLine.push_back("--force-new-ctest-process");
+ // Skip tests requiring internet access
+ singleLine.push_back("--exclude-regex");
+ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
singleLine.push_back("-C");
singleLine.push_back(cmakeCfgIntDir);

6
devel/cmake/patches/patch-Source_cmInstallCommand_cxx
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.13 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.14 2018/06/14 17:04:45 sthen Exp $
Index: Source/cmInstallCommand.cxx
--- Source/cmInstallCommand.cxx.orig
+++ Source/cmInstallCommand.cxx
@@ -319,6 +319,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
@@ -318,6 +318,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
}
// Select the mode for installing symlinks to versioned shared libraries.
@ -12,7 +12,7 @@ Index: Source/cmInstallCommand.cxx
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
@@ -326,6 +329,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
@@ -325,6 +328,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
} else if (libraryArgs.GetNamelinkSkip()) {
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}

6
devel/cmake/patches/patch-Source_cmSystemTools_cxx
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.11 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.12 2018/06/14 17:04:45 sthen Exp $
Get rid of cmLocaleRAII.
@ -29,7 +29,7 @@ the invalid use of the interface.
Index: Source/cmSystemTools.cxx
--- Source/cmSystemTools.cxx.orig
+++ Source/cmSystemTools.cxx
@@ -9,7 +9,6 @@
@@ -8,7 +8,6 @@
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmArchiveWrite.h"
@ -37,7 +37,7 @@ Index: Source/cmSystemTools.cxx
#include "cm_libarchive.h"
#ifndef __LA_INT64_T
#define __LA_INT64_T la_int64_t
@@ -1729,8 +1728,6 @@ long copy_data(struct archive* ar, struct archive* aw)
@@ -1671,8 +1670,6 @@ long copy_data(struct archive* ar, struct archive* aw)
bool extract_tar(const char* outFileName, bool verbose, bool extract)
{

4
devel/cmake/patches/patch-Source_cmTarget_cxx
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.33 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_cmTarget_cxx,v 1.34 2018/06/14 17:04:45 sthen Exp $
Index: Source/cmTarget.cxx
--- Source/cmTarget.cxx.orig
+++ Source/cmTarget.cxx
@@ -229,7 +229,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
@@ -227,7 +227,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
this->SetPropertyDefault("BUILD_RPATH", nullptr);
this->SetPropertyDefault("INSTALL_NAME_DIR", nullptr);
this->SetPropertyDefault("INSTALL_RPATH", "");

6
devel/cmake/patches/patch-Source_cmake_cxx
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_cmake_cxx,v 1.16 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_cmake_cxx,v 1.17 2018/06/14 17:04:45 sthen Exp $
Revert 4e3c7725d0d724d7a8a0e8305d15713e01b20503: we want to build
CMake using Ninja
@ -6,7 +6,7 @@ CMake using Ninja
Index: Source/cmake.cxx
--- Source/cmake.cxx.orig
+++ Source/cmake.cxx
@@ -69,9 +69,7 @@
@@ -76,9 +76,7 @@
#include "cmGlobalWatcomWMakeGenerator.h"
#endif
#include "cmGlobalUnixMakefileGenerator3.h"
@ -16,7 +16,7 @@ Index: Source/cmake.cxx
#include "cmExtraCodeLiteGenerator.h"
#if !defined(CMAKE_BOOT_MINGW)
@@ -1699,9 +1697,7 @@ void cmake::AddDefaultGenerators()
@@ -1662,9 +1660,7 @@ void cmake::AddDefaultGenerators()
this->Generators.push_back(cmGlobalMinGWMakefileGenerator::NewFactory());
#endif
this->Generators.push_back(cmGlobalUnixMakefileGenerator3::NewFactory());

4
devel/cmake/patches/patch-Source_kwsys_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_kwsys_CMakeLists_txt,v 1.4 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_kwsys_CMakeLists_txt,v 1.5 2018/06/14 17:04:45 sthen Exp $
patch to disable libexecinfo / execinfo.h; seems it can be picked up
on ports-gcc arches.
@ -6,7 +6,7 @@ on ports-gcc arches.
Index: Source/kwsys/CMakeLists.txt
--- Source/kwsys/CMakeLists.txt.orig
+++ Source/kwsys/CMakeLists.txt
@@ -583,7 +583,7 @@ IF(KWSYS_USE_SystemInformation)
@@ -558,7 +558,7 @@ IF(KWSYS_USE_SystemInformation)
SET_PROPERTY(SOURCE SystemInformation.cxx APPEND PROPERTY
COMPILE_DEFINITIONS KWSYS_CXX_HAS__ATOI64=1)
ENDIF()

4
devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.23 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.24 2018/06/14 17:04:45 sthen Exp $
Don't spam systrace by attempting to create dirs which already exist
Index: Source/kwsys/SystemTools.cxx
--- Source/kwsys/SystemTools.cxx.orig
+++ Source/kwsys/SystemTools.cxx
@@ -285,12 +285,14 @@ inline void Realpath(const std::string& path, std::str
@@ -279,12 +279,14 @@ inline void Realpath(const std::string& path, std::str
}
#else
#include <sys/types.h>

13
devel/cmake/patches/patch-Tests_CMakeLib_CMakeLists_txt
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-Tests_CMakeLib_CMakeLists_txt,v 1.1 2018/06/12 05:12:01 rsadowski Exp $
Index: Tests/CMakeLib/CMakeLists.txt
--- Tests/CMakeLib/CMakeLists.txt.orig
+++ Tests/CMakeLib/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMake_BINARY_DIR}/Source
${CMake_SOURCE_DIR}/Source
+ ${CMAKE_LIBUV_INCLUDES}
)
set(CMakeLib_TESTS

13
devel/cmake/patches/patch-Tests_CMakeServerLib_CMakeLists_txt
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-Tests_CMakeServerLib_CMakeLists_txt,v 1.1 2018/06/12 05:12:01 rsadowski Exp $
Index: Tests/CMakeServerLib/CMakeLists.txt
--- Tests/CMakeServerLib/CMakeLists.txt.orig
+++ Tests/CMakeServerLib/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMake_BINARY_DIR}/Source
${CMake_SOURCE_DIR}/Source
+ ${CMAKE_LIBUV_INCLUDES}
)
set(CMakeServerLib_TESTS

4
devel/cmake/patches/patch-Tests_RunCMake_CMakeLists_txt
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Tests_RunCMake_CMakeLists_txt,v 1.5 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-Tests_RunCMake_CMakeLists_txt,v 1.6 2018/06/14 17:04:45 sthen Exp $
Index: Tests/RunCMake/CMakeLists.txt
--- Tests/RunCMake/CMakeLists.txt.orig
+++ Tests/RunCMake/CMakeLists.txt
@@ -100,7 +100,6 @@ add_RunCMake_test(CMP0054)
@@ -93,7 +93,6 @@ add_RunCMake_test(CMP0054)
add_RunCMake_test(CMP0055)
add_RunCMake_test(CMP0057)
add_RunCMake_test(CMP0059)

18
devel/cmake/patches/patch-bootstrap
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-bootstrap,v 1.17 2018/06/12 05:12:01 rsadowski Exp $
$OpenBSD: patch-bootstrap,v 1.18 2018/06/14 17:04:45 sthen Exp $
Use Ninja to build CMake
XXX: broken on m88k
@ -23,8 +23,8 @@ Index: bootstrap
cmake_man_dir_default="`cmake_install_dest_default MAN ${cmake_man_dir_keyword}`"
cmake_xdgdata_dir_default="`cmake_install_dest_default XDGDATA ${cmake_xdgdata_dir_keyword}`"
-CMAKE_KNOWN_C_COMPILERS="cc gcc clang xlc icc tcc"
-CMAKE_KNOWN_CXX_COMPILERS="aCC xlC CC g++ clang++ c++ icc como "
-CMAKE_KNOWN_C_COMPILERS="cc gcc xlc icc tcc"
-CMAKE_KNOWN_CXX_COMPILERS="aCC xlC CC g++ c++ icc como "
-CMAKE_KNOWN_MAKE_PROCESSORS="gmake make"
+CMAKE_KNOWN_C_COMPILERS="cc"
+CMAKE_KNOWN_CXX_COMPILERS="c++"
@ -38,9 +38,9 @@ Index: bootstrap
cmForEachCommand \
+ cmFortranParserImpl \
cmFunctionCommand \
cmFSPermissions \
cmGeneratedFileStream \
@@ -331,6 +336,7 @@ CMAKE_CXX_SOURCES="\
cmGeneratorExpression \
@@ -330,6 +335,7 @@ CMAKE_CXX_SOURCES="\
cmGetTestPropertyCommand \
cmGlobalCommonGenerator \
cmGlobalGenerator \
@ -48,7 +48,7 @@ Index: bootstrap
cmGlobalUnixMakefileGenerator3 \
cmHexFileConverter \
cmIfCommand \
@@ -351,10 +357,12 @@ CMAKE_CXX_SOURCES="\
@@ -350,10 +356,12 @@ CMAKE_CXX_SOURCES="\
cmInstalledFile \
cmLinkDirectoriesCommand \
cmLinkLineComputer \
@ -61,7 +61,7 @@ Index: bootstrap
cmLocalUnixMakefileGenerator3 \
cmMSVC60LinkLineComputer \
cmMacroCommand \
@@ -369,6 +377,10 @@ CMAKE_CXX_SOURCES="\
@@ -368,6 +376,10 @@ CMAKE_CXX_SOURCES="\
cmMessageCommand \
cmMessenger \
cmNewLineStyle \
@ -72,7 +72,7 @@ Index: bootstrap
cmOSXBundleGenerator \
cmOptionCommand \
cmOrderDirectories \
@@ -438,6 +450,8 @@ LexerParser_CXX_SOURCES="\
@@ -436,6 +448,8 @@ LexerParser_CXX_SOURCES="\
cmCommandArgumentParser \
cmExprLexer \
cmExprParser \
@ -81,7 +81,7 @@ Index: bootstrap
"
LexerParser_C_SOURCES="\
@@ -1406,7 +1420,7 @@ cmake_cxx_flags="${cmake_cxx_flags} \
@@ -1385,7 +1399,7 @@ cmake_cxx_flags="${cmake_cxx_flags} \
-I`cmake_escape \"${cmake_source_dir}/Source/LexerParser\"` \
-I`cmake_escape \"${cmake_source_dir}/Utilities\"`"
echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile"

87
devel/cmake/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.40 2018/06/12 05:12:01 rsadowski Exp $
@comment $OpenBSD: PLIST,v 1.41 2018/06/14 17:04:45 sthen Exp $
@bin bin/ccmake
@bin bin/cmake
@bin bin/cpack
@ -179,6 +179,7 @@ share/cmake/Help/generator/CodeBlocks.rst
share/cmake/Help/generator/CodeLite.rst
share/cmake/Help/generator/Eclipse CDT4.rst
share/cmake/Help/generator/Green Hills MULTI.rst
share/cmake/Help/generator/KDevelop3.rst
share/cmake/Help/generator/Kate.rst
share/cmake/Help/generator/MSYS Makefiles.rst
share/cmake/Help/generator/MinGW Makefiles.rst
@ -298,7 +299,6 @@ share/cmake/Help/module/Documentation.rst
share/cmake/Help/module/ExternalData.rst
share/cmake/Help/module/ExternalProject.rst
share/cmake/Help/module/FeatureSummary.rst
share/cmake/Help/module/FetchContent.rst
share/cmake/Help/module/FindALSA.rst
share/cmake/Help/module/FindASPELL.rst
share/cmake/Help/module/FindAVIFile.rst
@ -347,7 +347,6 @@ share/cmake/Help/module/FindHg.rst
share/cmake/Help/module/FindICU.rst
share/cmake/Help/module/FindITK.rst
share/cmake/Help/module/FindIce.rst
share/cmake/Help/module/FindIconv.rst
share/cmake/Help/module/FindIcotool.rst
share/cmake/Help/module/FindImageMagick.rst
share/cmake/Help/module/FindIntl.rst
@ -549,7 +548,6 @@ share/cmake/Help/policy/CMP0068.rst
share/cmake/Help/policy/CMP0069.rst
share/cmake/Help/policy/CMP0070.rst
share/cmake/Help/policy/CMP0071.rst
share/cmake/Help/policy/CMP0072.rst
share/cmake/Help/policy/DEPRECATED.txt
share/cmake/Help/policy/DISALLOWED_COMMAND.txt
share/cmake/Help/prop_cache/
@ -642,12 +640,10 @@ share/cmake/Help/prop_sf/AUTOUIC_OPTIONS.rst
share/cmake/Help/prop_sf/COMPILE_DEFINITIONS.rst
share/cmake/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
share/cmake/Help/prop_sf/COMPILE_FLAGS.rst
share/cmake/Help/prop_sf/COMPILE_OPTIONS.rst
share/cmake/Help/prop_sf/EXTERNAL_OBJECT.rst
share/cmake/Help/prop_sf/Fortran_FORMAT.rst
share/cmake/Help/prop_sf/GENERATED.rst
share/cmake/Help/prop_sf/HEADER_FILE_ONLY.rst
share/cmake/Help/prop_sf/INCLUDE_DIRECTORIES.rst
share/cmake/Help/prop_sf/KEEP_EXTENSION.rst
share/cmake/Help/prop_sf/LABELS.rst
share/cmake/Help/prop_sf/LANGUAGE.rst
@ -666,8 +662,6 @@ share/cmake/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
share/cmake/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
share/cmake/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
share/cmake/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
share/cmake/Help/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.rst
share/cmake/Help/prop_sf/VS_SHADER_ENABLE_DEBUG.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
@ -727,7 +721,6 @@ share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst
share/cmake/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
share/cmake/Help/prop_tgt/AUTOGEN_PARALLEL.rst
share/cmake/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
share/cmake/Help/prop_tgt/AUTOMOC.rst
share/cmake/Help/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.rst
@ -794,7 +787,6 @@ share/cmake/Help/prop_tgt/HAS_CXX.rst
share/cmake/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
share/cmake/Help/prop_tgt/IMPORTED.rst
share/cmake/Help/prop_tgt/IMPORTED_CONFIGURATIONS.rst
share/cmake/Help/prop_tgt/IMPORTED_GLOBAL.rst
share/cmake/Help/prop_tgt/IMPORTED_IMPLIB.rst
share/cmake/Help/prop_tgt/IMPORTED_IMPLIB_CONFIG.rst
share/cmake/Help/prop_tgt/IMPORTED_LIBNAME.rst
@ -943,7 +935,6 @@ share/cmake/Help/release/
share/cmake/Help/release/3.0.rst
share/cmake/Help/release/3.1.rst
share/cmake/Help/release/3.10.rst
share/cmake/Help/release/3.11.rst
share/cmake/Help/release/3.2.rst
share/cmake/Help/release/3.3.rst
share/cmake/Help/release/3.4.rst
@ -991,7 +982,6 @@ share/cmake/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
share/cmake/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
share/cmake/Help/variable/CMAKE_ARGC.rst
share/cmake/Help/variable/CMAKE_ARGV0.rst
share/cmake/Help/variable/CMAKE_AUTOGEN_PARALLEL.rst
share/cmake/Help/variable/CMAKE_AUTOMOC.rst
share/cmake/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst
share/cmake/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
@ -1016,7 +1006,6 @@ share/cmake/Help/variable/CMAKE_CACHE_MINOR_VERSION.rst
share/cmake/Help/variable/CMAKE_CACHE_PATCH_VERSION.rst
share/cmake/Help/variable/CMAKE_CFG_INTDIR.rst
share/cmake/Help/variable/CMAKE_CL_64.rst
share/cmake/Help/variable/CMAKE_CODEBLOCKS_COMPILER_ID.rst
share/cmake/Help/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.rst
share/cmake/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
share/cmake/Help/variable/CMAKE_COLOR_MAKEFILE.rst
@ -1034,7 +1023,6 @@ share/cmake/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
share/cmake/Help/variable/CMAKE_CTEST_COMMAND.rst
share/cmake/Help/variable/CMAKE_CUDA_EXTENSIONS.rst
share/cmake/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst
share/cmake/Help/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst
share/cmake/Help/variable/CMAKE_CUDA_STANDARD.rst
share/cmake/Help/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst
share/cmake/Help/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.rst
@ -1099,7 +1087,6 @@ share/cmake/Help/variable/CMAKE_Fortran_MODDIR_FLAG.rst
share/cmake/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst
share/cmake/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst
share/cmake/Help/variable/CMAKE_GENERATOR.rst
share/cmake/Help/variable/CMAKE_GENERATOR_INSTANCE.rst
share/cmake/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
share/cmake/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
share/cmake/Help/variable/CMAKE_GNUtoMS.rst
@ -1121,7 +1108,6 @@ share/cmake/Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst
share/cmake/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
share/cmake/Help/variable/CMAKE_INCLUDE_PATH.rst
share/cmake/Help/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst
share/cmake/Help/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
share/cmake/Help/variable/CMAKE_INSTALL_MESSAGE.rst
share/cmake/Help/variable/CMAKE_INSTALL_NAME_DIR.rst
share/cmake/Help/variable/CMAKE_INSTALL_PREFIX.rst
@ -1132,7 +1118,6 @@ share/cmake/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
share/cmake/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst
share/cmake/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
share/cmake/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
share/cmake/Help/variable/CMAKE_JOB_POOLS.rst
share/cmake/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
share/cmake/Help/variable/CMAKE_JOB_POOL_LINK.rst
share/cmake/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst
@ -1162,8 +1147,6 @@ share/cmake/Help/variable/CMAKE_LANG_CREATE_SHARED_LIBRARY.rst
share/cmake/Help/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst
share/cmake/Help/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_CONFIG.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_INIT.rst
@ -1173,7 +1156,6 @@ share/cmake/Help/variable/CMAKE_LANG_FLAGS_RELEASE.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst
share/cmake/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst
share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.rst
share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst
share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst
share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst
@ -1228,8 +1210,6 @@ share/cmake/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG_INIT.rst
share/cmake/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
share/cmake/Help/variable/CMAKE_MODULE_PATH.rst
share/cmake/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
share/cmake/Help/variable/CMAKE_NETRC.rst
share/cmake/Help/variable/CMAKE_NETRC_FILE.rst
share/cmake/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
share/cmake/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
share/cmake/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
@ -1323,13 +1303,11 @@ share/cmake/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
share/cmake/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
share/cmake/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
share/cmake/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
share/cmake/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst
share/cmake/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
share/cmake/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
share/cmake/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
share/cmake/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
share/cmake/Help/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst
share/cmake/Help/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
share/cmake/Help/variable/CPACK_INSTALL_SCRIPT.rst
share/cmake/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst
share/cmake/Help/variable/CPACK_SET_DESTDIR.rst
@ -1391,7 +1369,6 @@ share/cmake/Help/variable/CTEST_P4_CLIENT.rst
share/cmake/Help/variable/CTEST_P4_COMMAND.rst
share/cmake/Help/variable/CTEST_P4_OPTIONS.rst
share/cmake/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst
share/cmake/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst
share/cmake/Help/variable/CTEST_SCP_COMMAND.rst
share/cmake/Help/variable/CTEST_SITE.rst
share/cmake/Help/variable/CTEST_SOURCE_DIRECTORY.rst
@ -1451,10 +1428,10 @@ share/cmake/Modules/AddFileDependencies.cmake
share/cmake/Modules/AndroidTestUtilities/
share/cmake/Modules/AndroidTestUtilities.cmake
share/cmake/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
share/cmake/Modules/AutogenInfo.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/BasicConfigVersion-SameMinorVersion.cmake.in
share/cmake/Modules/BundleUtilities.cmake
share/cmake/Modules/CMake.cmake
share/cmake/Modules/CMakeASM-ATTInformation.cmake
@ -1519,9 +1496,9 @@ share/cmake/Modules/CMakeFindDependencyMacro.cmake
share/cmake/Modules/CMakeFindEclipseCDT4.cmake
share/cmake/Modules/CMakeFindFrameworks.cmake
share/cmake/Modules/CMakeFindJavaCommon.cmake
share/cmake/Modules/CMakeFindKDevelop3.cmake
share/cmake/Modules/CMakeFindKate.cmake
share/cmake/Modules/CMakeFindPackageMode.cmake
share/cmake/Modules/CMakeFindSublimeText2.cmake
share/cmake/Modules/CMakeFindWMake.cmake
share/cmake/Modules/CMakeFindXCode.cmake
share/cmake/Modules/CMakeForceCompiler.cmake
@ -1533,7 +1510,6 @@ share/cmake/Modules/CMakeGenericSystem.cmake
share/cmake/Modules/CMakeGraphVizOptions.cmake
share/cmake/Modules/CMakeIOSInstallCombined.cmake
share/cmake/Modules/CMakeImportBuildSettings.cmake
share/cmake/Modules/CMakeInitializeConfigs.cmake
share/cmake/Modules/CMakeJOMFindMake.cmake
share/cmake/Modules/CMakeJavaCompiler.cmake.in
share/cmake/Modules/CMakeJavaInformation.cmake
@ -1746,7 +1722,6 @@ share/cmake/Modules/Compiler/MIPSpro-C.cmake
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-ASM.cmake
share/cmake/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
share/cmake/Modules/Compiler/MSVC-CXX.cmake
share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake
@ -1822,9 +1797,6 @@ share/cmake/Modules/ExternalProject-verify.cmake.in
share/cmake/Modules/ExternalProject.cmake
share/cmake/Modules/FLTKCompatibility.cmake
share/cmake/Modules/FeatureSummary.cmake
share/cmake/Modules/FetchContent/
share/cmake/Modules/FetchContent.cmake
share/cmake/Modules/FetchContent/CMakeLists.cmake.in
share/cmake/Modules/FindALSA.cmake
share/cmake/Modules/FindASPELL.cmake
share/cmake/Modules/FindAVIFile.cmake
@ -2269,7 +2241,6 @@ share/cmake/Modules/Platform/Windows-Determine-CXX.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-Flang-Fortran.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
@ -2549,6 +2520,7 @@ share/doc/cmake/html/_sources/generator/CodeBlocks.txt
share/doc/cmake/html/_sources/generator/CodeLite.txt
share/doc/cmake/html/_sources/generator/Eclipse CDT4.txt
share/doc/cmake/html/_sources/generator/Green Hills MULTI.txt
share/doc/cmake/html/_sources/generator/KDevelop3.txt
share/doc/cmake/html/_sources/generator/Kate.txt
share/doc/cmake/html/_sources/generator/MSYS Makefiles.txt
share/doc/cmake/html/_sources/generator/MinGW Makefiles.txt
@ -2660,7 +2632,6 @@ share/doc/cmake/html/_sources/module/Documentation.txt
share/doc/cmake/html/_sources/module/ExternalData.txt
share/doc/cmake/html/_sources/module/ExternalProject.txt
share/doc/cmake/html/_sources/module/FeatureSummary.txt
share/doc/cmake/html/_sources/module/FetchContent.txt
share/doc/cmake/html/_sources/module/FindALSA.txt
share/doc/cmake/html/_sources/module/FindASPELL.txt
share/doc/cmake/html/_sources/module/FindAVIFile.txt
@ -2709,7 +2680,6 @@ share/doc/cmake/html/_sources/module/FindHg.txt
share/doc/cmake/html/_sources/module/FindICU.txt
share/doc/cmake/html/_sources/module/FindITK.txt
share/doc/cmake/html/_sources/module/FindIce.txt
share/doc/cmake/html/_sources/module/FindIconv.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
@ -2911,7 +2881,6 @@ share/doc/cmake/html/_sources/policy/CMP0068.txt
share/doc/cmake/html/_sources/policy/CMP0069.txt
share/doc/cmake/html/_sources/policy/CMP0070.txt
share/doc/cmake/html/_sources/policy/CMP0071.txt
share/doc/cmake/html/_sources/policy/CMP0072.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
@ -3002,12 +2971,10 @@ share/doc/cmake/html/_sources/prop_sf/AUTOUIC_OPTIONS.txt
share/doc/cmake/html/_sources/prop_sf/COMPILE_DEFINITIONS.txt
share/doc/cmake/html/_sources/prop_sf/COMPILE_DEFINITIONS_CONFIG.txt
share/doc/cmake/html/_sources/prop_sf/COMPILE_FLAGS.txt
share/doc/cmake/html/_sources/prop_sf/COMPILE_OPTIONS.txt
share/doc/cmake/html/_sources/prop_sf/EXTERNAL_OBJECT.txt
share/doc/cmake/html/_sources/prop_sf/Fortran_FORMAT.txt
share/doc/cmake/html/_sources/prop_sf/GENERATED.txt
share/doc/cmake/html/_sources/prop_sf/HEADER_FILE_ONLY.txt
share/doc/cmake/html/_sources/prop_sf/INCLUDE_DIRECTORIES.txt
share/doc/cmake/html/_sources/prop_sf/KEEP_EXTENSION.txt
share/doc/cmake/html/_sources/prop_sf/LABELS.txt
share/doc/cmake/html/_sources/prop_sf/LANGUAGE.txt
@ -3026,8 +2993,6 @@ 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_INCLUDE_IN_VSIX.txt
share/doc/cmake/html/_sources/prop_sf/VS_RESOURCE_GENERATOR.txt
share/doc/cmake/html/_sources/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.txt
share/doc/cmake/html/_sources/prop_sf/VS_SHADER_ENABLE_DEBUG.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
@ -3087,7 +3052,6 @@ share/doc/cmake/html/_sources/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.txt
share/doc/cmake/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME.txt
share/doc/cmake/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.txt
share/doc/cmake/html/_sources/prop_tgt/AUTOGEN_BUILD_DIR.txt
share/doc/cmake/html/_sources/prop_tgt/AUTOGEN_PARALLEL.txt
share/doc/cmake/html/_sources/prop_tgt/AUTOGEN_TARGET_DEPENDS.txt
share/doc/cmake/html/_sources/prop_tgt/AUTOMOC.txt
share/doc/cmake/html/_sources/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.txt
@ -3153,7 +3117,6 @@ share/doc/cmake/html/_sources/prop_tgt/HAS_CXX.txt
share/doc/cmake/html/_sources/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.txt
share/doc/cmake/html/_sources/prop_tgt/IMPORTED.txt
share/doc/cmake/html/_sources/prop_tgt/IMPORTED_CONFIGURATIONS.txt
share/doc/cmake/html/_sources/prop_tgt/IMPORTED_GLOBAL.txt
share/doc/cmake/html/_sources/prop_tgt/IMPORTED_IMPLIB.txt
share/doc/cmake/html/_sources/prop_tgt/IMPORTED_IMPLIB_CONFIG.txt
share/doc/cmake/html/_sources/prop_tgt/IMPORTED_LIBNAME.txt
@ -3298,7 +3261,6 @@ share/doc/cmake/html/_sources/release/
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.10.txt
share/doc/cmake/html/_sources/release/3.11.txt
share/doc/cmake/html/_sources/release/3.2.txt
share/doc/cmake/html/_sources/release/3.3.txt
share/doc/cmake/html/_sources/release/3.4.txt
@ -3345,7 +3307,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.txt
share/doc/cmake/html/_sources/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.txt
share/doc/cmake/html/_sources/variable/CMAKE_ARGC.txt
share/doc/cmake/html/_sources/variable/CMAKE_ARGV0.txt
share/doc/cmake/html/_sources/variable/CMAKE_AUTOGEN_PARALLEL.txt
share/doc/cmake/html/_sources/variable/CMAKE_AUTOMOC.txt
share/doc/cmake/html/_sources/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.txt
share/doc/cmake/html/_sources/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.txt
@ -3370,7 +3331,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_CACHE_MINOR_VERSION.txt
share/doc/cmake/html/_sources/variable/CMAKE_CACHE_PATCH_VERSION.txt
share/doc/cmake/html/_sources/variable/CMAKE_CFG_INTDIR.txt
share/doc/cmake/html/_sources/variable/CMAKE_CL_64.txt
share/doc/cmake/html/_sources/variable/CMAKE_CODEBLOCKS_COMPILER_ID.txt
share/doc/cmake/html/_sources/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.txt
share/doc/cmake/html/_sources/variable/CMAKE_CODELITE_USE_TARGETS.txt
share/doc/cmake/html/_sources/variable/CMAKE_COLOR_MAKEFILE.txt
@ -3388,7 +3348,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_CROSSCOMPILING_EMULATOR.txt
share/doc/cmake/html/_sources/variable/CMAKE_CTEST_COMMAND.txt
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_EXTENSIONS.txt
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_HOST_COMPILER.txt
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.txt
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_STANDARD.txt
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_STANDARD_REQUIRED.txt
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.txt
@ -3452,7 +3411,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_Fortran_MODDIR_FLAG.txt
share/doc/cmake/html/_sources/variable/CMAKE_Fortran_MODOUT_FLAG.txt
share/doc/cmake/html/_sources/variable/CMAKE_Fortran_MODULE_DIRECTORY.txt
share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR.txt
share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR_INSTANCE.txt
share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR_PLATFORM.txt
share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR_TOOLSET.txt
share/doc/cmake/html/_sources/variable/CMAKE_GNUtoMS.txt
@ -3474,7 +3432,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.txt
share/doc/cmake/html/_sources/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.txt
share/doc/cmake/html/_sources/variable/CMAKE_INCLUDE_PATH.txt
share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.txt
share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.txt
share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_MESSAGE.txt
share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_NAME_DIR.txt
share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_PREFIX.txt
@ -3485,7 +3442,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_INTERNAL_PLATFORM_ABI.txt
share/doc/cmake/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.txt
share/doc/cmake/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.txt
share/doc/cmake/html/_sources/variable/CMAKE_IOS_INSTALL_COMBINED.txt
share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOLS.txt
share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOL_COMPILE.txt
share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOL_LINK.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.txt
@ -3515,8 +3471,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_LANG_CREATE_SHARED_LIBRARY.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_CREATE_SHARED_MODULE.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_CONFIG.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_DEBUG.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_INIT.txt
@ -3526,7 +3480,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_RELEASE.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.txt
share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.txt
@ -3581,8 +3534,6 @@ share/doc/cmake/html/_sources/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG_INIT.txt
share/doc/cmake/html/_sources/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.txt
share/doc/cmake/html/_sources/variable/CMAKE_MODULE_PATH.txt
share/doc/cmake/html/_sources/variable/CMAKE_MSVCIDE_RUN_PATH.txt
share/doc/cmake/html/_sources/variable/CMAKE_NETRC.txt
share/doc/cmake/html/_sources/variable/CMAKE_NETRC_FILE.txt
share/doc/cmake/html/_sources/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.txt
share/doc/cmake/html/_sources/variable/CMAKE_NOT_USING_CONFIG_FLAGS.txt
share/doc/cmake/html/_sources/variable/CMAKE_NO_BUILTIN_CHRPATH.txt
@ -3675,13 +3626,11 @@ share/doc/cmake/html/_sources/variable/CMAKE_WIN32_EXECUTABLE.txt
share/doc/cmake/html/_sources/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.txt
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.txt
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_GENERATE_SCHEME.txt
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.txt
share/doc/cmake/html/_sources/variable/CMAKE_XCODE_PLATFORM_TOOLSET.txt
share/doc/cmake/html/_sources/variable/CPACK_ABSOLUTE_DESTINATION_FILES.txt
share/doc/cmake/html/_sources/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.txt
share/doc/cmake/html/_sources/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.txt
share/doc/cmake/html/_sources/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.txt
share/doc/cmake/html/_sources/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.txt
share/doc/cmake/html/_sources/variable/CPACK_INSTALL_SCRIPT.txt
share/doc/cmake/html/_sources/variable/CPACK_PACKAGING_INSTALL_PREFIX.txt
share/doc/cmake/html/_sources/variable/CPACK_SET_DESTDIR.txt
@ -3742,7 +3691,6 @@ share/doc/cmake/html/_sources/variable/CTEST_P4_CLIENT.txt
share/doc/cmake/html/_sources/variable/CTEST_P4_COMMAND.txt
share/doc/cmake/html/_sources/variable/CTEST_P4_OPTIONS.txt
share/doc/cmake/html/_sources/variable/CTEST_P4_UPDATE_OPTIONS.txt
share/doc/cmake/html/_sources/variable/CTEST_RUN_CURRENT_SCRIPT.txt
share/doc/cmake/html/_sources/variable/CTEST_SCP_COMMAND.txt
share/doc/cmake/html/_sources/variable/CTEST_SITE.txt
share/doc/cmake/html/_sources/variable/CTEST_SOURCE_DIRECTORY.txt
@ -3972,6 +3920,7 @@ share/doc/cmake/html/generator/CodeBlocks.html
share/doc/cmake/html/generator/CodeLite.html
share/doc/cmake/html/generator/Eclipse CDT4.html
share/doc/cmake/html/generator/Green Hills MULTI.html
share/doc/cmake/html/generator/KDevelop3.html
share/doc/cmake/html/generator/Kate.html
share/doc/cmake/html/generator/MSYS Makefiles.html
share/doc/cmake/html/generator/MinGW Makefiles.html
@ -4084,7 +4033,6 @@ share/doc/cmake/html/module/Documentation.html
share/doc/cmake/html/module/ExternalData.html
share/doc/cmake/html/module/ExternalProject.html
share/doc/cmake/html/module/FeatureSummary.html
share/doc/cmake/html/module/FetchContent.html
share/doc/cmake/html/module/FindALSA.html
share/doc/cmake/html/module/FindASPELL.html
share/doc/cmake/html/module/FindAVIFile.html
@ -4133,7 +4081,6 @@ share/doc/cmake/html/module/FindHg.html
share/doc/cmake/html/module/FindICU.html
share/doc/cmake/html/module/FindITK.html
share/doc/cmake/html/module/FindIce.html
share/doc/cmake/html/module/FindIconv.html
share/doc/cmake/html/module/FindIcotool.html
share/doc/cmake/html/module/FindImageMagick.html
share/doc/cmake/html/module/FindIntl.html
@ -4336,7 +4283,6 @@ share/doc/cmake/html/policy/CMP0068.html
share/doc/cmake/html/policy/CMP0069.html
share/doc/cmake/html/policy/CMP0070.html
share/doc/cmake/html/policy/CMP0071.html
share/doc/cmake/html/policy/CMP0072.html
share/doc/cmake/html/prop_cache/
share/doc/cmake/html/prop_cache/ADVANCED.html
share/doc/cmake/html/prop_cache/HELPSTRING.html
@ -4427,12 +4373,10 @@ share/doc/cmake/html/prop_sf/AUTOUIC_OPTIONS.html
share/doc/cmake/html/prop_sf/COMPILE_DEFINITIONS.html
share/doc/cmake/html/prop_sf/COMPILE_DEFINITIONS_CONFIG.html
share/doc/cmake/html/prop_sf/COMPILE_FLAGS.html
share/doc/cmake/html/prop_sf/COMPILE_OPTIONS.html
share/doc/cmake/html/prop_sf/EXTERNAL_OBJECT.html
share/doc/cmake/html/prop_sf/Fortran_FORMAT.html
share/doc/cmake/html/prop_sf/GENERATED.html
share/doc/cmake/html/prop_sf/HEADER_FILE_ONLY.html
share/doc/cmake/html/prop_sf/INCLUDE_DIRECTORIES.html
share/doc/cmake/html/prop_sf/KEEP_EXTENSION.html
share/doc/cmake/html/prop_sf/LABELS.html
share/doc/cmake/html/prop_sf/LANGUAGE.html
@ -4451,8 +4395,6 @@ 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_INCLUDE_IN_VSIX.html
share/doc/cmake/html/prop_sf/VS_RESOURCE_GENERATOR.html
share/doc/cmake/html/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.html
share/doc/cmake/html/prop_sf/VS_SHADER_ENABLE_DEBUG.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
@ -4512,7 +4454,6 @@ share/doc/cmake/html/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.html
share/doc/cmake/html/prop_tgt/ARCHIVE_OUTPUT_NAME.html
share/doc/cmake/html/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.html
share/doc/cmake/html/prop_tgt/AUTOGEN_BUILD_DIR.html
share/doc/cmake/html/prop_tgt/AUTOGEN_PARALLEL.html
share/doc/cmake/html/prop_tgt/AUTOGEN_TARGET_DEPENDS.html
share/doc/cmake/html/prop_tgt/AUTOMOC.html
share/doc/cmake/html/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.html
@ -4578,7 +4519,6 @@ share/doc/cmake/html/prop_tgt/HAS_CXX.html
share/doc/cmake/html/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.html
share/doc/cmake/html/prop_tgt/IMPORTED.html
share/doc/cmake/html/prop_tgt/IMPORTED_CONFIGURATIONS.html
share/doc/cmake/html/prop_tgt/IMPORTED_GLOBAL.html
share/doc/cmake/html/prop_tgt/IMPORTED_IMPLIB.html
share/doc/cmake/html/prop_tgt/IMPORTED_IMPLIB_CONFIG.html
share/doc/cmake/html/prop_tgt/IMPORTED_LIBNAME.html
@ -4723,7 +4663,6 @@ share/doc/cmake/html/release/
share/doc/cmake/html/release/3.0.html
share/doc/cmake/html/release/3.1.html
share/doc/cmake/html/release/3.10.html
share/doc/cmake/html/release/3.11.html
share/doc/cmake/html/release/3.2.html
share/doc/cmake/html/release/3.3.html
share/doc/cmake/html/release/3.4.html
@ -4772,7 +4711,6 @@ share/doc/cmake/html/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.html
share/doc/cmake/html/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.html
share/doc/cmake/html/variable/CMAKE_ARGC.html
share/doc/cmake/html/variable/CMAKE_ARGV0.html
share/doc/cmake/html/variable/CMAKE_AUTOGEN_PARALLEL.html
share/doc/cmake/html/variable/CMAKE_AUTOMOC.html
share/doc/cmake/html/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.html
share/doc/cmake/html/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.html
@ -4797,7 +4735,6 @@ share/doc/cmake/html/variable/CMAKE_CACHE_MINOR_VERSION.html
share/doc/cmake/html/variable/CMAKE_CACHE_PATCH_VERSION.html
share/doc/cmake/html/variable/CMAKE_CFG_INTDIR.html
share/doc/cmake/html/variable/CMAKE_CL_64.html
share/doc/cmake/html/variable/CMAKE_CODEBLOCKS_COMPILER_ID.html
share/doc/cmake/html/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.html
share/doc/cmake/html/variable/CMAKE_CODELITE_USE_TARGETS.html
share/doc/cmake/html/variable/CMAKE_COLOR_MAKEFILE.html
@ -4815,7 +4752,6 @@ share/doc/cmake/html/variable/CMAKE_CROSSCOMPILING_EMULATOR.html
share/doc/cmake/html/variable/CMAKE_CTEST_COMMAND.html
share/doc/cmake/html/variable/CMAKE_CUDA_EXTENSIONS.html
share/doc/cmake/html/variable/CMAKE_CUDA_HOST_COMPILER.html
share/doc/cmake/html/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.html
share/doc/cmake/html/variable/CMAKE_CUDA_STANDARD.html
share/doc/cmake/html/variable/CMAKE_CUDA_STANDARD_REQUIRED.html
share/doc/cmake/html/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.html
@ -4879,7 +4815,6 @@ share/doc/cmake/html/variable/CMAKE_Fortran_MODDIR_FLAG.html
share/doc/cmake/html/variable/CMAKE_Fortran_MODOUT_FLAG.html
share/doc/cmake/html/variable/CMAKE_Fortran_MODULE_DIRECTORY.html
share/doc/cmake/html/variable/CMAKE_GENERATOR.html
share/doc/cmake/html/variable/CMAKE_GENERATOR_INSTANCE.html
share/doc/cmake/html/variable/CMAKE_GENERATOR_PLATFORM.html
share/doc/cmake/html/variable/CMAKE_GENERATOR_TOOLSET.html
share/doc/cmake/html/variable/CMAKE_GNUtoMS.html
@ -4901,7 +4836,6 @@ share/doc/cmake/html/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.html
share/doc/cmake/html/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.html
share/doc/cmake/html/variable/CMAKE_INCLUDE_PATH.html
share/doc/cmake/html/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.html
share/doc/cmake/html/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.html
share/doc/cmake/html/variable/CMAKE_INSTALL_MESSAGE.html
share/doc/cmake/html/variable/CMAKE_INSTALL_NAME_DIR.html
share/doc/cmake/html/variable/CMAKE_INSTALL_PREFIX.html
@ -4912,7 +4846,6 @@ share/doc/cmake/html/variable/CMAKE_INTERNAL_PLATFORM_ABI.html
share/doc/cmake/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.html
share/doc/cmake/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.html
share/doc/cmake/html/variable/CMAKE_IOS_INSTALL_COMBINED.html
share/doc/cmake/html/variable/CMAKE_JOB_POOLS.html
share/doc/cmake/html/variable/CMAKE_JOB_POOL_COMPILE.html
share/doc/cmake/html/variable/CMAKE_JOB_POOL_LINK.html
share/doc/cmake/html/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.html
@ -4942,8 +4875,6 @@ share/doc/cmake/html/variable/CMAKE_LANG_CREATE_SHARED_LIBRARY.html
share/doc/cmake/html/variable/CMAKE_LANG_CREATE_SHARED_MODULE.html
share/doc/cmake/html/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_CONFIG.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_DEBUG.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_INIT.html
@ -4953,7 +4884,6 @@ share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_RELEASE.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.html
share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.html
share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.html
share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.html
share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.html
share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.html
@ -5008,8 +4938,6 @@ share/doc/cmake/html/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG_INIT.html
share/doc/cmake/html/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.html
share/doc/cmake/html/variable/CMAKE_MODULE_PATH.html
share/doc/cmake/html/variable/CMAKE_MSVCIDE_RUN_PATH.html
share/doc/cmake/html/variable/CMAKE_NETRC.html
share/doc/cmake/html/variable/CMAKE_NETRC_FILE.html
share/doc/cmake/html/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.html
share/doc/cmake/html/variable/CMAKE_NOT_USING_CONFIG_FLAGS.html
share/doc/cmake/html/variable/CMAKE_NO_BUILTIN_CHRPATH.html
@ -5102,13 +5030,11 @@ share/doc/cmake/html/variable/CMAKE_WIN32_EXECUTABLE.html
share/doc/cmake/html/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.html
share/doc/cmake/html/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.html
share/doc/cmake/html/variable/CMAKE_XCODE_GENERATE_SCHEME.html
share/doc/cmake/html/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.html
share/doc/cmake/html/variable/CMAKE_XCODE_PLATFORM_TOOLSET.html
share/doc/cmake/html/variable/CPACK_ABSOLUTE_DESTINATION_FILES.html
share/doc/cmake/html/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.html
share/doc/cmake/html/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.html
share/doc/cmake/html/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.html
share/doc/cmake/html/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.html
share/doc/cmake/html/variable/CPACK_INSTALL_SCRIPT.html
share/doc/cmake/html/variable/CPACK_PACKAGING_INSTALL_PREFIX.html
share/doc/cmake/html/variable/CPACK_SET_DESTDIR.html
@ -5169,7 +5095,6 @@ share/doc/cmake/html/variable/CTEST_P4_CLIENT.html
share/doc/cmake/html/variable/CTEST_P4_COMMAND.html
share/doc/cmake/html/variable/CTEST_P4_OPTIONS.html
share/doc/cmake/html/variable/CTEST_P4_UPDATE_OPTIONS.html
share/doc/cmake/html/variable/CTEST_RUN_CURRENT_SCRIPT.html
share/doc/cmake/html/variable/CTEST_SCP_COMMAND.html
share/doc/cmake/html/variable/CTEST_SITE.html
share/doc/cmake/html/variable/CTEST_SOURCE_DIRECTORY.html