Attachment #163248 for bug #204629




commit ffa6f057b4ae07c9dc7b9e1d12ecc0a2e19333a1
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date:   Tue Sep 15 16:31:12 2015 +0200

    Avoid using C11 to build CMake if _Thread_local support is broken
    
    Support for C11's _Thread_local was introduced in GCC in the 4.9 series,
    even though we make the C11 compiler flags available in CMake with GCC
    >= 4.6.
    
    FreeBSD's runetype.h uses _Thread_local, which causes CMake's own build
    to fail when using GCC < 4.9 and -std=gnu11:
    
      /usr/include/runetype.h:92:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'const'
       extern _Thread_local const _RuneLocale *_ThreadRuneLocale;
    
    Add a test for _Thread_local support and only build CMake itself with
    C11 support if it works.
    
    Bug: http://www.cmake.org/Bug/view.php?id=15741

--- CMakeLists.txt
+++ CMakeLists.txt
@@ -38,7 +38,12 @@ endif()
 
 # Use most-recent available language dialects with GNU and Clang
 if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
-  set(CMAKE_C_STANDARD 11)
+  include(${CMake_SOURCE_DIR}/Source/Checks/cm_c11_thread_local.cmake)
+  if(NOT CMake_C11_THREAD_LOCAL_BROKEN)
+    set(CMAKE_C_STANDARD 11)
+  else()
+    set(CMAKE_C_STANDARD 99)
+  endif()
 endif()
 if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
   include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx14_cstdio.cmake)
new file mode 100644
index 0000000..ab780f2
--- /dev/null
+++ Source/Checks/cm_c11_thread_local.c
@@ -0,0 +1,2 @@
+_Thread_local int i = 42;
+int main(void) { return 0; }
new file mode 100644
index 0000000..6b8d10b
--- /dev/null
+++ Source/Checks/cm_c11_thread_local.cmake
@@ -0,0 +1,33 @@
+set(CMake_C11_THREAD_LOCAL_BROKEN 0)
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_C11_STANDARD_COMPILE_OPTION)
+  if(NOT DEFINED CMake_C11_THREAD_LOCAL_WORKS)
+    message(STATUS "Checking if compiler supports C11 _Thread_local")
+    try_compile(CMake_C11_THREAD_LOCAL_WORKS
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${CMAKE_CURRENT_LIST_DIR}/cm_c11_thread_local.c
+      CMAKE_FLAGS -DCMAKE_C_STANDARD=11
+      OUTPUT_VARIABLE OUTPUT
+      )
+    if(CMake_C11_THREAD_LOCAL_WORKS AND "${OUTPUT}" MATCHES "error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int'")
+      set_property(CACHE CMake_C11_THREAD_LOCAL_WORKS PROPERTY VALUE 0)
+    endif()
+    if(CMake_C11_THREAD_LOCAL_WORKS)
+      message(STATUS "Checking if compiler supports C11 _Thread_local - yes")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+        "Determining if compiler supports C11 _Thread_local passed with the following output:\n"
+        "${OUTPUT}\n"
+        "\n"
+        )
+    else()
+      message(STATUS "Checking if compiler supports C11 _Thread_local - no")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Determining if compiler supports C11 _Thread_local failed with the following output:\n"
+        "${OUTPUT}\n"
+        "\n"
+        )
+    endif()
+  endif()
+  if(NOT CMake_C11_THREAD_LOCAL_WORKS)
+    set(CMake_C11_THREAD_LOCAL_BROKEN 1)
+  endif()
+endif()

Lines 4-11 Link Here

