[Cmake-commits] CMake branch, master, updated. v3.11.0-529-g5836c60
Kitware Robot
kwrobot at kitware.com
Tue Apr 17 07:35:13 EDT 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 5836c60daada6b323dde32c97c32494a819328c0 (commit)
via d41e767f2ba538a8c09a9f8b1168c3398ab62113 (commit)
via dcec17a31a725c8760ebaeb2b40c3bbecce32d94 (commit)
via 6ff8e34e5efdd9b621d64a9bc6bc7b436f01ae51 (commit)
via 054c849112150452538a1ef7db5b423c5816bca0 (commit)
via 0c7433e874d5f28b15009dbfb1f19ecb34cd71ee (commit)
via 90cdd06f4c8873d716fed21b2ab123ede50e504f (commit)
via cb8c758fdb61ef7a6ad606b4d9e880e955368867 (commit)
via 3d9d1c9dcfa2d16ef3e14977f62fab8042f108e3 (commit)
via c8e98974d8a71ff048eea60e2949382d39d51383 (commit)
from 8c546287ddadedb7263e9c21115add253c3a82a8 (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=5836c60daada6b323dde32c97c32494a819328c0
commit 5836c60daada6b323dde32c97c32494a819328c0
Merge: d41e767 3d9d1c9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 17 11:32:38 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 17 07:32:53 2018 -0400
Merge topic 'FindOpenAL-std-includes'
3d9d1c9dcf FindOpenAL: Find AL/al.h or OpenAL/al.h in standard include paths
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1963
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d41e767f2ba538a8c09a9f8b1168c3398ab62113
commit d41e767f2ba538a8c09a9f8b1168c3398ab62113
Merge: dcec17a c8e9897
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 17 11:32:04 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 17 07:32:11 2018 -0400
Merge topic 'vs-conditional-reference-assembly'
c8e98974d8 VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1956
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcec17a31a725c8760ebaeb2b40c3bbecce32d94
commit dcec17a31a725c8760ebaeb2b40c3bbecce32d94
Merge: 6ff8e34 054c849
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 17 07:30:09 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 17 07:30:09 2018 -0400
Merge branch 'release-3.11'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ff8e34e5efdd9b621d64a9bc6bc7b436f01ae51
commit 6ff8e34e5efdd9b621d64a9bc6bc7b436f01ae51
Merge: 8c54628 0c7433e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 17 11:29:28 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 17 07:29:33 2018 -0400
Merge topic 'FindOpenMP-Intel-Windows'
0c7433e874 FindOpenMP: Fix support for Intel on Windows
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1957
diff --cc Modules/FindOpenMP.cmake
index e252ba5,1bf589d..329ace1
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@@ -242,43 -240,12 +242,34 @@@ function(_OPENMP_GET_FLAGS LANG FLAG_MO
endforeach()
set("${OPENMP_LIB_NAMES_VAR}" "${_OPENMP_LIB_NAMES}" PARENT_SCOPE)
else()
- # The Intel compiler on windows has no verbose mode, so we need to treat it explicitly
- if("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "Intel" AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
- set("${OPENMP_LIB_NAMES_VAR}" "libiomp5md" PARENT_SCOPE)
- find_library(OpenMP_libiomp5md_LIBRARY
- NAMES "libiomp5md"
- HINTS ${CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES}
- CMAKE_FIND_ROOT_PATH_BOTH
- NO_DEFAULT_PATH
- )
- mark_as_advanced(OpenMP_libiomp5md_LIBRARY)
- else()
- set("${OPENMP_LIB_NAMES_VAR}" "" PARENT_SCOPE)
- endif()
+ # We do not know how to extract implicit OpenMP libraries for this compiler.
+ # Assume that it handles them automatically, e.g. the Intel Compiler on
+ # Windows should put the dependency in its object files.
+ set("${OPENMP_LIB_NAMES_VAR}" "" PARENT_SCOPE)
endif()
break()
+ elseif(CMAKE_${LANG}_COMPILER_ID STREQUAL "AppleClang"
+ AND CMAKE_${LANG}_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
+
+ # Check for separate OpenMP library on AppleClang 7+
+ find_library(OpenMP_libomp_LIBRARY
+ NAMES omp gomp iomp5
+ HINTS ${CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES}
+ )
+ mark_as_advanced(OpenMP_libomp_LIBRARY)
+
+ if(OpenMP_libomp_LIBRARY)
+ try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
+ CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
+ LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} ${OpenMP_libomp_LIBRARY}
+ OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
+ )
+ if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG})
+ set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG}" PARENT_SCOPE)
+ set("${OPENMP_LIB_NAMES_VAR}" "libomp" PARENT_SCOPE)
+ break()
+ endif()
+ endif()
endif()
set("${OPENMP_LIB_NAMES_VAR}" "NOTFOUND" PARENT_SCOPE)
set("${OPENMP_FLAG_VAR}" "NOTFOUND" PARENT_SCOPE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d9d1c9dcfa2d16ef3e14977f62fab8042f108e3
commit 3d9d1c9dcfa2d16ef3e14977f62fab8042f108e3
Author: James Jones <james at theinnocuous.com>
AuthorDate: Sun Apr 15 00:06:42 2018 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 16 11:24:22 2018 -0400
FindOpenAL: Find AL/al.h or OpenAL/al.h in standard include paths
Add `AL` and `OpenAL` to the `PATH_SUFFIXES` so that they are searched
within the standard system include directories.
We already have `include/AL`, `include/OpenAL`, and `include` to help
out within the locations specified by `PATHS`, though it is unclear why
it was done this way instead of adding the suffixes to all the `PATHS`
explicitly.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index c3d202e..7521d51 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -58,7 +58,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8e98974d8a71ff048eea60e2949382d39d51383
commit c8e98974d8a71ff048eea60e2949382d39d51383
Author: Bastien Schatt <bastien.schatt at magestik.fr>
AuthorDate: Thu Apr 12 23:11:42 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 13 13:11:09 2018 -0400
VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible
Explicitly turn off `ReferenceOutputAssembly` in `ProjectReference`
elements naming other project files whose types do not produce
assemblies. We already do this for `C#` but it makes sense for other
languages too.
Fixes: #17906
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 13af167..22dca62 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3646,10 +3646,8 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
"{" + this->GlobalGenerator->GetGUID(name) + "}", 3);
this->WriteElem("Name", name, 3);
this->WriteDotNetReferenceCustomTags(name);
- if (csproj == this->ProjectType) {
- if (!this->GlobalGenerator->TargetCanBeReferenced(dt)) {
- this->WriteElem("ReferenceOutputAssembly", "false", 3);
- }
+ if (!this->GlobalGenerator->TargetCanBeReferenced(dt)) {
+ this->WriteElem("ReferenceOutputAssembly", "false", 3);
}
this->WriteString("</ProjectReference>\n", 2);
}
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenAL.cmake | 2 +-
Modules/FindOpenMP.cmake | 17 ++++-------------
Source/cmVisualStudio10TargetGenerator.cxx | 6 ++----
3 files changed, 7 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list