[Cmake-commits] CMake branch, master, updated. v3.14.0-404-g875f49c
Kitware Robot
kwrobot at kitware.com
Mon Mar 18 11:33:10 EDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 875f49cc588b898f5da24bff34638d16de5c6413 (commit)
via f6cbb02b59d179c572c347461e81201bdd2337ed (commit)
via 23874e407839bdd93a05285c65a5dc20c225ac24 (commit)
via 4480769f8bdcc0fa954da098a1612003102a7056 (commit)
via 8d179cce8790d2a514075b72c11a1e039c51d942 (commit)
via a77a30e657acea42787b22e88f84fa829b6234d0 (commit)
via a7d853868b147d9051c40564f2b3e445011b888b (commit)
via 380b2dae554f4da2a6ea5d335bab2b789e932cae (commit)
via c58f5e116e0fd4fd883320812bfb052582005e90 (commit)
via 80af3ddea7ce2717c9a33a51954b9ccd6246af1d (commit)
via 8355665f8df5d9e1de5a50cb78d62071f55b7b43 (commit)
via 00b5f1a1b5f44167184e5602385986172afa7a3a (commit)
via 98e6822fdf02d74e1b3e3ff4b1e7ac27138654c9 (commit)
via fb5de060bc99635a5b18b3389cc15e9937b19a0e (commit)
via a11e5e021b5c30a0d6490cfff0399a14a3fb798a (commit)
via 7111873efd91c4ed7c38af117e50ff2ea4d8f0e5 (commit)
via bba2b1c89b32030289623cd9f5cc68d7c40ab0bb (commit)
from b06f8c93e5bc65394fe55b3f7ae923fe296048b3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=875f49cc588b898f5da24bff34638d16de5c6413
commit 875f49cc588b898f5da24bff34638d16de5c6413
Merge: f6cbb02 fb5de06
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 15:28:43 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 18 11:28:52 2019 -0400
Merge topic 'utf8-fixes'
fb5de060bc cm_utf8: reject codepoints above 0x10FFFF
a11e5e021b cm_utf8: reject UTF-16 surrogate half codepoints
7111873efd testUTF8: add more test cases
bba2b1c89b testUTF8: comment why sequences are invalid
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3097
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6cbb02b59d179c572c347461e81201bdd2337ed
commit f6cbb02b59d179c572c347461e81201bdd2337ed
Merge: 23874e4 c58f5e1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 15:27:42 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 18 11:27:59 2019 -0400
Merge topic 'ExternalProject-optimize-git'
c58f5e116e ExternalProject: Extend documentation about GIT_TAG usage
8355665f8d ExternalProject: Drop unnecessary 'git submodule init'
00b5f1a1b5 ExternalProject: Simplify generated 'git clone' scripts
98e6822fdf ExternalProject: Re-run 'git clone' when GIT_REMOTE_NAME changes
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3095
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23874e407839bdd93a05285c65a5dc20c225ac24
commit 23874e407839bdd93a05285c65a5dc20c225ac24
Merge: 4480769 a77a30e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 15:26:40 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 18 11:26:49 2019 -0400
Merge topic 'FindGLEW-updates'
a77a30e657 FindGLEW: Add test
a7d853868b FindGLEW: Update implementation
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3094
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4480769f8bdcc0fa954da098a1612003102a7056
commit 4480769f8bdcc0fa954da098a1612003102a7056
Merge: 8d179cc 380b2da
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 15:24:53 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 18 11:25:22 2019 -0400
Merge topic 'release_note_for_cuda_compiler_generator_expressions'
380b2dae55 Add a release note for the cuda compiler generator expressions
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3109
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d179cce8790d2a514075b72c11a1e039c51d942
commit 8d179cce8790d2a514075b72c11a1e039c51d942
Merge: b06f8c9 80af3dd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 15:24:20 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 18 11:24:30 2019 -0400
Merge topic 'import-zstd'
80af3ddea7 zstd: Disable BMI2 instructions for build within CMake
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3107
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a77a30e657acea42787b22e88f84fa829b6234d0
commit a77a30e657acea42787b22e88f84fa829b6234d0
Author: Claudio Fantacci <claudio.fantacci at gmail.com>
AuthorDate: Wed Mar 13 18:03:25 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 15 11:22:32 2019 -0400
FindGLEW: Add test
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1b5ed03..e03a817 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1445,6 +1445,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
add_subdirectory(FindGit)
endif()
+ if(CMake_TEST_FindGLEW)
+ add_subdirectory(FindGLEW)
+ endif()
+
if(CMake_TEST_FindGSL)
add_subdirectory(FindGSL)
endif()
diff --git a/Tests/FindGLEW/CMakeLists.txt b/Tests/FindGLEW/CMakeLists.txt
new file mode 100644
index 0000000..ff42bce
--- /dev/null
+++ b/Tests/FindGLEW/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_test(NAME FindGLEW.Test COMMAND
+ ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/FindGLEW/Test"
+ "${CMake_BINARY_DIR}/Tests/FindGLEW/Test"
+ ${build_generator_args}
+ --build-project TestFindGLEW
+ --build-options ${build_options}
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
+ )
diff --git a/Tests/FindGLEW/Test/CMakeLists.txt b/Tests/FindGLEW/Test/CMakeLists.txt
new file mode 100644
index 0000000..954ee10
--- /dev/null
+++ b/Tests/FindGLEW/Test/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.1)
+project(TestFindGLEW LANGUAGES CXX)
+include(CTest)
+
+find_package(GLEW REQUIRED)
+
+add_executable(test_glew_shared_tgt main.cpp)
+target_link_libraries(test_glew_shared_tgt GLEW::GLEW)
+add_test(NAME test_glew_shared_tgt COMMAND test_glew_shared_tgt)
+
+add_executable(test_glew_generic_tgt main.cpp)
+target_link_libraries(test_glew_generic_tgt GLEW::glew)
+add_test(NAME test_glew_generic_tgt COMMAND test_glew_generic_tgt)
+
+add_executable(test_glew_var main.cpp)
+target_include_directories(test_glew_var PRIVATE ${GLEW_INCLUDE_DIRS})
+target_link_libraries(test_glew_var PRIVATE ${GLEW_LIBRARIES})
+add_test(NAME test_glew_var COMMAND test_glew_var)
diff --git a/Tests/FindGLEW/Test/main.cpp b/Tests/FindGLEW/Test/main.cpp
new file mode 100644
index 0000000..4a108ad
--- /dev/null
+++ b/Tests/FindGLEW/Test/main.cpp
@@ -0,0 +1,8 @@
+#include <GL/glew.h>
+
+int main()
+{
+ GLenum init_return = glewInit();
+
+ return (init_return == GLEW_OK);
+}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7d853868b147d9051c40564f2b3e445011b888b
commit a7d853868b147d9051c40564f2b3e445011b888b
Author: Claudio Fantacci <claudio.fantacci at gmail.com>
AuthorDate: Wed Mar 13 16:04:16 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 15 11:22:29 2019 -0400
FindGLEW: Update implementation
Replicate behaviour of upstream GLEW.
* define the imported target GLEW::glew for the shared library GLEW
* if GLEW_USE_STATIC_LIBS is defined and set to TRUE, this module instead
defines the imported target GLEW::glew_s for the static library GLEW
* an imported target GLEW::GLEW is created as a copy of either GLEW::glew
or GLEW::glew_s
* by setting GLEW_VERBOSE you print out the log of the module.
Fixes: #17638, #17864, #18989
diff --git a/Help/release/dev/FindGLEW-updates.rst b/Help/release/dev/FindGLEW-updates.rst
new file mode 100644
index 0000000..6487052
--- /dev/null
+++ b/Help/release/dev/FindGLEW-updates.rst
@@ -0,0 +1,5 @@
+FindGLEW-updates
+----------------
+
+* The :module:`FindGLEW` module now provides an interface more consistent
+ with what upstream GLEW provides in its own CMake package files.
diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake
index ad8a810..34ee873 100644
--- a/Modules/FindGLEW.cmake
+++ b/Modules/FindGLEW.cmake
@@ -7,64 +7,300 @@ FindGLEW
Find the OpenGL Extension Wrangler Library (GLEW)
-IMPORTED Targets
+Input Variables
+^^^^^^^^^^^^^^^
+
+The following variables may be set to influence this module’s behavior:
+
+``GLEW_USE_STATIC_LIBS``
+ to find and create :prop_tgt:`IMPORTED` target for static linkage.
+
+``GLEW_VERBOSE``
+ to output a detailed log of this module.
+
+Imported Targets
^^^^^^^^^^^^^^^^
-This module defines the :prop_tgt:`IMPORTED` target ``GLEW::GLEW``,
-if GLEW has been found.
+This module defines the following :ref:`Imported Targets <Imported Targets>`:
+
+
+``GLEW::glew``
+ The GLEW shared library.
+``GLEW::glew_s``
+ The GLEW static library, if ``GLEW_USE_STATIC_LIBS`` is set to ``TRUE``.
+``GLEW::GLEW``
+ Duplicates either ``GLEW::glew`` or ``GLEW::glew_s`` based on availability.
Result Variables
^^^^^^^^^^^^^^^^
This module defines the following variables:
-::
+``GLEW_INCLUDE_DIRS``
+ include directories for GLEW
+``GLEW_LIBRARIES``
+ libraries to link against GLEW
+``GLEW_SHARED_LIBRARIES``
+ libraries to link against shared GLEW
+``GLEW_STATIC_LIBRARIES``
+ libraries to link against static GLEW
+``GLEW_FOUND``
+ true if GLEW has been found and can be used
+``GLEW_VERSION``
+ GLEW version
+``GLEW_VERSION_MAJOR``
+ GLEW major version
+``GLEW_VERSION_MINOR``
+ GLEW minor version
+``GLEW_VERSION_MICRO``
+ GLEW micro version
- GLEW_INCLUDE_DIRS - include directories for GLEW
- GLEW_LIBRARIES - libraries to link against GLEW
- GLEW_FOUND - true if GLEW has been found and can be used
#]=======================================================================]
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+
+find_package(GLEW CONFIG QUIET)
+
+if(GLEW_FOUND)
+ find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_CONFIG)
+ return()
+endif()
+
+if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: did not find GLEW CMake config file. Searching for libraries.")
+endif()
+
+
+function(__glew_set_find_library_suffix shared_or_static)
+ if(UNIX AND "${shared_or_static}" MATCHES "SHARED")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" PARENT_SCOPE)
+ elseif(UNIX AND "${shared_or_static}" MATCHES "STATIC")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" PARENT_SCOPE)
+ elseif(APPLE AND "${shared_or_static}" MATCHES "SHARED")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so" PARENT_SCOPE)
+ elseif(APPLE AND "${shared_or_static}" MATCHES "STATIC")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" PARENT_SCOPE)
+ elseif(WIN32 AND "${shared_or_static}" MATCHES "SHARED")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" PARENT_SCOPE)
+ elseif(WIN32 AND "${shared_or_static}" MATCHES "STATIC")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib;.dll.a" PARENT_SCOPE)
+ endif()
+
+ if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: CMAKE_FIND_LIBRARY_SUFFIXES for ${shared_or_static}: ${CMAKE_FIND_LIBRARY_SUFFIXES}")
+ endif()
+endfunction()
+
+
+if(GLEW_VERBOSE)
+ if(DEFINED GLEW_USE_STATIC_LIBS)
+ message(STATUS "FindGLEW: GLEW_USE_STATIC_LIBS: ${GLEW_USE_STATIC_LIBS}.")
+ else()
+ message(STATUS "FindGLEW: GLEW_USE_STATIC_LIBS is undefined. Treated as FALSE.")
+ endif()
+endif()
+
find_path(GLEW_INCLUDE_DIR GL/glew.h)
+mark_as_advanced(GLEW_INCLUDE_DIR)
-if(NOT GLEW_LIBRARY)
- find_library(GLEW_LIBRARY_RELEASE NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64 libx32)
- find_library(GLEW_LIBRARY_DEBUG NAMES GLEWd glew32d glewd PATH_SUFFIXES lib64)
+set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
- include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
- select_library_configurations(GLEW)
-endif ()
+if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: GLEW_INCLUDE_DIR: ${GLEW_INCLUDE_DIR}")
+ message(STATUS "FindGLEW: GLEW_INCLUDE_DIRS: ${GLEW_INCLUDE_DIRS}")
+endif()
+
+if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64" OR "${CMAKE_GENERATOR}" MATCHES "Win64")
+ set(_arch "x64")
+else()
+ set(_arch "Win32")
+endif()
+
+
+__glew_set_find_library_suffix(SHARED)
+
+find_library(GLEW_SHARED_LIBRARY_RELEASE
+ NAMES GLEW glew glew32
+ PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch}
+ PATHS ENV GLEW_ROOT)
+
+find_library(GLEW_SHARED_LIBRARY_DEBUG
+ NAMES GLEWd glewd glew32d
+ PATH_SUFFIXES lib lib64
+ PATHS ENV GLEW_ROOT)
+
+
+__glew_set_find_library_suffix(STATIC)
+
+find_library(GLEW_STATIC_LIBRARY_RELEASE
+ NAMES GLEW glew glew32s
+ PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch}
+ PATHS ENV GLEW_ROOT)
+
+find_library(GLEW_STATIC_LIBRARY_DEBUG
+ NAMES GLEWds glewds glew32ds
+ PATH_SUFFIXES lib lib64
+ PATHS ENV GLEW_ROOT)
+
+include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+
+select_library_configurations(GLEW_SHARED)
+select_library_configurations(GLEW_STATIC)
+
+if(NOT GLEW_USE_STATIC_LIBS)
+ set(GLEW_LIBRARIES ${GLEW_SHARED_LIBRARY})
+else()
+ set(GLEW_LIBRARIES ${GLEW_STATIC_LIBRARY})
+endif()
+
+
+if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: GLEW_SHARED_LIBRARY_RELEASE: ${GLEW_SHARED_LIBRARY_RELEASE}")
+ message(STATUS "FindGLEW: GLEW_STATIC_LIBRARY_RELEASE: ${GLEW_STATIC_LIBRARY_RELEASE}")
+ message(STATUS "FindGLEW: GLEW_SHARED_LIBRARY_DEBUG: ${GLEW_SHARED_LIBRARY_DEBUG}")
+ message(STATUS "FindGLEW: GLEW_STATIC_LIBRARY_DEBUG: ${GLEW_STATIC_LIBRARY_DEBUG}")
+ message(STATUS "FindGLEW: GLEW_SHARED_LIBRARY: ${GLEW_SHARED_LIBRARY}")
+ message(STATUS "FindGLEW: GLEW_STATIC_LIBRARY: ${GLEW_STATIC_LIBRARY}")
+ message(STATUS "FindGLEW: GLEW_LIBRARIES: ${GLEW_LIBRARIES}")
+endif()
+
+
+# Read version from GL/glew.h file
+if(EXISTS "${GLEW_INCLUDE_DIR}/GL/glew.h")
+ file(STRINGS "${GLEW_INCLUDE_DIR}/GL/glew.h" _contents REGEX "^VERSION_.+ [0-9]+")
+ if(_contents)
+ string(REGEX REPLACE ".*VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" GLEW_VERSION_MAJOR "${_contents}")
+ string(REGEX REPLACE ".*VERSION_MINOR[ \t]+([0-9]+).*" "\\1" GLEW_VERSION_MINOR "${_contents}")
+ string(REGEX REPLACE ".*VERSION_MICRO[ \t]+([0-9]+).*" "\\1" GLEW_VERSION_MICRO "${_contents}")
+ set(GLEW_VERSION "${GLEW_VERSION_MAJOR}.${GLEW_VERSION_MINOR}.${GLEW_VERSION_MICRO}")
+ endif()
+endif()
+
+if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: GLEW_VERSION_MAJOR: ${GLEW_VERSION_MAJOR}")
+ message(STATUS "FindGLEW: GLEW_VERSION_MINOR: ${GLEW_VERSION_MINOR}")
+ message(STATUS "FindGLEW: GLEW_VERSION_MICRO: ${GLEW_VERSION_MICRO}")
+ message(STATUS "FindGLEW: GLEW_VERSION: ${GLEW_VERSION}")
+endif()
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
find_package_handle_standard_args(GLEW
- REQUIRED_VARS GLEW_INCLUDE_DIR GLEW_LIBRARY)
+ REQUIRED_VARS GLEW_INCLUDE_DIRS GLEW_LIBRARIES
+ VERSION_VAR GLEW_VERSION)
-if(GLEW_FOUND)
- set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
+if(NOT GLEW_FOUND)
+ if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: could not found GLEW library.")
+ endif()
+ return()
+endif()
+
+
+if(NOT TARGET GLEW::glew AND NOT GLEW_USE_STATIC_LIBS)
+ if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: Creating GLEW::glew imported target.")
+ endif()
+
+ add_library(GLEW::glew UNKNOWN IMPORTED)
+
+ set_target_properties(GLEW::glew
+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${GLEW_INCLUDE_DIRS}")
+
+ if(GLEW_SHARED_LIBRARY_RELEASE)
+ set_property(TARGET GLEW::glew
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+
+ set_target_properties(GLEW::glew
+ PROPERTIES IMPORTED_LOCATION_RELEASE "${GLEW_SHARED_LIBRARY_RELEASE}")
+ endif()
+
+ if(GLEW_SHARED_LIBRARY_DEBUG)
+ set_property(TARGET GLEW::glew
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+
+ set_target_properties(GLEW::glew
+ PROPERTIES IMPORTED_LOCATION_DEBUG "${GLEW_SHARED_LIBRARY_DEBUG}")
+ endif()
- if(NOT GLEW_LIBRARIES)
- set(GLEW_LIBRARIES ${GLEW_LIBRARY})
+elseif(NOT TARGET GLEW::glew_s AND GLEW_USE_STATIC_LIBS)
+ if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: Creating GLEW::glew_s imported target.")
endif()
- if (NOT TARGET GLEW::GLEW)
- add_library(GLEW::GLEW UNKNOWN IMPORTED)
- set_target_properties(GLEW::GLEW PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${GLEW_INCLUDE_DIRS}")
+ add_library(GLEW::glew_s UNKNOWN IMPORTED)
- if(GLEW_LIBRARY_RELEASE)
- set_property(TARGET GLEW::GLEW APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(GLEW::GLEW PROPERTIES IMPORTED_LOCATION_RELEASE "${GLEW_LIBRARY_RELEASE}")
+ set_target_properties(GLEW::glew_s
+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${GLEW_INCLUDE_DIRS}")
+
+ if(GLEW_STATIC_LIBRARY_RELEASE)
+ set_property(TARGET GLEW::glew_s
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+
+ set_target_properties(GLEW::glew_s
+ PROPERTIES IMPORTED_LOCATION_RELEASE "${GLEW_STATIC_LIBRARY_RELEASE}")
+ endif()
+
+ if(GLEW_STATIC_LIBRARY_DEBUG)
+ set_property(TARGET GLEW::glew_s
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+
+ set_target_properties(GLEW::glew_s
+ PROPERTIES IMPORTED_LOCATION_DEBUG "${GLEW_STATIC_LIBRARY_DEBUG}")
+ endif()
+endif()
+
+if(NOT TARGET GLEW::GLEW)
+ if(GLEW_VERBOSE)
+ message(STATUS "FindGLEW: Creating GLEW::GLEW imported target.")
+ endif()
+
+ add_library(GLEW::GLEW UNKNOWN IMPORTED)
+
+ set_target_properties(GLEW::GLEW
+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${GLEW_INCLUDE_DIRS}")
+
+ if(TARGET GLEW::glew)
+ if(GLEW_SHARED_LIBRARY_RELEASE)
+ set_property(TARGET GLEW::GLEW
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+
+ set_target_properties(GLEW::GLEW
+ PROPERTIES IMPORTED_LOCATION_RELEASE "${GLEW_SHARED_LIBRARY_RELEASE}")
+ endif()
+
+ if(GLEW_SHARED_LIBRARY_DEBUG)
+ set_property(TARGET GLEW::GLEW
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+
+ set_target_properties(GLEW::GLEW
+ PROPERTIES IMPORTED_LOCATION_DEBUG "${GLEW_SHARED_LIBRARY_DEBUG}")
endif()
- if(GLEW_LIBRARY_DEBUG)
- set_property(TARGET GLEW::GLEW APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(GLEW::GLEW PROPERTIES IMPORTED_LOCATION_DEBUG "${GLEW_LIBRARY_DEBUG}")
+ elseif(TARGET GLEW::glew_s)
+ if(GLEW_STATIC_LIBRARY_RELEASE)
+ set_property(TARGET GLEW::GLEW
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+
+ set_target_properties(GLEW::GLEW
+ PROPERTIES IMPORTED_LOCATION_RELEASE "${GLEW_STATIC_LIBRARY_RELEASE}")
endif()
- if(NOT GLEW_LIBRARY_RELEASE AND NOT GLEW_LIBRARY_DEBUG)
- set_property(TARGET GLEW::GLEW APPEND PROPERTY IMPORTED_LOCATION "${GLEW_LIBRARY}")
+ if(GLEW_STATIC_LIBRARY_DEBUG AND GLEW_USE_STATIC_LIBS)
+ set_property(TARGET GLEW::GLEW
+ APPEND
+ PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+
+ set_target_properties(GLEW::GLEW
+ PROPERTIES IMPORTED_LOCATION_DEBUG "${GLEW_STATIC_LIBRARY_DEBUG}")
endif()
+
+ elseif(GLEW_VERBOSE)
+ message(WARNING "FindGLEW: no `GLEW::glew` or `GLEW::glew_s` target was created. Something went wrong in FindGLEW target creation.")
endif()
endif()
-
-mark_as_advanced(GLEW_INCLUDE_DIR)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=380b2dae554f4da2a6ea5d335bab2b789e932cae
commit 380b2dae554f4da2a6ea5d335bab2b789e932cae
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Mar 15 11:04:25 2019 -0400
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Fri Mar 15 11:04:25 2019 -0400
Add a release note for the cuda compiler generator expressions
diff --git a/Help/release/dev/cuda-compiler-generator-expressions.rst b/Help/release/dev/cuda-compiler-generator-expressions.rst
new file mode 100644
index 0000000..2610a39
--- /dev/null
+++ b/Help/release/dev/cuda-compiler-generator-expressions.rst
@@ -0,0 +1,5 @@
+cuda-compiler-generator-expressions
+-----------------------------------
+
+* The ``$<CUDA_COMPILER_ID:...>`` and ``$<CUDA_COMPILER_VERSION:...>``
+ :manual:`generator expressions <cmake-generator-expressions(7)>` were added.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c58f5e116e0fd4fd883320812bfb052582005e90
commit c58f5e116e0fd4fd883320812bfb052582005e90
Author: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
AuthorDate: Fri Mar 15 14:14:03 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 15 11:00:31 2019 -0400
ExternalProject: Extend documentation about GIT_TAG usage
When GIT_SHALLOW is used, the '--depth 1 --no-single-branch'
arguments are add. It means that only branch names and tags
is downloaded to repository. Most Commit Hash is not working.
With this commit the documentation was updated, to describe
the limitation of GIT_SHALLOW.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 96250d3..4344bdb 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -251,6 +251,9 @@ External Project Definition
The lack of such deterministic behavior makes the main project lose
traceability and repeatability.
+ If ``GIT_SHALLOW`` is enabled then ``GIT_TAG`` works only with
+ branch names and tags. A commit hash is not allowed.
+
``GIT_REMOTE_NAME <name>``
The optional name of the remote. If this option is not specified, it
defaults to ``origin``.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80af3ddea7ce2717c9a33a51954b9ccd6246af1d
commit 80af3ddea7ce2717c9a33a51954b9ccd6246af1d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 15 10:05:23 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 15 10:05:23 2019 -0400
zstd: Disable BMI2 instructions for build within CMake
Our nightly and release binaries build in an environment that does not
support these instructions. Disable them everywhere for simplicity
because CMake's application of this library is not performance-critical.
diff --git a/Utilities/cmzstd/CMakeLists.txt b/Utilities/cmzstd/CMakeLists.txt
index b1399bd..8ed04d8 100644
--- a/Utilities/cmzstd/CMakeLists.txt
+++ b/Utilities/cmzstd/CMakeLists.txt
@@ -41,4 +41,7 @@ add_library(cmzstd STATIC
lib/dictBuilder/zdict.c
)
+# BMI2 instructions are not supported in older environments.
+set_property(TARGET cmzstd PROPERTY COMPILE_DEFINITIONS DYNAMIC_BMI2=0)
+
install(FILES LICENSE DESTINATION ${CMAKE_DOC_DIR}/cmzstd)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8355665f8df5d9e1de5a50cb78d62071f55b7b43
commit 8355665f8df5d9e1de5a50cb78d62071f55b7b43
Author: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
AuthorDate: Wed Mar 13 15:41:29 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 14 13:45:35 2019 -0400
ExternalProject: Drop unnecessary 'git submodule init'
Since commit 79410eeb1f (ExternalProject: Initialize Git submodules
recursively and on update (#16083), 2016-04-26, v3.6.0-rc1~105^2) our
`git submodule update` step uses the `--init` flag. This makes the
prior `git submodule init` unnecessary.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 278020c..96250d3 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1142,15 +1142,6 @@ if(error_code)
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule init ${git_submodules}
- WORKING_DIRECTORY \"${work_dir}/${src_name}\"
- RESULT_VARIABLE error_code
- )
-if(error_code)
- message(FATAL_ERROR \"Failed to init submodules in: '${work_dir}/${src_name}'\")
-endif()
-
-execute_process(
COMMAND \"${git_EXECUTABLE}\" \${git_options} submodule update --recursive --init ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00b5f1a1b5f44167184e5602385986172afa7a3a
commit 00b5f1a1b5f44167184e5602385986172afa7a3a
Author: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
AuthorDate: Wed Mar 13 15:40:24 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 14 13:44:30 2019 -0400
ExternalProject: Simplify generated 'git clone' scripts
Revise script generation to hard-code selected options instead of
building them with logic inside the script.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 5705b3a..278020c 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1053,11 +1053,6 @@ define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED
)
function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name git_submodules git_shallow git_progress git_config src_name work_dir gitclone_infofile gitclone_stampfile tls_verify)
- if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10)
- set(git_clone_shallow_options "--depth 1 --no-single-branch")
- else()
- set(git_clone_shallow_options "--depth 1")
- endif()
if(NOT GIT_VERSION_STRING VERSION_LESS 1.8.5)
# Use `git checkout <tree-ish> --` to avoid ambiguity with a local path.
set(git_checkout_explicit-- "--")
@@ -1067,12 +1062,30 @@ function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git
# because that will not search for remote branch names, a common use case.
set(git_checkout_explicit-- "")
endif()
- file(WRITE ${script_filename}
-"if(\"${git_tag}\" STREQUAL \"\")
- message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
-endif()
+ if("${git_tag}" STREQUAL "")
+ message(FATAL_ERROR "Tag for git checkout should not be empty.")
+ endif()
-set(run 0)
+ set(git_clone_options)
+ if(git_shallow)
+ if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10)
+ list(APPEND git_clone_options "--depth 1 --no-single-branch")
+ else()
+ list(APPEND git_clone_options "--depth 1")
+ endif()
+ endif()
+ if(git_progress)
+ list(APPEND git_clone_options --progress)
+ endif()
+ foreach(config IN LISTS git_config)
+ list(APPEND git_clone_options --config ${config})
+ endforeach()
+ if(NOT ${git_remote_name} STREQUAL "origin")
+ list(APPEND git_clone_options --origin \"${git_remote_name}\")
+ endif()
+ string (REPLACE ";" " " git_clone_options "${git_clone_options}")
+ file(WRITE ${script_filename}
+"set(run 0)
if(\"${gitclone_infofile}\" IS_NEWER_THAN \"${gitclone_stampfile}\")
set(run 1)
@@ -1100,29 +1113,12 @@ if(NOT \"x${tls_verify}\" STREQUAL \"x\" AND NOT tls_verify)
-c http.sslVerify=false)
endif()
-set(git_clone_options)
-
-set(git_shallow \"${git_shallow}\")
-if(git_shallow)
- list(APPEND git_clone_options ${git_clone_shallow_options})
-endif()
-
-set(git_progress \"${git_progress}\")
-if(git_progress)
- list(APPEND git_clone_options --progress)
-endif()
-
-set(git_config \"${git_config}\")
-foreach(config IN LISTS git_config)
- list(APPEND git_clone_options --config \${config})
-endforeach()
-
# try the clone 3 times in case there is an odd git clone issue
set(error_code 1)
set(number_of_tries 0)
while(error_code AND number_of_tries LESS 3)
execute_process(
- COMMAND \"${git_EXECUTABLE}\" \${git_options} clone \${git_clone_options} --origin \"${git_remote_name}\" \"${git_repository}\" \"${src_name}\"
+ COMMAND \"${git_EXECUTABLE}\" \${git_options} clone ${git_clone_options} \"${git_repository}\" \"${src_name}\"
WORKING_DIRECTORY \"${work_dir}\"
RESULT_VARIABLE error_code
)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98e6822fdf02d74e1b3e3ff4b1e7ac27138654c9
commit 98e6822fdf02d74e1b3e3ff4b1e7ac27138654c9
Author: Bartosz Kosiorek <bartosz.kosiorek at tomtom.com>
AuthorDate: Wed Mar 13 15:38:35 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 14 13:44:15 2019 -0400
ExternalProject: Re-run 'git clone' when GIT_REMOTE_NAME changes
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 22e0523..5705b3a 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -2460,7 +2460,7 @@ function(_ep_add_download_command name)
#
set(repository ${git_repository})
set(module)
- set(tag)
+ set(tag ${git_remote_name})
configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-gitinfo.txt"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb5de060bc99635a5b18b3389cc15e9937b19a0e
commit fb5de060bc99635a5b18b3389cc15e9937b19a0e
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 14 13:26:21 2019 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Mar 14 13:26:21 2019 -0400
cm_utf8: reject codepoints above 0x10FFFF
These are invalid because the Unicode standard says so (because UTF-16
as specified today cannot encode them).
diff --git a/Source/cm_utf8.c b/Source/cm_utf8.c
index 2459c02..d41d097 100644
--- a/Source/cm_utf8.c
+++ b/Source/cm_utf8.c
@@ -76,6 +76,11 @@ const char* cm_utf8_decode_character(const char* first, const char* last,
return 0;
}
+ /* Invalid codepoints. */
+ if (0x10FFFF < uc) {
+ return 0;
+ }
+
*pc = uc;
return first;
}
diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx
index f1da6df..7f52c82 100644
--- a/Tests/CMakeLib/testUTF8.cxx
+++ b/Tests/CMakeLib/testUTF8.cxx
@@ -28,10 +28,6 @@ static test_utf8_entry const good_entry[] = {
{ 4, "\xF0\xA3\x8E\xB4", 0x233B4 }, /* Example from RFC 3629. */
{ 3, "\xED\x80\x80\x00", 0xD000 }, /* Valid 0xED prefixed codepoint. */
{ 4, "\xF4\x8F\xBF\xBF", 0x10FFFF }, /* Highest valid RFC codepoint. */
- /* These are invalid according to the RFC, but accepted here. */
- { 4, "\xF4\x90\x80\x80", 0x110000 }, /* Lowest out-of-range codepoint. */
- { 4, "\xF5\x80\x80\x80",
- 0x140000 }, /* Prefix forces out-of-range codepoints. */
{ 0, { 0, 0, 0, 0, 0 }, 0 }
};
@@ -45,6 +41,8 @@ static test_utf8_char const bad_chars[] = {
"\xF0\x80\x80\x80", /* Overlong encoding. */
"\xED\xA0\x80\x00", /* UTF-16 surrogate half. */
"\xED\xBF\xBF\x00", /* UTF-16 surrogate half. */
+ "\xF4\x90\x80\x80", /* Lowest out-of-range codepoint. */
+ "\xF5\x80\x80\x80", /* Prefix forces out-of-range codepoints. */
{ 0, 0, 0, 0, 0 }
};
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a11e5e021b5c30a0d6490cfff0399a14a3fb798a
commit a11e5e021b5c30a0d6490cfff0399a14a3fb798a
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 14 11:01:27 2019 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Mar 14 13:25:24 2019 -0400
cm_utf8: reject UTF-16 surrogate half codepoints
diff --git a/Source/cm_utf8.c b/Source/cm_utf8.c
index 52af4a6..2459c02 100644
--- a/Source/cm_utf8.c
+++ b/Source/cm_utf8.c
@@ -71,6 +71,11 @@ const char* cm_utf8_decode_character(const char* first, const char* last,
return 0;
}
+ /* UTF-16 surrogate halves. */
+ if (0xD800 <= uc && uc <= 0xDFFF) {
+ return 0;
+ }
+
*pc = uc;
return first;
}
diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx
index e225152..f1da6df 100644
--- a/Tests/CMakeLib/testUTF8.cxx
+++ b/Tests/CMakeLib/testUTF8.cxx
@@ -29,8 +29,6 @@ static test_utf8_entry const good_entry[] = {
{ 3, "\xED\x80\x80\x00", 0xD000 }, /* Valid 0xED prefixed codepoint. */
{ 4, "\xF4\x8F\xBF\xBF", 0x10FFFF }, /* Highest valid RFC codepoint. */
/* These are invalid according to the RFC, but accepted here. */
- { 3, "\xED\xA0\x80\x00", 0xD800 }, /* UTF-16 surrogate half. */
- { 3, "\xED\xBF\xBF\x00", 0xDFFF }, /* UTF-16 surrogate half. */
{ 4, "\xF4\x90\x80\x80", 0x110000 }, /* Lowest out-of-range codepoint. */
{ 4, "\xF5\x80\x80\x80",
0x140000 }, /* Prefix forces out-of-range codepoints. */
@@ -45,6 +43,8 @@ static test_utf8_char const bad_chars[] = {
"\xE0\x00\x00\x00", /* Missing continuation bytes. */
"\xE0\x80\x80\x00", /* Overlong encoding. */
"\xF0\x80\x80\x80", /* Overlong encoding. */
+ "\xED\xA0\x80\x00", /* UTF-16 surrogate half. */
+ "\xED\xBF\xBF\x00", /* UTF-16 surrogate half. */
{ 0, 0, 0, 0, 0 }
};
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7111873efd91c4ed7c38af117e50ff2ea4d8f0e5
commit 7111873efd91c4ed7c38af117e50ff2ea4d8f0e5
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 14 11:02:54 2019 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Mar 14 13:24:38 2019 -0400
testUTF8: add more test cases
diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx
index eb37c7e..e225152 100644
--- a/Tests/CMakeLib/testUTF8.cxx
+++ b/Tests/CMakeLib/testUTF8.cxx
@@ -21,17 +21,27 @@ struct test_utf8_entry
};
static test_utf8_entry const good_entry[] = {
- { 1, "\x20\x00\x00\x00", 0x0020 }, /* Space. */
- { 2, "\xC2\xA9\x00\x00", 0x00A9 }, /* Copyright. */
- { 3, "\xE2\x80\x98\x00", 0x2018 }, /* Open-single-quote. */
- { 3, "\xE2\x80\x99\x00", 0x2019 }, /* Close-single-quote. */
- { 4, "\xF0\xA3\x8E\xB4", 0x233B4 }, /* Example from RFC 3629. */
+ { 1, "\x20\x00\x00\x00", 0x0020 }, /* Space. */
+ { 2, "\xC2\xA9\x00\x00", 0x00A9 }, /* Copyright. */
+ { 3, "\xE2\x80\x98\x00", 0x2018 }, /* Open-single-quote. */
+ { 3, "\xE2\x80\x99\x00", 0x2019 }, /* Close-single-quote. */
+ { 4, "\xF0\xA3\x8E\xB4", 0x233B4 }, /* Example from RFC 3629. */
+ { 3, "\xED\x80\x80\x00", 0xD000 }, /* Valid 0xED prefixed codepoint. */
+ { 4, "\xF4\x8F\xBF\xBF", 0x10FFFF }, /* Highest valid RFC codepoint. */
+ /* These are invalid according to the RFC, but accepted here. */
+ { 3, "\xED\xA0\x80\x00", 0xD800 }, /* UTF-16 surrogate half. */
+ { 3, "\xED\xBF\xBF\x00", 0xDFFF }, /* UTF-16 surrogate half. */
+ { 4, "\xF4\x90\x80\x80", 0x110000 }, /* Lowest out-of-range codepoint. */
+ { 4, "\xF5\x80\x80\x80",
+ 0x140000 }, /* Prefix forces out-of-range codepoints. */
{ 0, { 0, 0, 0, 0, 0 }, 0 }
};
static test_utf8_char const bad_chars[] = {
"\x80\x00\x00\x00", /* Leading continuation byte. */
- "\xC0\x00\x00\x00", /* Overlong encoding and missing continuation byte. */
+ "\xC0\x80\x00\x00", /* Overlong encoding. */
+ "\xC1\x80\x00\x00", /* Overlong encoding. */
+ "\xC2\x00\x00\x00", /* Missing continuation byte. */
"\xE0\x00\x00\x00", /* Missing continuation bytes. */
"\xE0\x80\x80\x00", /* Overlong encoding. */
"\xF0\x80\x80\x80", /* Overlong encoding. */
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bba2b1c89b32030289623cd9f5cc68d7c40ab0bb
commit bba2b1c89b32030289623cd9f5cc68d7c40ab0bb
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 14 11:02:40 2019 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Mar 14 13:21:50 2019 -0400
testUTF8: comment why sequences are invalid
diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx
index c99c46d..eb37c7e 100644
--- a/Tests/CMakeLib/testUTF8.cxx
+++ b/Tests/CMakeLib/testUTF8.cxx
@@ -30,8 +30,12 @@ static test_utf8_entry const good_entry[] = {
};
static test_utf8_char const bad_chars[] = {
- "\x80\x00\x00\x00", "\xC0\x00\x00\x00", "\xE0\x00\x00\x00",
- "\xE0\x80\x80\x00", "\xF0\x80\x80\x80", { 0, 0, 0, 0, 0 }
+ "\x80\x00\x00\x00", /* Leading continuation byte. */
+ "\xC0\x00\x00\x00", /* Overlong encoding and missing continuation byte. */
+ "\xE0\x00\x00\x00", /* Missing continuation bytes. */
+ "\xE0\x80\x80\x00", /* Overlong encoding. */
+ "\xF0\x80\x80\x80", /* Overlong encoding. */
+ { 0, 0, 0, 0, 0 }
};
static void report_good(bool passed, test_utf8_char const c)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindGLEW-updates.rst | 5 +
.../dev/cuda-compiler-generator-expressions.rst | 5 +
Modules/ExternalProject.cmake | 66 ++---
Modules/FindGLEW.cmake | 302 ++++++++++++++++++---
Source/cm_utf8.c | 10 +
Tests/CMakeLib/testUTF8.cxx | 26 +-
Tests/CMakeLists.txt | 4 +
Tests/{FindCURL => FindGLEW}/CMakeLists.txt | 8 +-
Tests/FindGLEW/Test/CMakeLists.txt | 18 ++
Tests/FindGLEW/Test/main.cpp | 8 +
Utilities/cmzstd/CMakeLists.txt | 3 +
11 files changed, 373 insertions(+), 82 deletions(-)
create mode 100644 Help/release/dev/FindGLEW-updates.rst
create mode 100644 Help/release/dev/cuda-compiler-generator-expressions.rst
copy Tests/{FindCURL => FindGLEW}/CMakeLists.txt (55%)
create mode 100644 Tests/FindGLEW/Test/CMakeLists.txt
create mode 100644 Tests/FindGLEW/Test/main.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list