(-)devel/cmake/files/patch-Modules_FindwxWidgets.cmake (-2 / +2 lines)
4	#-----------------------------------------------------------------	4	#-----------------------------------------------------------------
5	# Support cross-compiling, only search in the target platform.	5	# Support cross-compiling, only search in the target platform.
6	find_program(wxWidgets_CONFIG_EXECUTABLE	6	find_program(wxWidgets_CONFIG_EXECUTABLE
7	- NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8	7	- NAMES wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8
8	+ NAMES $ENV{WX_CONFIG} wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8	8	+ NAMES $ENV{WX_CONFIG} wx-config-3.1 wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
9	DOC "Location of wxWidgets library configuration provider binary (wx-config)."	9	DOC "Location of wxWidgets library configuration provider binary (wx-config)."
10	ONLY_CMAKE_FIND_ROOT_PATH	10	ONLY_CMAKE_FIND_ROOT_PATH
11	)	11	)

Lines 2-11 Link Here

(-)devel/cmake/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cmake	4	PORTNAME= cmake
5	PORTVERSION= 3.3.1	5	PORTVERSION= 3.4.0
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= http://www.cmake.org/files/v3.3/	8	MASTER_SITES= http://www.cmake.org/files/v3.4/
9		9
10	MAINTAINER= kde@FreeBSD.org	10	MAINTAINER= kde@FreeBSD.org
11	COMMENT?= Cross-platform Makefile generator	11	COMMENT?= Cross-platform Makefile generator

Lines 1-2 Link Here

(-)devel/cmake/distinfo (-2 / +2 lines)
1	SHA256 (cmake-3.3.1.tar.gz) = cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6	1	SHA256 (cmake-3.4.0.tar.gz) = a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea
2	SIZE (cmake-3.3.1.tar.gz) = 6577869	2	SIZE (cmake-3.4.0.tar.gz) = 6719859

Lines 1-9 Link Here

(-)devel/cmake-gui/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	PORTVERSION= 3.3.1	4	PORTVERSION= 3.4.0
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= http://www.cmake.org/files/v3.3/	6	MASTER_SITES= http://www.cmake.org/files/v3.4/
7	PKGNAMESUFFIX= -gui	7	PKGNAMESUFFIX= -gui
8		8
9	MAINTAINER= kde@FreeBSD.org	9	MAINTAINER= kde@FreeBSD.org




%%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp
%%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in
%%DATADIR%%/Modules/CMakeCXXInformation.cmake
%%DATADIR%%/Modules/CMakeClDeps.cmake
%%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
%%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
%%DATADIR%%/Modules/CMakeCompilerABI.h

%%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
%%DATADIR%%/Modules/CMakeDetermineCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
%%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake
%%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineSwiftCompiler.cmake
%%DATADIR%%/Modules/CMakeDetermineSystem.cmake
%%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake
%%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake

%%DATADIR%%/Modules/CMakePushCheckState.cmake
%%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
%%DATADIR%%/Modules/CMakeRCInformation.cmake
%%DATADIR%%/Modules/CMakeSwiftCompiler.cmake.in
%%DATADIR%%/Modules/CMakeSwiftInformation.cmake
%%DATADIR%%/Modules/CMakeSystem.cmake.in
%%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
%%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake

%%DATADIR%%/Modules/CMakeTestGNU.c
%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
%%DATADIR%%/Modules/CMakeTestWatcomVersion.c
%%DATADIR%%/Modules/CMakeUnixFindMake.cmake
%%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake

%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/Clang-C.cmake

%%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
%%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
%%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
%%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
%%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake

%%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in
%%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in
%%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in
%%DATADIR%%/Modules/CompilerId/main.swift.in
%%DATADIR%%/Modules/Dart.cmake
%%DATADIR%%/Modules/DartConfiguration.tcl.in
%%DATADIR%%/Modules/DeployQt4.cmake

%%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
%%DATADIR%%/Modules/Platform/AIX-XL.cmake
%%DATADIR%%/Modules/Platform/AIX.cmake
%%DATADIR%%/Modules/Platform/ARTOS-GNU-C.cmake
%%DATADIR%%/Modules/Platform/ARTOS.cmake
%%DATADIR%%/Modules/Platform/Android.cmake
%%DATADIR%%/Modules/Platform/BSDOS.cmake
%%DATADIR%%/Modules/Platform/BeOS.cmake

