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 0e5a3ae7a9161628ff0de65a31cc1a870803fc17 (commit) via 93b80638ce9d034e9574c526aa5378ea4fc8801e (commit) via e0e109611a7c22ea4fe80cac38ba495ec19d1e07 (commit) via 4abdb1900aa47d714633f8ec9576d76781ee2f79 (commit) via 2e133ca30b46d0d189d4ced92d2794e2fccf78db (commit) via c11e7c5c3d5c5e682adf761c4b0de734ff68e690 (commit) via 466ad466b44561c8d48360fed0e491b3c09313be (commit) via f0da223ff0ddd2b1dcc5112d7df920b23515cbd3 (commit) via 9fc87ef2e712eda340457811a1e1ac0af3e70bb5 (commit) via 08f4b5dcf9243754a3b6f88fc61d0c99578b08f6 (commit) via cd6f0ef35a9a7669e95219684f3a8398932a1b4d (commit) from 220d5995076f794e222c882963fb634169a6600b (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=0e5a3ae7a9161628ff0de65a31cc1a870803fc17 commit 0e5a3ae7a9161628ff0de65a31cc1a870803fc17 Merge: 93b8063 c11e7c5 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Oct 16 13:51:24 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Oct 16 09:51:32 2019 -0400 Merge topic 'FindCURL-cmake-package' c11e7c5c3d FindCURL: Try to find CURLConfig.cmake Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3903 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93b80638ce9d034e9574c526aa5378ea4fc8801e commit 93b80638ce9d034e9574c526aa5378ea4fc8801e Merge: e0e1096 f0da223 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Oct 16 13:43:16 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Oct 16 09:45:59 2019 -0400 Merge topic 'CMakeFindBinUtils-cleanup' f0da223ff0 CMakeFindBinUtils: Remove unnecessary variable unset calls Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3920 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0e109611a7c22ea4fe80cac38ba495ec19d1e07 commit e0e109611a7c22ea4fe80cac38ba495ec19d1e07 Merge: 4abdb19 466ad46 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Oct 16 13:43:26 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Oct 16 09:45:11 2019 -0400 Merge topic 'swift-cross-compile' 466ad466b4 try_compile: support Swift for cross-compilation Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3921 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4abdb1900aa47d714633f8ec9576d76781ee2f79 commit 4abdb1900aa47d714633f8ec9576d76781ee2f79 Merge: 2e133ca 9fc87ef Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Oct 16 13:43:11 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Oct 16 09:44:08 2019 -0400 Merge topic 'FindCurses-tinfow' 9fc87ef2e7 FindCurses: use tinfow when wide support is requested Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3915 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e133ca30b46d0d189d4ced92d2794e2fccf78db commit 2e133ca30b46d0d189d4ced92d2794e2fccf78db Merge: 220d599 08f4b5d Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Oct 16 13:43:04 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Oct 16 09:43:12 2019 -0400 Merge topic 'FindHDF5-cray' 08f4b5dcf9 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references cd6f0ef35a FindHDF5: Cray HDF5 Fortran module filename is usually capitalized Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3918 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c11e7c5c3d5c5e682adf761c4b0de734ff68e690 commit c11e7c5c3d5c5e682adf761c4b0de734ff68e690 Author: Charles Barto <chba...@microsoft.com> AuthorDate: Thu Oct 10 16:29:00 2019 -0700 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 15 13:56:28 2019 -0400 FindCURL: Try to find CURLConfig.cmake diff --git a/Help/release/dev/FindCURL-cmake-package.rst b/Help/release/dev/FindCURL-cmake-package.rst new file mode 100644 index 0000000..67c5bbc --- /dev/null +++ b/Help/release/dev/FindCURL-cmake-package.rst @@ -0,0 +1,7 @@ +FindCURL-cmake-package +---------------------- + +* The :module:`FindCURL` module learned to find CURL using + the ``CURLConfig.cmake`` package configuration file generated by + CURL's cmake buildsystem. It also gained a new ``CURL_NO_CURL_CMAKE`` + option to disable this behavior. diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index aeebc84..919babc 100644 --- a/Modules/FindCURL.cmake +++ b/Modules/FindCURL.cmake @@ -37,8 +37,35 @@ This module defines the following variables: ``CURL_VERSION_STRING`` The version of ``curl`` found. + +CURL CMake +^^^^^^^^^^ + +If CURL was built using the CMake buildsystem then it provides its own +``CURLConfig.cmake`` file for use with the :command:`find_package` command's +config mode. This module looks for this file and, if found, +returns its results with no further action. + +Set ``CURL_NO_CURL_CMAKE`` to ``ON`` to disable this search. + #]=======================================================================] +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) + +if(NOT CURL_NO_CURL_CMAKE) + # do a find package call to specifically look for the CMake version + # of curl + find_package(CURL QUIET NO_MODULE) + mark_as_advanced(CURL_DIR) + + # if we found the CURL cmake package then we are done, and + # can print what we found and return. + if(CURL_FOUND) + find_package_handle_standard_args(CURL HANDLE_COMPONENTS CONFIG_MODE) + return() + endif() +endif() + find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) pkg_check_modules(PC_CURL QUIET libcurl) @@ -139,7 +166,6 @@ if(CURL_FIND_COMPONENTS) endforeach() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(CURL REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR VERSION_VAR CURL_VERSION_STRING https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=466ad466b44561c8d48360fed0e491b3c09313be commit 466ad466b44561c8d48360fed0e491b3c09313be Author: Saleem Abdulrasool <compn...@compnerd.org> AuthorDate: Tue Oct 15 09:24:35 2019 -0700 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 15 13:25:14 2019 -0400 try_compile: support Swift for cross-compilation Ensure that we preserve the `CMAKE_Swift_COMPILER_TARGET` variable to use cross-compilation for testing the Swift compiler if appropriate. diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 515f446..910cc9d 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -56,6 +56,8 @@ static std::string const kCMAKE_POSITION_INDEPENDENT_CODE = static std::string const kCMAKE_SYSROOT = "CMAKE_SYSROOT"; static std::string const kCMAKE_SYSROOT_COMPILE = "CMAKE_SYSROOT_COMPILE"; static std::string const kCMAKE_SYSROOT_LINK = "CMAKE_SYSROOT_LINK"; +static std::string const kCMAKE_Swift_COMPILER_TARGET = + "CMAKE_Swift_COMPILER_TARGET"; static std::string const kCMAKE_TRY_COMPILE_OSX_ARCHITECTURES = "CMAKE_TRY_COMPILE_OSX_ARCHITECTURES"; static std::string const kCMAKE_TRY_COMPILE_PLATFORM_VARIABLES = @@ -671,6 +673,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, vars.insert(kCMAKE_SYSROOT); vars.insert(kCMAKE_SYSROOT_COMPILE); vars.insert(kCMAKE_SYSROOT_LINK); + vars.insert(kCMAKE_Swift_COMPILER_TARGET); vars.insert(kCMAKE_WARN_DEPRECATED); vars.emplace("CMAKE_MSVC_RUNTIME_LIBRARY"_s); https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0da223ff0ddd2b1dcc5112d7df920b23515cbd3 commit f0da223ff0ddd2b1dcc5112d7df920b23515cbd3 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Oct 15 11:07:42 2019 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 15 11:09:06 2019 -0400 CMakeFindBinUtils: Remove unnecessary variable unset calls Some unset calls were added by commit 079b8e2916 (Clang: prefer lld-link over link.exe, 2019-07-11, v3.16.0-rc1~161^2~2) but they are unnecessary since commit 3a82ef78eb (CMakeFindBinUtils: Rename and unset variables for additional names, 2019-07-23, v3.16.0-rc1~332^2~2). Suggested-by: Norbert Lange <nolang...@gmail.com> diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index 3887b2d..69ace5a 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -167,18 +167,6 @@ else() HINTS ${_CMAKE_TOOLCHAIN_LOCATION}) list(APPEND _CMAKE_TOOL_VARS AR RANLIB STRIP LINKER NM OBJDUMP OBJCOPY READELF DLLTOOL ADDR2LINE) - - - unset(_CMAKE_ADDITIONAL_AR_NAMES) - unset(_CMAKE_ADDITIONAL_RANLIB_NAMES) - unset(_CMAKE_ADDITIONAL_STRIP_NAMES) - unset(_CMAKE_ADDITIONAL_LINKER_NAMES) - unset(_CMAKE_ADDITIONAL_NM_NAMES) - unset(_CMAKE_ADDITIONAL_OBJDUMP_NAMES) - unset(_CMAKE_ADDITIONAL_OBJCOPY_NAMES) - unset(_CMAKE_ADDITIONAL_READELF_NAMES) - unset(_CMAKE_ADDITIONAL_DLLTOOL_NAMES) - unset(_CMAKE_ADDITIONAL_ADDR2LINE_NAMES) endif() if(CMAKE_PLATFORM_HAS_INSTALLNAME) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fc87ef2e712eda340457811a1e1ac0af3e70bb5 commit 9fc87ef2e712eda340457811a1e1ac0af3e70bb5 Author: Manuel Herrmann <0...@0x17.de> AuthorDate: Sun Oct 13 01:12:33 2019 +0200 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 15 09:50:52 2019 -0400 FindCurses: use tinfow when wide support is requested diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index 5abc08a..ad40522 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -134,11 +134,13 @@ if(CURSES_USE_NCURSES) endif() if (CURSES_NEED_WIDE) + set(CURSES_TINFO_LIBRARY_NAME tinfow) find_path(CURSES_INCLUDE_PATH NAMES ncursesw/ncurses.h ncursesw/curses.h ncursesw.h cursesw.h HINTS "${_cursesParentDir}/include" ) else() + set(CURSES_TINFO_LIBRARY_NAME tinfo) find_path(CURSES_INCLUDE_PATH NAMES ncurses/ncurses.h ncurses/curses.h ncurses.h curses.h HINTS "${_cursesParentDir}/include" @@ -153,8 +155,8 @@ if(CURSES_USE_NCURSES) CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" cbreak "" CURSES_NCURSES_HAS_CBREAK) if(NOT CURSES_NCURSES_HAS_CBREAK) - find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}") - find_library(CURSES_EXTRA_LIBRARY tinfo ) + find_library(CURSES_EXTRA_LIBRARY "${CURSES_TINFO_LIBRARY_NAME}" HINTS "${_cursesLibDir}") + find_library(CURSES_EXTRA_LIBRARY "${CURSES_TINFO_LIBRARY_NAME}" ) endif() else() get_filename_component(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08f4b5dcf9243754a3b6f88fc61d0c99578b08f6 commit 08f4b5dcf9243754a3b6f88fc61d0c99578b08f6 Author: Willem Deconinck <willem.deconi...@ecmwf.int> AuthorDate: Tue Oct 15 10:37:12 2019 +0000 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 15 09:47:58 2019 -0400 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 1823ea7..b488418 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -761,7 +761,7 @@ mark_as_advanced( HDF5_DIFF_EXECUTABLE ) if( NOT HDF5_FOUND ) # seed the initial lists of libraries to find with items we know we need set(HDF5_C_LIBRARY_NAMES hdf5) - set(HDF5_C_HL_LIBRARY_NAMES hdf5_hl) + set(HDF5_C_HL_LIBRARY_NAMES hdf5_hl ${HDF5_C_LIBRARY_NAMES} ) set(HDF5_CXX_LIBRARY_NAMES hdf5_cpp ${HDF5_C_LIBRARY_NAMES}) set(HDF5_CXX_HL_LIBRARY_NAMES hdf5_hl_cpp ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_CXX_LIBRARY_NAMES}) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd6f0ef35a9a7669e95219684f3a8398932a1b4d commit cd6f0ef35a9a7669e95219684f3a8398932a1b4d Author: Willem Deconinck <willem.deconi...@ecmwf.int> AuthorDate: Tue Oct 15 09:08:29 2019 +0000 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 15 09:47:58 2019 -0400 FindHDF5: Cray HDF5 Fortran module filename is usually capitalized diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 08863c8..1823ea7 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -772,7 +772,7 @@ if( NOT HDF5_FOUND ) foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS) # find the HDF5 include directories if("${__lang}" STREQUAL "Fortran") - set(HDF5_INCLUDE_FILENAME hdf5.mod) + set(HDF5_INCLUDE_FILENAME hdf5.mod HDF5.mod) elseif("${__lang}" STREQUAL "CXX") set(HDF5_INCLUDE_FILENAME H5Cpp.h) else() ----------------------------------------------------------------------- Summary of changes: Help/release/dev/FindCURL-cmake-package.rst | 7 +++++++ Modules/CMakeFindBinUtils.cmake | 12 ------------ Modules/FindCURL.cmake | 28 +++++++++++++++++++++++++++- Modules/FindCurses.cmake | 6 ++++-- Modules/FindHDF5.cmake | 4 ++-- Source/cmCoreTryCompile.cxx | 3 +++ 6 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 Help/release/dev/FindCURL-cmake-package.rst hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits