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 0741eda2468e482baf1b5ff6a3a8d376143171e4 (commit)
via 982e6e777556de8db44b16b144ab62f4b7172319 (commit)
via 450a1904d5c7611806b8da55f2df72bcc0ddcacb (commit)
via 555b3c11ec60ba7428f26c1faad0656e7b8fc606 (commit)
via 1e2e12889b3550713cfcb86a9367c3046a6f56e9 (commit)
via 6383dc398afec89122376e7b53189fd1028a1318 (commit)
via f657bcbd488bad36dbf91174f3601cc596bd96cd (commit)
via f835526d8f4f719e7d1d28232b146bc26c17b8c9 (commit)
via 42825fc220f9d05c8db629709a94deeced42be7a (commit)
via dd45f23b0142fb92de17458dd69b2b6f967f94bd (commit)
via 562ea5d0e200a5e005ef33dca45a7d08a5e8fbb7 (commit)
from 6252a7ff61ed457f5e655dc6420d594f5b4ef0fa (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=0741eda2468e482baf1b5ff6a3a8d376143171e4
commit 0741eda2468e482baf1b5ff6a3a8d376143171e4
Merge: 982e6e7 42825fc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 7 11:55:40 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Feb 7 06:55:53 2019 -0500
Merge topic 'mingw-ar-suffix'
42825fc220 MinGW: Fix locating BinUtils when compiler has a suffix
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2924
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=982e6e777556de8db44b16b144ab62f4b7172319
commit 982e6e777556de8db44b16b144ab62f4b7172319
Merge: 450a190 dd45f23
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 7 11:54:39 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Feb 7 06:55:12 2019 -0500
Merge topic 'findcups'
dd45f23b01 FindCups: add imported target
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2917
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=450a1904d5c7611806b8da55f2df72bcc0ddcacb
commit 450a1904d5c7611806b8da55f2df72bcc0ddcacb
Merge: 555b3c1 562ea5d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 7 11:54:24 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Feb 7 06:54:31 2019 -0500
Merge topic 'test-FortranModules-tweak'
562ea5d0e2 Tests: Add a way to configure custom options for FortranModules
test
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2926
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=555b3c11ec60ba7428f26c1faad0656e7b8fc606
commit 555b3c11ec60ba7428f26c1faad0656e7b8fc606
Merge: 6252a7f 1e2e128
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 7 06:53:32 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Feb 7 06:53:32 2019 -0500
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42825fc220f9d05c8db629709a94deeced42be7a
commit 42825fc220f9d05c8db629709a94deeced42be7a
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Tue Dec 11 09:08:42 2018 +0100
Commit: Regina Pfeifer <reg...@mailbox.org>
CommitDate: Wed Feb 6 17:43:55 2019 +0100
MinGW: Fix locating BinUtils when compiler has a suffix
While all executables from a mingw toolchain share a common prefix,
only the ones provided with the compiler have a suffix, the binutils
do not.
Fixes: #18879
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index d7f6f97..3ec534f 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -139,8 +139,9 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|QCC")
get_filename_component(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME)
- if (COMPILER_BASENAME MATCHES
"^(.+-)(clang|g?cc)(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
+ if (COMPILER_BASENAME MATCHES
"^(.+-)(clang|g?cc)(-[0-9]+(\\.[0-9]+)*)?(-[^.]+)?(\\.exe)?$")
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
+ set(_CMAKE_COMPILER_SUFFIX ${CMAKE_MATCH_5})
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
if(CMAKE_C_COMPILER_TARGET)
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index bd878b2..68cb9fe 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -136,8 +136,9 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|QCC")
get_filename_component(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME)
- if (COMPILER_BASENAME MATCHES
"^(.+-)(clan)?[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
+ if (COMPILER_BASENAME MATCHES
"^(.+-)(clan)?[gc]\\+\\+(-[0-9]+(\\.[0-9]+)*)?(-[^.]+)?(\\.exe)?$")
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
+ set(_CMAKE_COMPILER_SUFFIX ${CMAKE_MATCH_5})
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if(CMAKE_CXX_COMPILER_TARGET)
set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
diff --git a/Modules/Compiler/GNU-FindBinUtils.cmake
b/Modules/Compiler/GNU-FindBinUtils.cmake
index 16b7bbd..097fbf3 100644
--- a/Modules/Compiler/GNU-FindBinUtils.cmake
+++ b/Modules/Compiler/GNU-FindBinUtils.cmake
@@ -18,7 +18,7 @@ get_filename_component(__gcc_hints
"${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPIL
find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x_y}"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x}"
- "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar"
+ "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${_CMAKE_COMPILER_SUFFIX}"
HINTS ${__gcc_hints}
DOC "A wrapper around 'ar' adding the appropriate '--plugin' option for
the GCC compiler"
)
@@ -28,7 +28,7 @@
mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x_y}"
"${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x}"
- "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib"
+ "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib${_CMAKE_COMPILER_SUFFIX}"
HINTS ${__gcc_hints}
DOC "A wrapper around 'ranlib' adding the appropriate '--plugin' option
for the GCC compiler"
)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd45f23b0142fb92de17458dd69b2b6f967f94bd
commit dd45f23b0142fb92de17458dd69b2b6f967f94bd
Author: Patrick Gansterer <par...@paroga.com>
AuthorDate: Tue Feb 5 06:51:20 2019 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 6 11:20:57 2019 -0500
FindCups: add imported target
diff --git a/Help/release/dev/FindCups-imported-target.rst
b/Help/release/dev/FindCups-imported-target.rst
new file mode 100644
index 0000000..0fd9178
--- /dev/null
+++ b/Help/release/dev/FindCups-imported-target.rst
@@ -0,0 +1,4 @@
+FindCups-imported-target
+------------------------
+
+* The :module:`FindCups` module now provides imported targets.
diff --git a/Modules/FindCups.cmake b/Modules/FindCups.cmake
index 10ce229..27105b9 100644
--- a/Modules/FindCups.cmake
+++ b/Modules/FindCups.cmake
@@ -5,18 +5,38 @@
FindCups
--------
-Try to find the Cups printing system
+Find the CUPS printing system.
-Once done this will define
+Set CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE to TRUE if you need a version which
+features this function (i.e. at least 1.1.19)
-::
+Imported targets
+^^^^^^^^^^^^^^^^
- CUPS_FOUND - system has Cups
- CUPS_INCLUDE_DIR - the Cups include directory
- CUPS_LIBRARIES - Libraries needed to use Cups
- CUPS_VERSION_STRING - version of Cups found (since CMake 2.8.8)
- Set CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE to TRUE if you need a version which
- features this function (i.e. at least 1.1.19)
+This module defines :prop_tgt:`IMPORTED` target ``Cups::Cups``, if Cups has
+been found.
+
+Result variables
+^^^^^^^^^^^^^^^^
+
+This module will set the following variables in your project:
+
+``CUPS_FOUND``
+ true if CUPS headers and libraries were found
+``CUPS_INCLUDE_DIRS``
+ the directory containing the Cups headers
+``CUPS_LIBRARIES``
+ the libraries to link against to use CUPS.
+``CUPS_VERSION_STRING``
+ the version of CUPS found (since CMake 2.8.8)
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``CUPS_INCLUDE_DIR``
+ the directory containing the Cups headers
#]=======================================================================]
find_path(CUPS_INCLUDE_DIR cups/cups.h )
@@ -66,3 +86,13 @@ else ()
endif ()
mark_as_advanced(CUPS_INCLUDE_DIR CUPS_LIBRARIES)
+
+if (CUPS_FOUND)
+ set(CUPS_INCLUDE_DIRS "${CUPS_INCLUDE_DIR}")
+ if (NOT TARGET Cups::Cups)
+ add_library(Cups::Cups INTERFACE IMPORTED)
+ set_target_properties(Cups::Cups PROPERTIES
+ INTERFACE_LINK_LIBRARIES "${CUPS_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${CUPS_INCLUDE_DIR}")
+ endif ()
+endif ()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ed98d97..b5bcdd5 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1413,6 +1413,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
add_subdirectory(FindCURL)
endif()
+ if(CMake_TEST_FindCups)
+ add_subdirectory(FindCups)
+ endif()
+
if(CMake_TEST_FindDoxygen)
add_subdirectory(FindDoxygen)
endif()
diff --git a/Tests/FindCups/CMakeLists.txt b/Tests/FindCups/CMakeLists.txt
new file mode 100644
index 0000000..5be1ac1
--- /dev/null
+++ b/Tests/FindCups/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_test(NAME FindCups.Test COMMAND
+ ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/FindCups/Test"
+ "${CMake_BINARY_DIR}/Tests/FindCups/Test"
+ ${build_generator_args}
+ --build-project FindCups
+ --build-options ${build_options}
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
+ )
diff --git a/Tests/FindCups/Test/CMakeLists.txt
b/Tests/FindCups/Test/CMakeLists.txt
new file mode 100644
index 0000000..9e90553
--- /dev/null
+++ b/Tests/FindCups/Test/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.10)
+project(TestFindCups C)
+include(CTest)
+
+find_package(Cups REQUIRED)
+
+add_definitions(-DCMAKE_EXPECTED_CUPS_VERSION="${CUPS_VERSION_STRING}")
+
+add_executable(test_tgt main.c)
+target_link_libraries(test_tgt Cups::Cups)
+add_test(NAME test_tgt COMMAND test_tgt)
+
+add_executable(test_var main.c)
+target_include_directories(test_var PRIVATE ${CUPS_INCLUDE_DIRS})
+target_link_libraries(test_var PRIVATE ${CUPS_LIBRARIES})
+add_test(NAME test_var COMMAND test_var)
diff --git a/Tests/FindCups/Test/main.c b/Tests/FindCups/Test/main.c
new file mode 100644
index 0000000..b69d621
--- /dev/null
+++ b/Tests/FindCups/Test/main.c
@@ -0,0 +1,12 @@
+#include <cups/cups.h>
+
+int main()
+{
+ int num_options = 0;
+ cups_option_t* options = NULL;
+
+ num_options = cupsAddOption(CUPS_COPIES, "1", num_options, &options);
+ cupsFreeOptions(num_options, options);
+
+ return 0;
+}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=562ea5d0e200a5e005ef33dca45a7d08a5e8fbb7
commit 562ea5d0e200a5e005ef33dca45a7d08a5e8fbb7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 6 09:12:24 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 6 10:17:02 2019 -0500
Tests: Add a way to configure custom options for FortranModules test
Read an undocumented cache entry to allow some CI builds to configure
this test in a special way.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ed98d97..86ad72c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3373,6 +3373,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--build-options ${build_options}
-DCMake_TEST_NESTED_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-DCMake_TEST_Fortran_SUBMODULES:BOOL=${CMake_TEST_Fortran_SUBMODULES}
+ ${CMake_TEST_FortranModules_BUILD_OPTIONS}
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/FortranModules")
endif()
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindCups-imported-target.rst | 4 +++
Modules/CMakeDetermineCCompiler.cmake | 3 +-
Modules/CMakeDetermineCXXCompiler.cmake | 3 +-
Modules/Compiler/GNU-FindBinUtils.cmake | 4 +--
Modules/FindCups.cmake | 48 ++++++++++++++++++++++-----
Tests/CMakeLists.txt | 5 +++
Tests/{FindGit => FindCups}/CMakeLists.txt | 8 ++---
Tests/FindCups/Test/CMakeLists.txt | 16 +++++++++
Tests/FindCups/Test/main.c | 12 +++++++
9 files changed, 86 insertions(+), 17 deletions(-)
create mode 100644 Help/release/dev/FindCups-imported-target.rst
copy Tests/{FindGit => FindCups}/CMakeLists.txt (55%)
create mode 100644 Tests/FindCups/Test/CMakeLists.txt
create mode 100644 Tests/FindCups/Test/main.c
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