%%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake
%%DATADIR%%/Modules/Platform/Darwin.cmake
%%DATADIR%%/Modules/Platform/DragonFly.cmake
%%DATADIR%%/Modules/Platform/Euros.cmake
%%DATADIR%%/Modules/Platform/FreeBSD.cmake
%%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake
%%DATADIR%%/Modules/Platform/GHS-MULTI.cmake

%%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake
%%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake
%%DATADIR%%/Modules/Platform/Generic.cmake
%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
%%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake
%%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake

%%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake
%%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake
%%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake
%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
%%DATADIR%%/Modules/Platform/HP-UX-HP.cmake
%%DATADIR%%/Modules/Platform/HP-UX.cmake
%%DATADIR%%/Modules/Platform/Haiku.cmake

%%DATADIR%%/Modules/Platform/IRIX.cmake
%%DATADIR%%/Modules/Platform/IRIX64.cmake
%%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake
%%DATADIR%%/Modules/Platform/Linux-CCur-Fortran.cmake
%%DATADIR%%/Modules/Platform/Linux-CXX.cmake
%%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake
%%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake

%%DATADIR%%/Modules/UsePkgConfig.cmake
%%DATADIR%%/Modules/UseQt4.cmake
%%DATADIR%%/Modules/UseSWIG.cmake
%%DATADIR%%/Modules/UseVTK40.cmake
%%DATADIR%%/Modules/UseVTKBuildSettings40.cmake
%%DATADIR%%/Modules/UseVTKConfig40.cmake
%%DATADIR%%/Modules/Use_wxWindows.cmake
%%DATADIR%%/Modules/UsewxWidgets.cmake
%%DATADIR%%/Modules/VTKCompatibility.cmake

%%DATADIR%%/Templates/Windows/ApplicationIcon.png
%%DATADIR%%/Templates/Windows/Logo.png
%%DATADIR%%/Templates/Windows/SmallLogo.png
%%DATADIR%%/Templates/Windows/SmallLogo44x44.png
%%DATADIR%%/Templates/Windows/SplashScreen.png
%%DATADIR%%/Templates/Windows/StoreLogo.png
%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx

Return to bug 204629

Lines 1-82 Link Here

