[Cmake-commits] CMake branch, master, updated. v3.10.1-778-g6633535
Kitware Robot
kwrobot at kitware.com
Thu Jan 11 10:25:07 EST 2018
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 66335350a35e37b347034e81b1d4c5f9218f22d5 (commit)
via 2d5fdc25df8c8b9f10282b8cbc07cf86f2e0c9b8 (commit)
via 30fcb925762280b3a904f8f2598449927414ebd6 (commit)
via fe8d74cc6022b814f08486df3b575c1dbe875f18 (commit)
via 3f4924aa60889dd2a34a2a1ba6877528779867d0 (commit)
via 37a3738b1a67c5c2c98847e1d1856e40dc98363f (commit)
via 45f287212998c7ed8f928ef3b95f44acbaedc83f (commit)
via 6c3f374e99cccc65024dc5a94a410fd46cbad16d (commit)
via d91b2d9158cbe5d65bfcc8f7512503d7f226ad91 (commit)
via a91fde135d8a9fb03a28d0760f0c052a26350b91 (commit)
via da3a329a0642818070f276c9a40c94b54792e2b8 (commit)
via 6297d6c7fd6f80dafe17c0aefeeb0439432aa4b0 (commit)
via d56deff7d127b030739bd0034609d0046121d8cd (commit)
via b044f69a413123f15a05034c00a8e3763764a1e5 (commit)
via b1e9f67137733bc109d355450fcd06edda4784c5 (commit)
via 433a2d495a2481c63b82c11a30f7c642d6abe63f (commit)
via efd279cdfb64f1ca9ab2dd55c55e836634431198 (commit)
via f09fda97d88094d56d0f8f40fa361b920feccd46 (commit)
from 8f1666b207ff2ea69b822eaf79b25192029db846 (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=66335350a35e37b347034e81b1d4c5f9218f22d5
commit 66335350a35e37b347034e81b1d4c5f9218f22d5
Merge: 2d5fdc2 6c3f374
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 11 15:22:29 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 11 10:23:08 2018 -0500
Merge topic 'msvc-asm'
6c3f374e MSVC: Avoid warning when enabling ASM language with C compiler
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1655
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d5fdc25df8c8b9f10282b8cbc07cf86f2e0c9b8
commit 2d5fdc25df8c8b9f10282b8cbc07cf86f2e0c9b8
Merge: 30fcb92 efd279c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 11 15:19:18 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 11 10:19:25 2018 -0500
Merge topic 'specify-source-extensions'
efd279cd cmake: specify source file extensions
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1645
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30fcb925762280b3a904f8f2598449927414ebd6
commit 30fcb925762280b3a904f8f2598449927414ebd6
Merge: fe8d74c d91b2d9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 11 15:18:34 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 11 10:18:54 2018 -0500
Merge topic 'misc-typos'
d91b2d91 MAINT: Misc. typos
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1654
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe8d74cc6022b814f08486df3b575c1dbe875f18
commit fe8d74cc6022b814f08486df3b575c1dbe875f18
Merge: 3f4924a a91fde1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 11 15:18:06 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 11 10:18:11 2018 -0500
Merge topic 'cuda_msvc_support_complex_gencode_signatures'
a91fde13 CUDA: gencode signature that list multiple code types now supported.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1618
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f4924aa60889dd2a34a2a1ba6877528779867d0
commit 3f4924aa60889dd2a34a2a1ba6877528779867d0
Merge: 37a3738 6297d6c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 11 15:16:51 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 11 10:16:55 2018 -0500
Merge topic 'FindBoost-1.66'
6297d6c7 FindBoost: Generate imported targets for future Boost versions
d56deff7 FindBoost: Search for upstream-packaged libs next to includes
b044f69a FindBoost: Implement "Architecture and Address Model" tag
b1e9f671 FindBoost: Fix incorrect alphabetisation of headers list
433a2d49 FindBoost: Boost 1.66.0 dependency and release update
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Jason Juang <jasjuang at gmail.com>
Merge-request: !1625
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37a3738b1a67c5c2c98847e1d1856e40dc98363f
commit 37a3738b1a67c5c2c98847e1d1856e40dc98363f
Merge: 45f2872 da3a329
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 11 15:15:36 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 11 10:16:01 2018 -0500
Merge topic 'doc-fixes'
da3a329a Linkify target_link_libraries in DEBUG_CONFIGURATIONS
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1649
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45f287212998c7ed8f928ef3b95f44acbaedc83f
commit 45f287212998c7ed8f928ef3b95f44acbaedc83f
Merge: 8f1666b f09fda9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 11 15:15:20 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 11 10:15:27 2018 -0500
Merge topic 'doc-install-arg-order'
f09fda97 Help: improve install() documentation of argument ordering
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1641
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c3f374e99cccc65024dc5a94a410fd46cbad16d
commit 6c3f374e99cccc65024dc5a94a410fd46cbad16d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 10 14:04:04 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 10 14:04:04 2018 -0500
MSVC: Avoid warning when enabling ASM language with C compiler
The `CMakeASMInformation` module warns when no compiler-specific module
is found for the `ASM` language. Add a minimal `Compiler/MSVC-ASM`
module to avoid the warning for MSVC.
Fixes: #17532
diff --git a/Modules/Compiler/MSVC-ASM.cmake b/Modules/Compiler/MSVC-ASM.cmake
new file mode 100644
index 0000000..45978c5
--- /dev/null
+++ b/Modules/Compiler/MSVC-ASM.cmake
@@ -0,0 +1 @@
+# This file is loaded when Visual Studio is used for the ASM language.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d91b2d9158cbe5d65bfcc8f7512503d7f226ad91
commit d91b2d9158cbe5d65bfcc8f7512503d7f226ad91
Author: luz.paz <luzpaz at users.noreply.github.com>
AuthorDate: Wed Jan 10 12:34:14 2018 -0500
Commit: luz.paz <luzpaz at users.noreply.github.com>
CommitDate: Wed Jan 10 12:34:14 2018 -0500
MAINT: Misc. typos
Found via `codespell`
diff --git a/Help/release/dev/iphone-deployment-target.rst b/Help/release/dev/iphone-deployment-target.rst
index e586df6..7a20a6d 100644
--- a/Help/release/dev/iphone-deployment-target.rst
+++ b/Help/release/dev/iphone-deployment-target.rst
@@ -7,5 +7,5 @@ iphone-deployment-target
set for the target platform selected by :variable:`CMAKE_OSX_SYSROOT`.
If for example the sysroot variable specifies an iOS SDK then the
- value in ``CMAKE_OSX_DEPLOYMENT_TARGET`` is interpreted as minium
+ value in ``CMAKE_OSX_DEPLOYMENT_TARGET`` is interpreted as minimum
iOS version.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 321121c..0decbb5 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -104,7 +104,7 @@
# CUDA_NVCC_FLAGS_<CONFIG> variables. For Visual Studio targets,
# the host compiler is constructed with one or more visual studio macros
# such as $(VCInstallDir), that expands out to the path when
-# the command is run from withing VS.
+# the command is run from within VS.
#
# CUDA_NVCC_FLAGS
# CUDA_NVCC_FLAGS_<CONFIG>
diff --git a/Tests/FindOpenSSL/rand/main.cc b/Tests/FindOpenSSL/rand/main.cc
index d81b318..147044b 100644
--- a/Tests/FindOpenSSL/rand/main.cc
+++ b/Tests/FindOpenSSL/rand/main.cc
@@ -9,7 +9,7 @@ int main()
unsigned char buf[1024];
// random bytes
- int rezval = RAND_bytes(buf, sizeof(buf)); /* 1 succes, 0 otherwise */
+ int rezval = RAND_bytes(buf, sizeof(buf)); /* 1 success, 0 otherwise */
// check result
if (rezval == 1) {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a91fde135d8a9fb03a28d0760f0c052a26350b91
commit a91fde135d8a9fb03a28d0760f0c052a26350b91
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Dec 21 16:26:27 2017 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Jan 10 10:45:57 2018 -0500
CUDA: gencode signature that list multiple code types now supported.
Fixes #17263
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index 4f3d737..06adc10 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -239,20 +239,32 @@ void cmVisualStudioGeneratorOptions::FixCudaCodeGeneration()
// It translates to -arch=<virtual> -code=<real>.
cmSystemTools::ReplaceString(arch_name, "sm_", "compute_");
}
- for (std::vector<std::string>::iterator ci = codes.begin();
- ci != codes.end(); ++ci) {
- std::string entry = arch_name + "," + *ci;
+ for (auto const& c : codes) {
+ std::string entry = arch_name + "," + c;
result.push_back(entry);
}
}
- // Now add entries for the -gencode=<arch>,<code> pairs.
- for (std::vector<std::string>::iterator ei = gencode.begin();
- ei != gencode.end(); ++ei) {
- std::string entry = *ei;
+ // Now add entries for the following signatures:
+ // -gencode=<arch>,<code>
+ // -gencode=<arch>,[<code1>,<code2>]
+ // -gencode=<arch>,"<code1>,<code2>"
+ for (auto const& e : gencode) {
+ std::string entry = e;
cmSystemTools::ReplaceString(entry, "arch=", "");
cmSystemTools::ReplaceString(entry, "code=", "");
- result.push_back(entry);
+ cmSystemTools::ReplaceString(entry, "[", "");
+ cmSystemTools::ReplaceString(entry, "]", "");
+ cmSystemTools::ReplaceString(entry, "\"", "");
+
+ std::vector<std::string> codes = cmSystemTools::tokenize(entry, ",");
+ if (codes.size() >= 2) {
+ auto gencode_arch = cm::cbegin(codes);
+ for (auto ci = gencode_arch + 1; ci != cm::cend(codes); ++ci) {
+ std::string code_entry = *gencode_arch + "," + *ci;
+ result.push_back(code_entry);
+ }
+ }
}
}
diff --git a/Tests/CudaOnly/ResolveDeviceSymbols/CMakeLists.txt b/Tests/CudaOnly/ResolveDeviceSymbols/CMakeLists.txt
index 83473ae..0c453a9 100644
--- a/Tests/CudaOnly/ResolveDeviceSymbols/CMakeLists.txt
+++ b/Tests/CudaOnly/ResolveDeviceSymbols/CMakeLists.txt
@@ -21,7 +21,7 @@ endif()
# Resolve the device symbols into that static library
# Verify that we can't use those device symbols from anything that links
# to the static library
-string(APPEND CMAKE_CUDA_FLAGS " -gencode arch=compute_30,code=compute_30")
+string(APPEND CMAKE_CUDA_FLAGS " -gencode arch=compute_30,code=[compute_30] -gencode arch=compute_50,code=\\\"compute_50\\\"")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CUDA_STANDARD 11)
diff --git a/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt b/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt
index cfca823..c934c51 100644
--- a/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt
+++ b/Tests/CudaOnly/SeparateCompilation/CMakeLists.txt
@@ -9,7 +9,8 @@ project (CudaOnlySeparateCompilation CUDA)
#and executables.
#We complicate the matter by also testing that multiple static libraries
#all containing cuda separable compilation code links properly
-string(APPEND CMAKE_CUDA_FLAGS " -gencode arch=compute_30,code=compute_30")
+string(APPEND CMAKE_CUDA_FLAGS " -gencode arch=compute_30,code=\\\"compute_30,sm_30,sm_35\\\"")
+string(APPEND CMAKE_CUDA_FLAGS " --generate-code=arch=compute_50,code=[compute_50,sm_50,sm_52]")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CUDA_STANDARD 11)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da3a329a0642818070f276c9a40c94b54792e2b8
commit da3a329a0642818070f276c9a40c94b54792e2b8
Author: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
AuthorDate: Thu Jan 11 00:00:30 2018 +1100
Commit: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
CommitDate: Thu Jan 11 00:00:30 2018 +1100
Linkify target_link_libraries in DEBUG_CONFIGURATIONS
diff --git a/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst b/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
index 690143f..fec6fda 100644
--- a/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
+++ b/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
@@ -4,11 +4,10 @@ DEBUG_CONFIGURATIONS
Specify which configurations are for debugging.
The value must be a semi-colon separated list of configuration names.
-Currently this property is used only by the target_link_libraries
-command (see its documentation for details). Additional uses may be
-defined in the future.
+Currently this property is used only by the :command:`target_link_libraries`
+command. Additional uses may be defined in the future.
This property must be set at the top level of the project and before
-the first target_link_libraries command invocation. If any entry in
+the first :command:`target_link_libraries` command invocation. If any entry in
the list does not match a valid configuration for the project the
behavior is undefined.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6297d6c7fd6f80dafe17c0aefeeb0439432aa4b0
commit 6297d6c7fd6f80dafe17c0aefeeb0439432aa4b0
Author: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
AuthorDate: Sat Dec 30 16:00:29 2017 +1100
Commit: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
CommitDate: Wed Jan 10 17:17:32 2018 +1100
FindBoost: Generate imported targets for future Boost versions
Per discussion on cmake/cmake#17575, this protection not particularly
valuable, as the dependency information which the imported targets wrap
is generated anyway.
This removes a road-block for using `Boost_ADDITIONAL_VERSIONS` to
support newly-released Boost versions pending a new CMake release.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 479c831..ca2a9c5 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -793,7 +793,6 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
endif()
if(NOT Boost_VERSION VERSION_LESS 106700)
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
- set(_Boost_IMPORTED_TARGETS FALSE)
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d56deff7d127b030739bd0034609d0046121d8cd
commit d56deff7d127b030739bd0034609d0046121d8cd
Author: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
AuthorDate: Fri Dec 29 22:38:36 2017 +1100
Commit: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
CommitDate: Wed Jan 10 17:17:27 2018 +1100
FindBoost: Search for upstream-packaged libs next to includes
Upstream packages Boost binaries for Windows with the 'boost' directory
(the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR).
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 4b34802..479c831 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1496,6 +1496,7 @@ foreach(c DEBUG RELEASE)
${Boost_INCLUDE_DIR}/stage/lib
)
_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..")
+ _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}")
if( Boost_NO_SYSTEM_PATHS )
list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
else()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b044f69a413123f15a05034c00a8e3763764a1e5
commit b044f69a413123f15a05034c00a8e3763764a1e5
Author: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
AuthorDate: Fri Dec 29 21:50:54 2017 +1100
Commit: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
CommitDate: Wed Jan 10 17:17:20 2018 +1100
FindBoost: Implement "Architecture and Address Model" tag
This tag is new in Boost 1.66.0, and is present in the 'versioned'
library file name layout.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 734a93c..4b34802 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1379,8 +1379,11 @@ if(Boost_DEBUG)
endif()
#======================
-# Systematically build up the Boost ABI tag
-# http://boost.org/doc/libs/1_41_0/more/getting_started/windows.html#library-naming
+# Systematically build up the Boost ABI tag for the 'tagged' and 'versioned' layouts
+# http://boost.org/doc/libs/1_66_0/more/getting_started/windows.html#library-naming
+# http://boost.org/doc/libs/1_66_0/boost/config/auto_link.hpp
+# http://boost.org/doc/libs/1_66_0/tools/build/src/tools/common.jam
+# http://boost.org/doc/libs/1_66_0/boostcpp.jam
set( _boost_RELEASE_ABI_TAG "-")
set( _boost_DEBUG_ABI_TAG "-")
# Key Use this library when:
@@ -1412,11 +1415,40 @@ if(Boost_USE_STLPORT)
string(APPEND _boost_DEBUG_ABI_TAG "p")
endif()
# n using the STLport deprecated "native iostreams" feature
+# removed from the documentation in 1.43.0 but still present in
+# boost/config/auto_link.hpp
if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)
string(APPEND _boost_RELEASE_ABI_TAG "n")
string(APPEND _boost_DEBUG_ABI_TAG "n")
endif()
+# -x86 Architecture and address model tag
+# First character is the architecture, then word-size, either 32 or 64
+# Only used in 'versioned' layout, added in Boost 1.66.0
+set(_boost_ARCHITECTURE_TAG "")
+# {CMAKE_CXX_COMPILER_ARCHITECTURE_ID} is not currently set for all compilers
+if(NOT "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "x" AND NOT Boost_VERSION VERSION_LESS 106600)
+ string(APPEND _boost_ARCHITECTURE_TAG "-")
+ # This needs to be kept in-sync with the section of CMakePlatformId.h.in
+ # inside 'defined(_WIN32) && defined(_MSC_VER)'
+ if(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "IA64")
+ string(APPEND _boost_ARCHITECTURE_TAG "i")
+ elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "X86"
+ OR ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "x64")
+ string(APPEND _boost_ARCHITECTURE_TAG "x")
+ elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} MATCHES "^ARM")
+ string(APPEND _boost_ARCHITECTURE_TAG "a")
+ elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "MIPS")
+ string(APPEND _boost_ARCHITECTURE_TAG "m")
+ endif()
+
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ string(APPEND _boost_ARCHITECTURE_TAG "64")
+ else()
+ string(APPEND _boost_ARCHITECTURE_TAG "32")
+ endif()
+endif()
+
if(Boost_DEBUG)
message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
"_boost_RELEASE_ABI_TAG = ${_boost_RELEASE_ABI_TAG}")
@@ -1610,22 +1642,22 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
unset(_boost_RELEASE_NAMES)
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_RELEASE_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
endforeach()
list(APPEND _boost_RELEASE_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
if(_boost_STATIC_RUNTIME_WORKAROUND)
set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_RELEASE_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
endforeach()
list(APPEND _boost_RELEASE_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
endif()
if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
@@ -1660,11 +1692,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
unset(_boost_DEBUG_NAMES)
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_DEBUG_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
endforeach()
list(APPEND _boost_DEBUG_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
@@ -1672,11 +1704,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(APPEND _boost_DEBUG_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
endforeach()
list(APPEND _boost_DEBUG_NAMES
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
endif()
if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1e9f67137733bc109d355450fcd06edda4784c5
commit b1e9f67137733bc109d355450fcd06edda4784c5
Author: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
AuthorDate: Fri Dec 29 20:07:31 2017 +1100
Commit: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
CommitDate: Wed Jan 10 17:17:10 2018 +1100
FindBoost: Fix incorrect alphabetisation of headers list
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 6434dcb..734a93c 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -825,8 +825,8 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
set(_Boost_CONTAINER_HEADERS "boost/container/container_fwd.hpp")
set(_Boost_CONTEXT_HEADERS "boost/context/all.hpp")
set(_Boost_COROUTINE_HEADERS "boost/coroutine/all.hpp")
- set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp")
set(_Boost_DATE_TIME_HEADERS "boost/date_time/date.hpp")
+ set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp")
set(_Boost_FIBER_HEADERS "boost/fiber/all.hpp")
set(_Boost_FILESYSTEM_HEADERS "boost/filesystem/path.hpp")
set(_Boost_GRAPH_HEADERS "boost/graph/adjacency_list.hpp")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=433a2d495a2481c63b82c11a30f7c642d6abe63f
commit 433a2d495a2481c63b82c11a30f7c642d6abe63f
Author: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
AuthorDate: Fri Dec 29 19:55:49 2017 +1100
Commit: Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>
CommitDate: Wed Jan 10 17:16:57 2018 +1100
FindBoost: Boost 1.66.0 dependency and release update
Release notes: http://www.boost.org/users/history/version_1_66_0.html
* All new libraries are header-only.
* _Boost_COMPONENT_DEPENDENCIES is unchanged from 1.65.1
* _Boost_FIBER_COMPILER_FEATURES is unchanged from 1.64.0
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index a0fd90f..6434dcb 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -791,7 +791,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
endif()
- if(NOT Boost_VERSION VERSION_LESS 106600)
+ if(NOT Boost_VERSION VERSION_LESS 106700)
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
set(_Boost_IMPORTED_TARGETS FALSE)
endif()
@@ -925,8 +925,8 @@ endfunction()
# `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
#
function(_Boost_COMPILER_FEATURES component _ret)
- # Boost >= 1.62 and < 1.65
- if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106500)
+ # Boost >= 1.62 and < 1.67
+ if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106700)
set(_Boost_FIBER_COMPILER_FEATURES
cxx_alias_templates
cxx_auto_type
@@ -1032,7 +1032,7 @@ else()
# _Boost_COMPONENT_HEADERS. See the instructions at the top of
# _Boost_COMPONENT_DEPENDENCIES.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.65.1" "1.65.0" "1.65"
+ "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
"1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
"1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
"1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efd279cdfb64f1ca9ab2dd55c55e836634431198
commit efd279cdfb64f1ca9ab2dd55c55e836634431198
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Jan 9 08:01:23 2018 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Jan 9 09:21:09 2018 -0500
cmake: specify source file extensions
diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
index 6023c83..c51b0dd 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -2,19 +2,19 @@
# file Copyright.txt or https://cmake.org/licensing for details.
set( CURSES_SRCS
- CursesDialog/cmCursesOptionsWidget
- CursesDialog/cmCursesBoolWidget
- CursesDialog/cmCursesCacheEntryComposite
- CursesDialog/cmCursesDummyWidget
- CursesDialog/cmCursesFilePathWidget
- CursesDialog/cmCursesForm
- CursesDialog/cmCursesLabelWidget
- CursesDialog/cmCursesLongMessageForm
- CursesDialog/cmCursesMainForm
- CursesDialog/cmCursesPathWidget
- CursesDialog/cmCursesStringWidget
- CursesDialog/cmCursesWidget
- CursesDialog/ccmake
+ CursesDialog/cmCursesOptionsWidget.cxx
+ CursesDialog/cmCursesBoolWidget.cxx
+ CursesDialog/cmCursesCacheEntryComposite.cxx
+ CursesDialog/cmCursesDummyWidget.cxx
+ CursesDialog/cmCursesFilePathWidget.cxx
+ CursesDialog/cmCursesForm.cxx
+ CursesDialog/cmCursesLabelWidget.cxx
+ CursesDialog/cmCursesLongMessageForm.cxx
+ CursesDialog/cmCursesMainForm.cxx
+ CursesDialog/cmCursesPathWidget.cxx
+ CursesDialog/cmCursesStringWidget.cxx
+ CursesDialog/cmCursesWidget.cxx
+ CursesDialog/ccmake.cxx
)
include_directories(${CURSES_INCLUDE_PATH})
diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt
index 9f09185..06df53f 100644
--- a/Tests/CMakeLib/CMakeLists.txt
+++ b/Tests/CMakeLib/CMakeLists.txt
@@ -5,21 +5,21 @@ include_directories(
)
set(CMakeLib_TESTS
- testGeneratedFileStream
- testRST
- testSystemTools
- testUTF8
- testXMLParser
- testXMLSafe
- testFindPackageCommand
- testUVRAII
+ testGeneratedFileStream.cxx
+ testRST.cxx
+ testSystemTools.cxx
+ testUTF8.cxx
+ testXMLParser.cxx
+ testXMLSafe.cxx
+ testFindPackageCommand.cxx
+ testUVRAII.cxx
)
set(testRST_ARGS ${CMAKE_CURRENT_SOURCE_DIR})
if(WIN32)
list(APPEND CMakeLib_TESTS
- testVisualStudioSlnParser
+ testVisualStudioSlnParser.cxx
)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testVisualStudioSlnParser.h.in
${CMAKE_CURRENT_BINARY_DIR}/testVisualStudioSlnParser.h @ONLY)
@@ -38,7 +38,8 @@ set_property(TARGET CMakeLibTests PROPERTY CXX_CLANG_TIDY "")
add_executable(testEncoding testEncoding.cxx)
target_link_libraries(testEncoding cmsys)
-foreach(test ${CMakeLib_TESTS})
+foreach(testfile ${CMakeLib_TESTS})
+ get_filename_component(test "${testfile}" NAME_WE)
add_test(CMakeLib.${test} CMakeLibTests ${test} ${${test}_ARGS})
endforeach()
diff --git a/Tests/CMakeServerLib/CMakeLists.txt b/Tests/CMakeServerLib/CMakeLists.txt
index 5e1ad0c..2c23c2d 100644
--- a/Tests/CMakeServerLib/CMakeLists.txt
+++ b/Tests/CMakeServerLib/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
)
set(CMakeServerLib_TESTS
- testServerBuffering
+ testServerBuffering.cpp
)
create_test_sourcelist(CMakeLib_TEST_SRCS CMakeServerLibTests.cxx ${CMakeServerLib_TESTS})
@@ -15,6 +15,7 @@ target_link_libraries(CMakeServerLibTests CMakeLib CMakeServerLib)
SET_PROPERTY(TARGET CMakeServerLibTests PROPERTY C_CLANG_TIDY "")
SET_PROPERTY(TARGET CMakeServerLibTests PROPERTY CXX_CLANG_TIDY "")
-foreach(test ${CMakeServerLib_TESTS})
+foreach(testfile ${CMakeServerLib_TESTS})
+ get_filename_component(test "${testfile}" NAME_WE)
add_test(CMakeServerLib.${test} CMakeServerLibTests ${test} ${${test}_ARGS})
endforeach()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f09fda97d88094d56d0f8f40fa361b920feccd46
commit f09fda97d88094d56d0f8f40fa361b920feccd46
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Mon Jan 8 11:55:32 2018 -0500
Commit: Kyle Edwards <kyle.edwards at kitware.com>
CommitDate: Mon Jan 8 15:07:30 2018 -0500
Help: improve install() documentation of argument ordering
Fixes #16362.
diff --git a/Help/command/install.rst b/Help/command/install.rst
index f43b2a0..2506f98 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -38,7 +38,21 @@ signatures that specify them. The common options are:
``CONFIGURATIONS``
Specify a list of build configurations for which the install rule
- applies (Debug, Release, etc.).
+ applies (Debug, Release, etc.). Note that the values specified for
+ this option only apply to options listed AFTER the ``CONFIGURATIONS``
+ option. For example, to set separate install paths for the Debug and
+ Release configurations, do the following:
+
+ .. code-block:: cmake
+
+ install(TARGETS target
+ CONFIGURATIONS Debug
+ RUNTIME DESTINATION Debug/bin)
+ install(TARGETS target
+ CONFIGURATIONS Release
+ RUNTIME DESTINATION Release/bin)
+
+ Note that ``CONFIGURATIONS`` appears BEFORE ``RUNTIME DESTINATION``.
``COMPONENT``
Specify an installation component name with which the install rule
-----------------------------------------------------------------------
Summary of changes:
Help/command/install.rst | 16 ++++-
Help/prop_gbl/DEBUG_CONFIGURATIONS.rst | 7 +--
Help/release/dev/iphone-deployment-target.rst | 2 +-
Modules/Compiler/MSVC-ASM.cmake | 1 +
Modules/FindBoost.cmake | 64 +++++++++++++++-----
Modules/FindCUDA.cmake | 2 +-
Source/CursesDialog/CMakeLists.txt | 26 ++++----
Source/cmVisualStudioGeneratorOptions.cxx | 28 ++++++---
Tests/CMakeLib/CMakeLists.txt | 21 ++++---
Tests/CMakeServerLib/CMakeLists.txt | 5 +-
Tests/CudaOnly/ResolveDeviceSymbols/CMakeLists.txt | 2 +-
Tests/CudaOnly/SeparateCompilation/CMakeLists.txt | 3 +-
Tests/FindOpenSSL/rand/main.cc | 2 +-
13 files changed, 120 insertions(+), 59 deletions(-)
create mode 100644 Modules/Compiler/MSVC-ASM.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list