(-)devel/cmake/files/patch-git_ffa6f057 (-82 lines)
1	commit ffa6f057b4ae07c9dc7b9e1d12ecc0a2e19333a1
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Tue Sep 15 16:31:12 2015 +0200
4
5	Avoid using C11 to build CMake if _Thread_local support is broken
6
7	Support for C11's _Thread_local was introduced in GCC in the 4.9 series,
8	even though we make the C11 compiler flags available in CMake with GCC
9	>= 4.6.
10
11	FreeBSD's runetype.h uses _Thread_local, which causes CMake's own build
12	to fail when using GCC < 4.9 and -std=gnu11:
13
14	/usr/include/runetype.h:92:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'const'
15	extern _Thread_local const _RuneLocale *_ThreadRuneLocale;
16
17	Add a test for _Thread_local support and only build CMake itself with
18	C11 support if it works.
19
20	Bug: http://www.cmake.org/Bug/view.php?id=15741
21
22	--- CMakeLists.txt
23	+++ CMakeLists.txt
24	@@ -38,7 +38,12 @@ endif()
25
26	# Use most-recent available language dialects with GNU and Clang
27	if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
28	- set(CMAKE_C_STANDARD 11)
29	+ include(${CMake_SOURCE_DIR}/Source/Checks/cm_c11_thread_local.cmake)
30	+ if(NOT CMake_C11_THREAD_LOCAL_BROKEN)
31	+ set(CMAKE_C_STANDARD 11)
32	+ else()
33	+ set(CMAKE_C_STANDARD 99)
34	+ endif()
35	endif()
36	if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
37	include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx14_cstdio.cmake)
38	new file mode 100644
39	index 0000000..ab780f2
40	--- /dev/null
41	+++ Source/Checks/cm_c11_thread_local.c
42	@@ -0,0 +1,2 @@
43	+_Thread_local int i = 42;
44	+int main(void) { return 0; }
45	new file mode 100644
46	index 0000000..6b8d10b
47	--- /dev/null
48	+++ Source/Checks/cm_c11_thread_local.cmake
49	@@ -0,0 +1,33 @@
50	+set(CMake_C11_THREAD_LOCAL_BROKEN 0)
51	+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_C11_STANDARD_COMPILE_OPTION)
52	+ if(NOT DEFINED CMake_C11_THREAD_LOCAL_WORKS)
53	+ message(STATUS "Checking if compiler supports C11 _Thread_local")
54	+ try_compile(CMake_C11_THREAD_LOCAL_WORKS
55	+ ${CMAKE_CURRENT_BINARY_DIR}
56	+ ${CMAKE_CURRENT_LIST_DIR}/cm_c11_thread_local.c
57	+ CMAKE_FLAGS -DCMAKE_C_STANDARD=11
58	+ OUTPUT_VARIABLE OUTPUT
59	+ )
60	+ if(CMake_C11_THREAD_LOCAL_WORKS AND "${OUTPUT}" MATCHES "error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int'")
61	+ set_property(CACHE CMake_C11_THREAD_LOCAL_WORKS PROPERTY VALUE 0)
62	+ endif()
63	+ if(CMake_C11_THREAD_LOCAL_WORKS)
64	+ message(STATUS "Checking if compiler supports C11 _Thread_local - yes")
65	+ file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
66	+ "Determining if compiler supports C11 _Thread_local passed with the following output:\n"
67	+ "${OUTPUT}\n"
68	+ "\n"
69	+ )
70	+ else()
71	+ message(STATUS "Checking if compiler supports C11 _Thread_local - no")
72	+ file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
73	+ "Determining if compiler supports C11 _Thread_local failed with the following output:\n"
74	+ "${OUTPUT}\n"
75	+ "\n"
76	+ )
77	+ endif()
78	+ endif()
79	+ if(NOT CMake_C11_THREAD_LOCAL_WORKS)
80	+ set(CMake_C11_THREAD_LOCAL_BROKEN 1)
81	+ endif()
82	+endif()

Lines 26-32 Link Here

(-)devel/cmake-modules/pkg-plist (-9 / +16 lines)
26	%%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp	26	%%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp
27	%%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in	27	%%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in
28	%%DATADIR%%/Modules/CMakeCXXInformation.cmake	28	%%DATADIR%%/Modules/CMakeCXXInformation.cmake
29	%%DATADIR%%/Modules/CMakeClDeps.cmake
30	%%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake	29	%%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
31	%%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake	30	%%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake
32	%%DATADIR%%/Modules/CMakeCompilerABI.h	31	%%DATADIR%%/Modules/CMakeCompilerABI.h
Lines 39-51 Link Here
39	%%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake	38	%%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake
40	%%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake	39	%%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
41	%%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake	40	%%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
		41	%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
42	%%DATADIR%%/Modules/CMakeDetermineCompiler.cmake	42	%%DATADIR%%/Modules/CMakeDetermineCompiler.cmake
43	%%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake	43	%%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
44	%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake
45	%%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake	44	%%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake
46	%%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake	45	%%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake
47	%%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake	46	%%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
48	%%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake	47	%%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake
		48	%%DATADIR%%/Modules/CMakeDetermineSwiftCompiler.cmake
49	%%DATADIR%%/Modules/CMakeDetermineSystem.cmake	49	%%DATADIR%%/Modules/CMakeDetermineSystem.cmake
50	%%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake	50	%%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake
51	%%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake	51	%%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake
Lines 86-91 Link Here
86	%%DATADIR%%/Modules/CMakePushCheckState.cmake	86	%%DATADIR%%/Modules/CMakePushCheckState.cmake
87	%%DATADIR%%/Modules/CMakeRCCompiler.cmake.in	87	%%DATADIR%%/Modules/CMakeRCCompiler.cmake.in
88	%%DATADIR%%/Modules/CMakeRCInformation.cmake	88	%%DATADIR%%/Modules/CMakeRCInformation.cmake
		89	%%DATADIR%%/Modules/CMakeSwiftCompiler.cmake.in
		90	%%DATADIR%%/Modules/CMakeSwiftInformation.cmake
89	%%DATADIR%%/Modules/CMakeSystem.cmake.in	91	%%DATADIR%%/Modules/CMakeSystem.cmake.in
90	%%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake	92	%%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
91	%%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake	93	%%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake
Lines 100-105 Link Here
100	%%DATADIR%%/Modules/CMakeTestGNU.c	102	%%DATADIR%%/Modules/CMakeTestGNU.c
101	%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake	103	%%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake
102	%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake	104	%%DATADIR%%/Modules/CMakeTestRCCompiler.cmake
		105	%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake
103	%%DATADIR%%/Modules/CMakeTestWatcomVersion.c	106	%%DATADIR%%/Modules/CMakeTestWatcomVersion.c
104	%%DATADIR%%/Modules/CMakeUnixFindMake.cmake	107	%%DATADIR%%/Modules/CMakeUnixFindMake.cmake
105	%%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake	108	%%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
Lines 168-179 Link Here
168	%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake	171	%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
169	%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake	172	%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
170	%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake	173	%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
		174	%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
171	%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake	175	%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake
172	%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake	176	%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
173	%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake	177	%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake
174	%%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
175	%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake	178	%%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
176	%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake	179	%%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
		180	%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake
177	%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake	181	%%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
178	%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake	182	%%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
179	%%DATADIR%%/Modules/Compiler/Clang-C.cmake	183	%%DATADIR%%/Modules/Compiler/Clang-C.cmake
Lines 226-233 Link Here
226	%%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake	230	%%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
227	%%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake	231	%%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
228	%%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake	232	%%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
		233	%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
229	%%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake	234	%%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
230	%%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
231	%%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake	235	%%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
232	%%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake	236	%%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
233	%%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake	237	%%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
Lines 285-290 Link Here
285	%%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in	289	%%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in
286	%%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in	290	%%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in
287	%%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in	291	%%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in
		292	%%DATADIR%%/Modules/CompilerId/main.swift.in
288	%%DATADIR%%/Modules/Dart.cmake	293	%%DATADIR%%/Modules/Dart.cmake
289	%%DATADIR%%/Modules/DartConfiguration.tcl.in	294	%%DATADIR%%/Modules/DartConfiguration.tcl.in
290	%%DATADIR%%/Modules/DeployQt4.cmake	295	%%DATADIR%%/Modules/DeployQt4.cmake
Lines 492-497 Link Here
492	%%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake	497	%%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
493	%%DATADIR%%/Modules/Platform/AIX-XL.cmake	498	%%DATADIR%%/Modules/Platform/AIX-XL.cmake
494	%%DATADIR%%/Modules/Platform/AIX.cmake	499	%%DATADIR%%/Modules/Platform/AIX.cmake
		500	%%DATADIR%%/Modules/Platform/ARTOS-GNU-C.cmake
		501	%%DATADIR%%/Modules/Platform/ARTOS.cmake
495	%%DATADIR%%/Modules/Platform/Android.cmake	502	%%DATADIR%%/Modules/Platform/Android.cmake
496	%%DATADIR%%/Modules/Platform/BSDOS.cmake	503	%%DATADIR%%/Modules/Platform/BSDOS.cmake
497	%%DATADIR%%/Modules/Platform/BeOS.cmake	504	%%DATADIR%%/Modules/Platform/BeOS.cmake
Lines 557-562 Link Here
557	%%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake	564	%%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake
558	%%DATADIR%%/Modules/Platform/Darwin.cmake	565	%%DATADIR%%/Modules/Platform/Darwin.cmake
559	%%DATADIR%%/Modules/Platform/DragonFly.cmake	566	%%DATADIR%%/Modules/Platform/DragonFly.cmake
		567	%%DATADIR%%/Modules/Platform/Euros.cmake
560	%%DATADIR%%/Modules/Platform/FreeBSD.cmake	568	%%DATADIR%%/Modules/Platform/FreeBSD.cmake
561	%%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake	569	%%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake
562	%%DATADIR%%/Modules/Platform/GHS-MULTI.cmake	570	%%DATADIR%%/Modules/Platform/GHS-MULTI.cmake
Lines 569-574 Link Here
569	%%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake	577	%%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake
570	%%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake	578	%%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake
571	%%DATADIR%%/Modules/Platform/Generic.cmake	579	%%DATADIR%%/Modules/Platform/Generic.cmake
		580	%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
572	%%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake	581	%%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake
573	%%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake	582	%%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake
574	%%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake	583	%%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake
Lines 577-583 Link Here
577	%%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake	586	%%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake
578	%%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake	587	%%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake
579	%%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake	588	%%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake
580	%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake
581	%%DATADIR%%/Modules/Platform/HP-UX-HP.cmake	589	%%DATADIR%%/Modules/Platform/HP-UX-HP.cmake
582	%%DATADIR%%/Modules/Platform/HP-UX.cmake	590	%%DATADIR%%/Modules/Platform/HP-UX.cmake
583	%%DATADIR%%/Modules/Platform/Haiku.cmake	591	%%DATADIR%%/Modules/Platform/Haiku.cmake
Lines 584-589 Link Here
584	%%DATADIR%%/Modules/Platform/IRIX.cmake	592	%%DATADIR%%/Modules/Platform/IRIX.cmake
585	%%DATADIR%%/Modules/Platform/IRIX64.cmake	593	%%DATADIR%%/Modules/Platform/IRIX64.cmake
586	%%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake	594	%%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake
		595	%%DATADIR%%/Modules/Platform/Linux-CCur-Fortran.cmake
587	%%DATADIR%%/Modules/Platform/Linux-CXX.cmake	596	%%DATADIR%%/Modules/Platform/Linux-CXX.cmake
588	%%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake	597	%%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake
589	%%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake	598	%%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake
Lines 709-717 Link Here
709	%%DATADIR%%/Modules/UsePkgConfig.cmake	718	%%DATADIR%%/Modules/UsePkgConfig.cmake
710	%%DATADIR%%/Modules/UseQt4.cmake	719	%%DATADIR%%/Modules/UseQt4.cmake
711	%%DATADIR%%/Modules/UseSWIG.cmake	720	%%DATADIR%%/Modules/UseSWIG.cmake
712	%%DATADIR%%/Modules/UseVTK40.cmake
713	%%DATADIR%%/Modules/UseVTKBuildSettings40.cmake
714	%%DATADIR%%/Modules/UseVTKConfig40.cmake
715	%%DATADIR%%/Modules/Use_wxWindows.cmake	721	%%DATADIR%%/Modules/Use_wxWindows.cmake
716	%%DATADIR%%/Modules/UsewxWidgets.cmake	722	%%DATADIR%%/Modules/UsewxWidgets.cmake
717	%%DATADIR%%/Modules/VTKCompatibility.cmake	723	%%DATADIR%%/Modules/VTKCompatibility.cmake
Lines 743-748 Link Here
743	%%DATADIR%%/Templates/Windows/ApplicationIcon.png	749	%%DATADIR%%/Templates/Windows/ApplicationIcon.png
744	%%DATADIR%%/Templates/Windows/Logo.png	750	%%DATADIR%%/Templates/Windows/Logo.png
745	%%DATADIR%%/Templates/Windows/SmallLogo.png	751	%%DATADIR%%/Templates/Windows/SmallLogo.png
		752	%%DATADIR%%/Templates/Windows/SmallLogo44x44.png
746	%%DATADIR%%/Templates/Windows/SplashScreen.png	753	%%DATADIR%%/Templates/Windows/SplashScreen.png
747	%%DATADIR%%/Templates/Windows/StoreLogo.png	754	%%DATADIR%%/Templates/Windows/StoreLogo.png
748	%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx	755	%%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx

Lines 22-28 Link Here

(-)devel/cmake/pkg-plist (-2 / +74 lines)
22	%%MANPAGES%%man/man7/cmake-variables.7.gz	22	%%MANPAGES%%man/man7/cmake-variables.7.gz
23	share/aclocal/cmake.m4	23	share/aclocal/cmake.m4
24	%%DATADIR%%/Help/command/FIND_XXX.txt	24	%%DATADIR%%/Help/command/FIND_XXX.txt
25	%%DATADIR%%/Help/command/FIND_XXX_MAC.txt
26	%%DATADIR%%/Help/command/FIND_XXX_ORDER.txt	25	%%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
27	%%DATADIR%%/Help/command/FIND_XXX_ROOT.txt	26	%%DATADIR%%/Help/command/FIND_XXX_ROOT.txt
28	%%DATADIR%%/Help/command/add_compile_options.rst	27	%%DATADIR%%/Help/command/add_compile_options.rst
Lines 484-489 Link Here
484	%%DATADIR%%/Help/policy/CMP0061.rst	483	%%DATADIR%%/Help/policy/CMP0061.rst
485	%%DATADIR%%/Help/policy/CMP0062.rst	484	%%DATADIR%%/Help/policy/CMP0062.rst
486	%%DATADIR%%/Help/policy/CMP0063.rst	485	%%DATADIR%%/Help/policy/CMP0063.rst
		486	%%DATADIR%%/Help/policy/CMP0064.rst
		487	%%DATADIR%%/Help/policy/CMP0065.rst
487	%%DATADIR%%/Help/policy/DEPRECATED.txt	488	%%DATADIR%%/Help/policy/DEPRECATED.txt
488	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt	489	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
489	%%DATADIR%%/Help/prop_cache/ADVANCED.rst	490	%%DATADIR%%/Help/prop_cache/ADVANCED.rst
Lines 542-547 Link Here
542	%%DATADIR%%/Help/prop_gbl/RULE_LAUNCH_LINK.rst	543	%%DATADIR%%/Help/prop_gbl/RULE_LAUNCH_LINK.rst
543	%%DATADIR%%/Help/prop_gbl/RULE_MESSAGES.rst	544	%%DATADIR%%/Help/prop_gbl/RULE_MESSAGES.rst
544	%%DATADIR%%/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst	545	%%DATADIR%%/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst
		546	%%DATADIR%%/Help/prop_gbl/TARGET_MESSAGES.rst
545	%%DATADIR%%/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst	547	%%DATADIR%%/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst
546	%%DATADIR%%/Help/prop_gbl/USE_FOLDERS.rst	548	%%DATADIR%%/Help/prop_gbl/USE_FOLDERS.rst
547	%%DATADIR%%/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst	549	%%DATADIR%%/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
Lines 596-603 Link Here
596	%%DATADIR%%/Help/prop_test/WILL_FAIL.rst	598	%%DATADIR%%/Help/prop_test/WILL_FAIL.rst
597	%%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst	599	%%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst
598	%%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst	600	%%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst
		601	%%DATADIR%%/Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst
599	%%DATADIR%%/Help/prop_tgt/ANDROID_API.rst	602	%%DATADIR%%/Help/prop_tgt/ANDROID_API.rst
		603	%%DATADIR%%/Help/prop_tgt/ANDROID_API_MIN.rst
		604	%%DATADIR%%/Help/prop_tgt/ANDROID_ARCH.rst
		605	%%DATADIR%%/Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst
600	%%DATADIR%%/Help/prop_tgt/ANDROID_GUI.rst	606	%%DATADIR%%/Help/prop_tgt/ANDROID_GUI.rst
		607	%%DATADIR%%/Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst
		608	%%DATADIR%%/Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst
		609	%%DATADIR%%/Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst
		610	%%DATADIR%%/Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst