[Cmake-commits] CMake branch, master, updated. v3.5.2-438-g94179ec

[Kitware Robot]

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  94179ecf22a819e3f9ae32c9e865c483202b9818 (commit)
  from  52dddefcbbd2a79826fe9cb5b5fe787c6cdfe2a8 (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=94179ecf22a819e3f9ae32c9e865c483202b9818
commit 94179ecf22a819e3f9ae32c9e865c483202b9818
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Sat Apr 16 00:01:08 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Sat Apr 16 00:01:08 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 2a5b01a..7749b56 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 5)
-set(CMake_VERSION_PATCH 20160415)
+set(CMake_VERSION_PATCH 20160416)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.2-965-g2a0451e

[Brad King]

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, next has been updated
   via  2a0451e7f129aa27b824741cb7db3a9e3706b1a7 (commit)
   via  85c3dfe47140b5fea4dc64805064b229ad53e448 (commit)
  from  7eada2a3afdac880b6dd4489152148443663a284 (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=2a0451e7f129aa27b824741cb7db3a9e3706b1a7
commit 2a0451e7f129aa27b824741cb7db3a9e3706b1a7
Merge: 7eada2a 85c3dfe
Author: Brad King 
AuthorDate: Fri Apr 15 16:04:01 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 16:04:01 2016 -0400

Merge topic 'intel_compiler_feature_detection' into next

85c3dfe4 Revert topic 'intel_compiler_feature_detection'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85c3dfe47140b5fea4dc64805064b229ad53e448
commit 85c3dfe47140b5fea4dc64805064b229ad53e448
Author: Brad King 
AuthorDate: Fri Apr 15 16:03:39 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 16:03:39 2016 -0400

Revert topic 'intel_compiler_feature_detection'

It needs work on Windows.

diff --git a/Help/manual/cmake-compile-features.7.rst 
b/Help/manual/cmake-compile-features.7.rst
index 84c6bca..caf5bac 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -309,4 +309,3 @@ versions specified for each:
 * ``GNU``: GNU compiler versions 4.4 through 5.0.
 * ``MSVC``: Microsoft Visual Studio versions 2010 through 2015.
 * ``SunPro``: Oracle SolarisStudio version 12.4.
-* ``Intel``: Intel compiler versions 14.0 through 16.0
diff --git a/Modules/Compiler/Intel-C-FeatureTests.cmake 
b/Modules/Compiler/Intel-C-FeatureTests.cmake
deleted file mode 100644
index bc40f69..000
--- a/Modules/Compiler/Intel-C-FeatureTests.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# References:
-#   - 
https://software.intel.com/en-us/articles/iso-iec-standards-language-conformance-for-intel-c-compiler
-#   - https://software.intel.com/en-us/articles/c99-support-in-intel-c-compiler
-#   - https://software.intel.com/en-us/articles/c11-support-in-intel-c-compiler
-
-set(_cmake_oldestSupported "__ICC >= 1110")
-
-set(DETECT_C99 "defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
-set(DETECT_C11 "defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
-
-set(Intel_C90 "${_cmake_oldestSupported}")
-set(Intel_C99 "${_cmake_oldestSupported} && ${DETECT_C99}")
-set(Intel_C11 "__ICC >= 1500 && ${DETECT_C11}")
-
-
-set(_cmake_feature_test_c_static_assert "${Intel_C11}")
-
-set(_cmake_feature_test_c_restrict "${Intel_C99}")
-set(_cmake_feature_test_c_variadic_macros "${Intel_C99}")
-set(_cmake_feature_test_c_function_prototypes "${Intel_C90}")
\ No newline at end of file
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 16d68a2..77363eb 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -8,61 +8,5 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_C "-MD -MT  -MF ")
 
-if (WIN32)
-  set(_std -Qstd)
-else()
-  set(_std -std)
-endif()
-
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
-  set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
-  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11")
-endif()
-
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
-  set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
-  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
-  set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
-  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99")
-endif()
-
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
-  if (NOT CMAKE_C_COMPILER_FORCED)
-if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
-  message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for 
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version 
${CMAKE_C_COMPILER_VERSION}")
-endif()
-set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
-  elseif(NOT DEFINED CMAKE_C_STANDARD_DEFAULT)
-# Compiler id was forced so just guess the default standard level.
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
-  set(CMAKE_C_STANDARD_DEFAULT 11)
-else()
-  set(CMAKE_C_STANDARD_DEFAULT 90)
-endif()
-  endif()
-endif()
-
-unset(_std)
-
-
-macro(cmake_record_c_compile_features)
-  macro(_get_gcc_features std_version list)
-record_compiler_features(C "${std_version}" ${list})
-  endmacro()
-
-  set(_result 0)
-  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
-_get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} 

Re: [CMake] isystem include of system library header with CUDA

[Osuna Escamilla Carlos]

Hello

sometime ago I sent this email concerning the behaviour of the SYSTEM in the 
include_directories.
I would appreciate if someone from cmake team could look at it, as we consider 
this a bug in cmake, and indeed properly passing -isystem to the compiler is 
essential, specially in CUDA when system library flood the compilation output 
with warning.

Thanks. Carlos


Von: Osuna Escamilla Carlos
Gesendet: Sonntag, 14. Februar 2016 19:33
An: cmake@cmake.org
Betreff: isystem include of system library header with CUDA

Hi everybody

with cmake I have always used the SYSTEM keyword for the include_directories to 
include system libraries:

include_directories( SYSTEM ${Boost_INCLUDE_DIRS} )

in order to pass system include directories with compiler with -isystem.
The problem I have is that this does not seem to work with CUDA.

In FindCUDA.cmake, it seems that -I is hardcoded

  if(CUDA_NVCC_INCLUDE_DIRECTORIES)
foreach(dir ${CUDA_NVCC_INCLUDE_DIRECTORIES})
  list(APPEND CUDA_NVCC_INCLUDE_ARGS -I${dir})
endforeach()
  endif()

So the question is am I right? Or am I assuming something wrong?
If yes, it would be extremely useful if we could use the same mechanism to pass 
-isystem to nvcc, to avoid all the warnings from system libraries.

Thanks, Carlos
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.5.2-963-g7eada2a

[Brad King]

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, next has been updated
   via  7eada2a3afdac880b6dd4489152148443663a284 (commit)
   via  19e8752b86a015832b3414f55a298bda9896fc62 (commit)
  from  4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca (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=7eada2a3afdac880b6dd4489152148443663a284
commit 7eada2a3afdac880b6dd4489152148443663a284
Merge: 4b8de2f 19e8752
Author: Brad King 
AuthorDate: Fri Apr 15 15:03:35 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 15:03:35 2016 -0400

Merge topic 'FindGit-update-github-location' into next

19e8752b FindGit: Add new 'GitHub for Windows' user directory


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19e8752b86a015832b3414f55a298bda9896fc62
commit 19e8752b86a015832b3414f55a298bda9896fc62
Author: Frank Park 
AuthorDate: Fri Apr 15 14:02:07 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 14:59:06 2016 -0400

FindGit: Add new 'GitHub for Windows' user directory

GitHub for Windows now installs in

$ENV{LOCALAPPDATA}/Github/PortableGit*/cmd

instead of

$ENV{LOCALAPPDATA}/Github/PortableGit*/bin

Search the new location first but keep the old one in case people have
older versions installed.

diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake
index d18f965..95188ce 100644
--- a/Modules/FindGit.cmake
+++ b/Modules/FindGit.cmake
@@ -45,8 +45,10 @@ if(WIN32)
   if(NOT CMAKE_GENERATOR MATCHES "MSYS")
 set(git_names git.cmd git eg.cmd eg)
 # GitHub search path for Windows
-set(github_path "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin")
-file(GLOB github_path "${github_path}")
+file(GLOB github_path
+  "$ENV{LOCALAPPDATA}/Github/PortableGit*/cmd"
+  "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin"
+  )
 # SourceTree search path for Windows
 set(_git_sourcetree_path 
"$ENV{LOCALAPPDATA}/Atlassian/SourceTree/git_local/bin")
   endif()

---

Summary of changes:
 Modules/FindGit.cmake |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[CMake] CMakeLists.txt: How to print a message if ctest fails?

[Muhammad Osama]

Is there a way I can setup CMakeLists.txt to print a message if ctest tests
fail? For example:

cmake ..
make
ctest // fails
message output: Please contact x...@mail.com to resolve testing problems.

​Note the message output is not for cmake but for ctest.​

--​​
Muhammad
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.5.2-961-g4b8de2f

[Jean-Christophe Fillion-Robin]

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, next has been updated
   via  4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca (commit)
   via  5ae0d331ff4b7b7ea5b2098dce7b1a91f739746b (commit)
  from  f5edf51d22446cfa669fcbbc57e1b6a1cef3f962 (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=4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca
commit 4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca
Merge: f5edf51 5ae0d33
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Fri Apr 15 14:47:42 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 14:47:42 2016 -0400

Merge topic 'teach-custom-command-crosscompiling-emulator' into next

5ae0d331 CustomCommandGenerator: Fix pseudo_emulator_custom_command.c build 
error


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ae0d331ff4b7b7ea5b2098dce7b1a91f739746b
commit 5ae0d331ff4b7b7ea5b2098dce7b1a91f739746b
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Fri Apr 15 14:46:05 2016 -0400
Commit: Jean-Christophe Fillion-Robin 
CommitDate: Fri Apr 15 14:46:05 2016 -0400

CustomCommandGenerator: Fix pseudo_emulator_custom_command.c build error

This commit fixes the following error reported on VisualStudio:

  pseudo_emulator_custom_command.c(17): error C2143: syntax error : missing 
';' before 'const'

diff --git a/Tests/RunCMake/pseudo_emulator_custom_command.c 
b/Tests/RunCMake/pseudo_emulator_custom_command.c
index 4a915bf..8b2b632 100644
--- a/Tests/RunCMake/pseudo_emulator_custom_command.c
+++ b/Tests/RunCMake/pseudo_emulator_custom_command.c
@@ -10,12 +10,13 @@
 
 int main(int argc, char * argv[] )
 {
+  const char* substring = "generated_exe";
+  const char* string = 0;
   if (argc < 2)
 {
 return EXIT_FAILURE;
 }
-  const char* substring = "generated_exe";
-  const char* string = argv[1];
+  string = argv[1];
   if (strstr(string, substring) != 0)
 {
 return EXIT_SUCCESS;

---

Summary of changes:
 Tests/RunCMake/pseudo_emulator_custom_command.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.2-959-gf5edf51

[Brad King]

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, next has been updated
   via  f5edf51d22446cfa669fcbbc57e1b6a1cef3f962 (commit)
   via  502344b66461173d3dfcc4102bcdf4593f2c5fcc (commit)
  from  16ef561aad415cff24c23f12aaf598483d188f3c (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=f5edf51d22446cfa669fcbbc57e1b6a1cef3f962
commit f5edf51d22446cfa669fcbbc57e1b6a1cef3f962
Merge: 16ef561 502344b
Author: Brad King 
AuthorDate: Fri Apr 15 14:42:14 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 14:42:14 2016 -0400

Merge topic 'refactor-cmListFileBacktrace' into next

502344b6 fixup! cmListFileBacktrace: Refactor storage to provide efficient 
value


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=502344b66461173d3dfcc4102bcdf4593f2c5fcc
commit 502344b66461173d3dfcc4102bcdf4593f2c5fcc
Author: Brad King 
AuthorDate: Fri Apr 15 14:41:24 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 14:41:24 2016 -0400

fixup! cmListFileBacktrace: Refactor storage to provide efficient value

diff --git a/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt 
b/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
index fad7073..6fdcce7 100644
--- a/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
+++ b/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
@@ -25,7 +25,7 @@ Call Stack \(most recent call first\):
   OriginDebugIDE.cmake:4 \(include\)
   CMakeLists.txt:3 \(include\)
 +
-CMake Debug Log:
+CMake Debug Log in CMakeLists.txt:
   Used sources for target OriginDebug:
 
* .*CMakeLists.txt

---

Summary of changes:
 Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [cmake-developers] FindMPI with intel MPI wrappers

[Dominic Meiser]

On Fri, Apr 15, 2016 at 01:44:29PM -0400, Brad King wrote:
> On 04/14/2016 04:23 PM, Dominic Meiser wrote:
> > I'm attaching a couple of patches to deal with this.  Are patches
> > to the mailing list still the recommended way to submit changes?
> > Or are pull requests on github preferred?
> 
> Thanks!  Posting here is perfect.  See CONTRIBUTING.rst.
> 
> Applied:
> 
>  FindMPI: Recognize /LIBPATH for specification of linker paths.
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4417b09
> 
>  FindMPI: Recognize `.lib` file names for specification of link libraries
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a99fae1
> 
> Please check the /LIBPATH fix because I tweaked it a bit from
> your original.

Looks much cleaner, thanks.  I tested FindMPI.cmake from current
`next` branch and it all appears to work.

Cheers,
Dominic


> 
> -Brad

-- 
Dominic Meiser
Tech-X Corporation - 5621 Arapahoe Avenue - Boulder, CO 80303
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, maint, updated. v3.5.2

[Brad King]

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, maint has been updated
   via  80bcbe2d85232d748e31fb4de1016af60788505d (commit)
   via  9729dfb76547cf88183314ece57cb14e1d20f046 (commit)
   via  add7abc8352b87184579401cb2493c72e07aa212 (commit)
   via  ff805113c766371677b97d94cd3092cf6ff0bbf6 (commit)
   via  4ffd85cfb598c3927db7a7acf2f9af4131be488e (commit)
   via  f831d752aeb3000a9b1b686da986af7ffecb6968 (commit)
   via  dff812cfcda98260e6c4caf0c3cc2f260ba22722 (commit)
   via  2308764b476d6f6c399fe6a22bb0545d511bdbb1 (commit)
   via  58a57105d04564a954256f8441809a4e33a3cb67 (commit)
   via  0e44f4894f23d5eccd8d360f3420c832f9433a20 (commit)
   via  bc30f8b5e66cb9c15fd224f5e51454c0bc66c67e (commit)
   via  8f8a0bfbf5a0029430c98feeadc25ab973ff5e38 (commit)
   via  677c091b8140a0655f512b8283c5b120fbd0f99c (commit)
   via  8fdb2c5a5da52bf74ccb33cbc7149cb33cb88a81 (commit)
   via  a364d2513a3fac76cf12cf3db21b7e9600ac51a4 (commit)
  from  64130a7e793483e24c1d68bdd234f81d5edb2d51 (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 -
---

Summary of changes:
 Modules/CMakeASM-ATTInformation.cmake  |2 +-
 Modules/CMakeASM_NASMInformation.cmake |2 +-
 Modules/Compiler/ARMCC-ASM.cmake   |2 +-
 Modules/FindGSL.cmake  |2 +-
 Modules/FindXCTest.cmake   |4 +++
 Modules/Platform/Generic-ADSP-ASM.cmake|2 +-
 Modules/Platform/gas.cmake |2 +-
 Source/CMakeVersion.cmake  |2 +-
 Source/cmFLTKWrapUICommand.cxx |2 +-
 Source/cmFortranParserImpl.cxx |2 +-
 Source/cmInstallCommand.cxx|2 +-
 Source/cmInstallTargetGenerator.cxx|2 +-
 Source/cmLocalGenerator.cxx|   15 ++-
 Source/cmLocalGenerator.h  |3 ++-
 Source/cmLocalNinjaGenerator.cxx   |4 +--
 Source/cmMakefile.cxx  |   16 ++-
 Source/cmMakefile.h|3 +--
 Tests/AliasTarget/subdir/CMakeLists.txt|5 
 .../Custom-Symbolic-and-Byproduct.cmake|   28 
 Tests/RunCMake/BuildDepends/RunCMakeTest.cmake |1 +
 20 files changed, 58 insertions(+), 43 deletions(-)
 create mode 100644 
Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.2-957-g16ef561

[Robert Maynard]

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, next has been updated
   via  16ef561aad415cff24c23f12aaf598483d188f3c (commit)
   via  3ac4cb61b61b26a7d5041ddd0918d6db60469535 (commit)
  from  14261ea2d15d0d91f4bca3afc40d28a45687234d (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=16ef561aad415cff24c23f12aaf598483d188f3c
commit 16ef561aad415cff24c23f12aaf598483d188f3c
Merge: 14261ea 3ac4cb6
Author: Robert Maynard 
AuthorDate: Fri Apr 15 14:04:40 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 14:04:40 2016 -0400

Merge topic 'intel_compiler_feature_detection' into next

3ac4cb61 Add C_STANDARD support to Intel C compilers


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac4cb61b61b26a7d5041ddd0918d6db60469535
commit 3ac4cb61b61b26a7d5041ddd0918d6db60469535
Author: Robert Maynard 
AuthorDate: Fri Apr 15 13:40:30 2016 -0400
Commit: Robert Maynard 
CommitDate: Fri Apr 15 14:03:23 2016 -0400

Add C_STANDARD support to Intel C compilers

diff --git a/Modules/Compiler/Intel-C-FeatureTests.cmake 
b/Modules/Compiler/Intel-C-FeatureTests.cmake
new file mode 100644
index 000..bc40f69
--- /dev/null
+++ b/Modules/Compiler/Intel-C-FeatureTests.cmake
@@ -0,0 +1,20 @@
+# References:
+#   - 
https://software.intel.com/en-us/articles/iso-iec-standards-language-conformance-for-intel-c-compiler
+#   - https://software.intel.com/en-us/articles/c99-support-in-intel-c-compiler
+#   - https://software.intel.com/en-us/articles/c11-support-in-intel-c-compiler
+
+set(_cmake_oldestSupported "__ICC >= 1110")
+
+set(DETECT_C99 "defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(DETECT_C11 "defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
+
+set(Intel_C90 "${_cmake_oldestSupported}")
+set(Intel_C99 "${_cmake_oldestSupported} && ${DETECT_C99}")
+set(Intel_C11 "__ICC >= 1500 && ${DETECT_C11}")
+
+
+set(_cmake_feature_test_c_static_assert "${Intel_C11}")
+
+set(_cmake_feature_test_c_restrict "${Intel_C99}")
+set(_cmake_feature_test_c_variadic_macros "${Intel_C99}")
+set(_cmake_feature_test_c_function_prototypes "${Intel_C90}")
\ No newline at end of file
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 77363eb..16d68a2 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -8,5 +8,61 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_C "-MD -MT  -MF ")
 
+if (WIN32)
+  set(_std -Qstd)
+else()
+  set(_std -std)
+endif()
+
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
+  set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
+  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11")
+endif()
+
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+  set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
+  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
+  set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
+  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99")
+endif()
+
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+  if (NOT CMAKE_C_COMPILER_FORCED)
+if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
+  message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for 
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version 
${CMAKE_C_COMPILER_VERSION}")
+endif()
+set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
+  elseif(NOT DEFINED CMAKE_C_STANDARD_DEFAULT)
+# Compiler id was forced so just guess the default standard level.
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
+  set(CMAKE_C_STANDARD_DEFAULT 11)
+else()
+  set(CMAKE_C_STANDARD_DEFAULT 90)
+endif()
+  endif()
+endif()
+
+unset(_std)
+
+
+macro(cmake_record_c_compile_features)
+  macro(_get_gcc_features std_version list)
+record_compiler_features(C "${std_version}" ${list})
+  endmacro()
+
+  set(_result 0)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
+_get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} 
CMAKE_C11_COMPILE_FEATURES)
+  endif()
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+if (_result EQUAL 0)
+  _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} 
CMAKE_C99_COMPILE_FEATURES)
+endif()
+if (_result EQUAL 0)
+  _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} 
CMAKE_C90_COMPILE_FEATURES)
+endif()
+  endif()
+endmacro()
+
 set(CMAKE_C_CREATE_PREPROCESSED_SOURCE "  
  -E  > ")
 set(CMAKE_C_CREATE_ASSEMBLY_SOURCE "   
 -S  -o ")

[cmake-developers] [ANNOUNCE] CMake 3.5.2 available for download

[Robert Maynard]

We are pleased to announce that CMake 3.5.2 is now available for download.

Please use the latest release from our download page:
  https://cmake.org/download/

Thanks for your support!

-
Changes in 3.5.2 since 3.5.1:

Brad King (6):
  Fix lookup of an ALIAS target outside aliased target's directory (#16044)
  Rename local target lookup methods to clarify purpose
  cmFortranParser: Skip #line directives that do not name files
  Ninja: Fix detection of custom command symbolic outputs
  Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)
  CMake 3.5.2

Gregor Jasny (2):
  Xcode: Fixup XCTest bundle location for Xcode 7.3
  ASM: Add missing  placeholder for "compile" rules

Pierrick Koch (1):
  FindGSL: Fix typo in documentation
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[CMake] [ANNOUNCE] CMake 3.5.2 available for download

[Robert Maynard]

We are pleased to announce that CMake 3.5.2 is now available for download.

Please use the latest release from our download page:
  https://cmake.org/download/

Thanks for your support!

-
Changes in 3.5.2 since 3.5.1:

Brad King (6):
  Fix lookup of an ALIAS target outside aliased target's directory (#16044)
  Rename local target lookup methods to clarify purpose
  cmFortranParser: Skip #line directives that do not name files
  Ninja: Fix detection of custom command symbolic outputs
  Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)
  CMake 3.5.2

Gregor Jasny (2):
  Xcode: Fixup XCTest bundle location for Xcode 7.3
  ASM: Add missing  placeholder for "compile" rules

Pierrick Koch (1):
  FindGSL: Fix typo in documentation
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake annotated tag, v3.5.2, created. v3.5.2

[Robert Maynard]

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 annotated tag, v3.5.2 has been created
at  af09fcc6bc927b79916c92d19cfb221b506dc7f0 (tag)
   tagging  80bcbe2d85232d748e31fb4de1016af60788505d (commit)
  replaces  v3.5.1
 tagged by  Brad King
on  Fri Apr 15 08:58:40 2016 -0400

- Log -
CMake 3.5.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXEOWBAAoJEC0s7xA0khaEH60P/jeuTa0o1HcEIvRxH0+Eu5c2
QcXwQB6hEpqKXJriYC6RStnEh3Dv5DPiBr4OBK2383u23RlP5s4/V/gkWw/+XVMQ
0fXCndkqoSIla4DObhbGe9lzxZRZH2TUymAAS6um7jjL/8788dBe6zqJ/BeKa7Lp
Ua6khhhChVSzNiMzpn5/v6OLpGKvaDQkQP9YbiMRIzH9VipL2i0NoTEK9TRmtY11
ULbcZPCTKRowI7tQnlNlgTD6BKzxrq+8Ewffh8fjbVizDtv3CAFclvbjWjXPiU/2
TUcd+3GtObikpWtJ/TL3RTXnJx41Gf9PrA7PKS+XqCxX9lWn+23gY+hftbcxduWl
43rySfOS+4SFritSuwjqz5cmejyURdTCwuVKEstvh7yomqY0PBrb2FOmqGnHCcCO
x8lOxTiWqgTMKp5LSHIV9jFHJEKWJH5o74Nce9+W7W8O0zcqoBYWDAUahfqIkYYZ
E3mu53PIyNbh/PosY04c8bSC045RTy1bIhHatZBeJGaqK9RVM4J+FoiCcYSg0Bo2
qZBWJ3bnE8OpHNFWtW6ZsbP13by9JjKQMOiWwSwG08CU2ZKUpKpybcRCbB6oHzce
yG7zekmCmQ8JGiwVul6LiXX35BSbOToPTj2in7rPcG3faOYhndaOTIqi3SmB0EsC
TMj8JbETK9JXK9OAGC5F
=SIXK
-END PGP SIGNATURE-

Brad King (12):
  Merge branch 'xcode73-xctest-location' into release
  Merge branch 'backport-asm-includes' into release
  Fix lookup of an ALIAS target outside aliased target's directory (#16044)
  Rename local target lookup methods to clarify purpose
  Merge branch 'fix-target-alias-in-subdir' into release
  Merge branch 'FindGSL-doc-typo' into release
  cmFortranParser: Skip #line directives that do not name files
  Merge branch 'fortran-line-directives-no-dirs' into release
  Ninja: Fix detection of custom command symbolic outputs
  Ninja: Restat custom command byproducts even with a SYMBOLIC output 
(#16049)
  Merge branch 'ninja-restat-custom-command-byproducts' into release
  CMake 3.5.2

Gregor Jasny (2):
  Xcode: Fixup XCTest bundle location for Xcode 7.3
  ASM: Add missing  placeholder for "compile" rules

Pierrick Koch (1):
  FindGSL: Fix typo in documentation

---


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.1-970-g14261ea

[Brad King]

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, next has been updated
   via  14261ea2d15d0d91f4bca3afc40d28a45687234d (commit)
   via  cc684857c2959d7a49c0c390dcf3361804648c0b (commit)
  from  0c0092a7a674dd0c760705fc81eacc4714394cc7 (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=14261ea2d15d0d91f4bca3afc40d28a45687234d
commit 14261ea2d15d0d91f4bca3afc40d28a45687234d
Merge: 0c0092a cc68485
Author: Brad King 
AuthorDate: Fri Apr 15 13:46:51 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 13:46:51 2016 -0400

Merge topic 'cmPolicies-missing-include' into next

cc684857 cmPolicies.cxx: Add missing include  for isdigit (#16066)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc684857c2959d7a49c0c390dcf3361804648c0b
commit cc684857c2959d7a49c0c390dcf3361804648c0b
Author: Brad King 
AuthorDate: Fri Apr 15 13:46:15 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 13:46:15 2016 -0400

cmPolicies.cxx: Add missing include  for isdigit (#16066)

diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 3eb19bb..bce69c5 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -4,6 +4,7 @@
 #include "cmVersion.h"
 #include "cmVersionMacros.h"
 #include "cmAlgorithms.h"
+#include 
 #include 
 #include 
 #include 

---

Summary of changes:
 Source/cmPolicies.cxx |1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [cmake-developers] FindMPI with intel MPI wrappers

[Brad King]

On 04/14/2016 04:23 PM, Dominic Meiser wrote:
> I'm attaching a couple of patches to deal with this.  Are patches
> to the mailing list still the recommended way to submit changes?
> Or are pull requests on github preferred?

Thanks!  Posting here is perfect.  See CONTRIBUTING.rst.

Applied:

 FindMPI: Recognize /LIBPATH for specification of linker paths.
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4417b09

 FindMPI: Recognize `.lib` file names for specification of link libraries
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a99fae1

Please check the /LIBPATH fix because I tweaked it a bit from
your original.

-Brad

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, next, updated. v3.5.1-968-g0c0092a

[Brad King]

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, next has been updated
   via  0c0092a7a674dd0c760705fc81eacc4714394cc7 (commit)
   via  2a99fae1cc30938a50fd55afd50c13b5c881c737 (commit)
   via  c4417b0927991130d1c701f844e7e2b3464a207e (commit)
  from  28fa4d3e9a246387cd1fa6f971ca2db5e6f46255 (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=0c0092a7a674dd0c760705fc81eacc4714394cc7
commit 0c0092a7a674dd0c760705fc81eacc4714394cc7
Merge: 28fa4d3 2a99fae
Author: Brad King 
AuthorDate: Fri Apr 15 13:43:07 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 13:43:07 2016 -0400

Merge topic 'FindMPI-intel-compiler' into next

2a99fae1 FindMPI: Recognize `.lib` file names for specification of link 
libraries
c4417b09 FindMPI: Recognize /LIBPATH for specification of linker paths.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a99fae1cc30938a50fd55afd50c13b5c881c737
commit 2a99fae1cc30938a50fd55afd50c13b5c881c737
Author: Dominic Meiser 
AuthorDate: Thu Apr 14 11:03:21 2016 -0600
Commit: Brad King 
CommitDate: Fri Apr 15 13:42:05 2016 -0400

FindMPI: Recognize `.lib` file names for specification of link libraries

The Intel MPI compiler wrappers link against static MPI libraries simply
by listing the libraries (no `-l`).

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index ef4a7a1..fbc6795 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -385,6 +385,13 @@ function (interrogate_mpi_compiler lang try_libs)
 # Extract the set of libraries to link against from the link command
 # line
 string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES 
"${MPI_LINK_CMDLINE}")
+if(WIN32)
+  # The intel wrappers on windows link against static versions of the 
MPI libraries.
+  # The static libraries are simply listed on the command line without 
-l.
+  # For instance: " icl ... impi.lib "
+  string(REGEX MATCHALL "(^| )([^\" ]+)\\.lib" tmp 
"${MPI_LINK_CMDLINE}")
+  list(APPEND MPI_LIBNAMES ${tmp})
+endif()
 
 # add the compiler implicit directories because some compilers
 # such as the intel compiler have libraries that show up
@@ -399,6 +406,10 @@ function (interrogate_mpi_compiler lang try_libs)
 # to link against in an MPI program
 foreach(LIB ${MPI_LIBNAMES})
   string(REGEX REPLACE "^ ?-l" "" LIB ${LIB})
+  if(WIN32)
+string(REGEX REPLACE "\\.lib$" "" LIB ${LIB})
+  endif()
+  string(STRIP ${LIB} LIB)
   # MPI_LIB is cached by find_library, but we don't want that.  Clear 
it first.
   set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
   find_library(MPI_LIB NAMES ${LIB} HINTS ${MPI_LINK_PATH})

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4417b0927991130d1c701f844e7e2b3464a207e
commit c4417b0927991130d1c701f844e7e2b3464a207e
Author: Dominic Meiser 
AuthorDate: Thu Apr 14 11:01:43 2016 -0600
Commit: Brad King 
CommitDate: Fri Apr 15 13:42:05 2016 -0400

FindMPI: Recognize /LIBPATH for specification of linker paths.

The Intel MPI wrappers use this form of -L to specify library locations.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 0e406e0..ef4a7a1 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -357,10 +357,10 @@ function (interrogate_mpi_compiler lang try_libs)
 endif()
 
 # Extract linker paths from the link command line
-string(REGEX MATCHALL "(^| |-Wl,)-L([^\" ]+|\"[^\"]+\")" 
MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}")
+string(REGEX MATCHALL "(^| |-Wl,)(-L|/LIBPATH:)([^\" ]+|\"[^\"]+\")" 
MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}")
 set(MPI_LINK_PATH)
 foreach(LPATH ${MPI_ALL_LINK_PATHS})
-  string(REGEX REPLACE "^(| |-Wl,)-L" "" LPATH ${LPATH})
+  string(REGEX REPLACE "^(| |-Wl,)(-L|/LIBPATH:)" "" LPATH ${LPATH})
   string(REPLACE "//" "/" LPATH ${LPATH})
   list(APPEND MPI_LINK_PATH ${LPATH})
 endforeach()

---

Summary of changes:
 Modules/FindMPI.cmake |   15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org

[Cmake-commits] CMake branch, next, updated. v3.5.1-965-g28fa4d3

[Brad King]

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, next has been updated
   via  28fa4d3e9a246387cd1fa6f971ca2db5e6f46255 (commit)
   via  32d569af9a7174f53cd2abd0248385bfb7fc1929 (commit)
  from  87bfd4ea4dd5c84df94434d2ed150038b4801945 (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=28fa4d3e9a246387cd1fa6f971ca2db5e6f46255
commit 28fa4d3e9a246387cd1fa6f971ca2db5e6f46255
Merge: 87bfd4e 32d569a
Author: Brad King 
AuthorDate: Fri Apr 15 13:35:52 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 13:35:52 2016 -0400

Merge topic 'cmake-gui-osx-install-mkdir' into next

32d569af cmake-gui: Teach --install make destination directory (#16064)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32d569af9a7174f53cd2abd0248385bfb7fc1929
commit 32d569af9a7174f53cd2abd0248385bfb7fc1929
Author: Brad King 
AuthorDate: Fri Apr 15 13:23:02 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 13:23:41 2016 -0400

cmake-gui: Teach --install make destination directory (#16064)

Ensure the destination directory exists before creating symlinks in it.

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 4f93a77..cff4f6f 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -217,6 +217,7 @@ static bool cmOSXInstall(std::string const& dir, 
std::string const& tool)
   return true;
   }
 }
+  cmSystemTools::MakeDirectory(dir);
   if (symlink(tool.c_str(), link.c_str()) == 0)
 {
 std::cerr << "Linked: '" << link << "' -> '" << tool << "'\n";

---

Summary of changes:
 Source/QtDialog/CMakeSetup.cxx |1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.1-963-g87bfd4e

[Brad King]

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, next has been updated
   via  87bfd4ea4dd5c84df94434d2ed150038b4801945 (commit)
   via  5dc6cfd6ea304c6eb49e7f4555d6d9778854929b (commit)
  from  fb41aa96c50f47b76e20810d21e3ea958b0e0ff8 (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=87bfd4ea4dd5c84df94434d2ed150038b4801945
commit 87bfd4ea4dd5c84df94434d2ed150038b4801945
Merge: fb41aa9 5dc6cfd
Author: Brad King 
AuthorDate: Fri Apr 15 13:25:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 13:25:56 2016 -0400

Merge topic 'cmake-host-solaris' into next

5dc6cfd6 Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dc6cfd6ea304c6eb49e7f4555d6d9778854929b
commit 5dc6cfd6ea304c6eb49e7f4555d6d9778854929b
Author: Stafen Teleman 
AuthorDate: Wed Apr 13 12:36:36 2016 -0700
Commit: Brad King 
CommitDate: Fri Apr 15 13:25:45 2016 -0400

Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)

diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 7cf3a3d..fc1dc9f 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -175,6 +175,7 @@ Variables that Describe the System
/variable/CMAKE_CL_64
/variable/CMAKE_COMPILER_2005
/variable/CMAKE_HOST_APPLE
+   /variable/CMAKE_HOST_SOLARIS
/variable/CMAKE_HOST_SYSTEM_NAME
/variable/CMAKE_HOST_SYSTEM_PROCESSOR
/variable/CMAKE_HOST_SYSTEM
diff --git a/Help/release/dev/cmake-host-solaris.rst 
b/Help/release/dev/cmake-host-solaris.rst
new file mode 100644
index 000..da7ab89
--- /dev/null
+++ b/Help/release/dev/cmake-host-solaris.rst
@@ -0,0 +1,5 @@
+cmake-host-solaris
+--
+
+* A new :variable:`CMAKE_HOST_SOLARIS` variable was introduced to
+  indicate when CMake is running on an Oracle Solaris host.
diff --git a/Help/variable/CMAKE_HOST_SOLARIS.rst 
b/Help/variable/CMAKE_HOST_SOLARIS.rst
new file mode 100644
index 000..82b5d69
--- /dev/null
+++ b/Help/variable/CMAKE_HOST_SOLARIS.rst
@@ -0,0 +1,6 @@
+CMAKE_HOST_SOLARIS
+--
+
+``True`` for Oracle Solaris operating systems.
+
+Set to ``true`` when the host system is Oracle Solaris.
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index be8e418..7670c10 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1425,6 +1425,9 @@ void cmState::Snapshot::SetDefaultDefinitions()
 this->SetDefinition("APPLE", "1");
 this->SetDefinition("CMAKE_HOST_APPLE", "1");
   #endif
+  #if defined(__sun__)
+this->SetDefinition("CMAKE_HOST_SOLARIS", "1");
+  #endif
 
 char temp[1024];
 sprintf(temp, "%d", cmVersion::GetMinorVersion());

---

Summary of changes:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.1-961-gfb41aa9

[Brad King]

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, next has been updated
   via  fb41aa96c50f47b76e20810d21e3ea958b0e0ff8 (commit)
   via  67e81c00828fa56a9f7bf8767f39f6cde398d63b (commit)
  from  583510b118ca4d465496e348f85af5e2d2355b10 (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=fb41aa96c50f47b76e20810d21e3ea958b0e0ff8
commit fb41aa96c50f47b76e20810d21e3ea958b0e0ff8
Merge: 583510b 67e81c0
Author: Brad King 
AuthorDate: Fri Apr 15 13:25:00 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 13:25:00 2016 -0400

Merge topic 'cmake-host-solaris' into next

67e81c00 Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67e81c00828fa56a9f7bf8767f39f6cde398d63b
commit 67e81c00828fa56a9f7bf8767f39f6cde398d63b
Author: Stafen Teleman 
AuthorDate: Tue Mar 8 06:36:22 2016 -0800
Commit: Brad King 
CommitDate: Fri Apr 15 13:19:39 2016 -0400

Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)

diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 7cf3a3d..fc1dc9f 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -175,6 +175,7 @@ Variables that Describe the System
/variable/CMAKE_CL_64
/variable/CMAKE_COMPILER_2005
/variable/CMAKE_HOST_APPLE
+   /variable/CMAKE_HOST_SOLARIS
/variable/CMAKE_HOST_SYSTEM_NAME
/variable/CMAKE_HOST_SYSTEM_PROCESSOR
/variable/CMAKE_HOST_SYSTEM
diff --git a/Help/release/dev/cmake-host-solaris.rst 
b/Help/release/dev/cmake-host-solaris.rst
new file mode 100644
index 000..da7ab89
--- /dev/null
+++ b/Help/release/dev/cmake-host-solaris.rst
@@ -0,0 +1,5 @@
+cmake-host-solaris
+--
+
+* A new :variable:`CMAKE_HOST_SOLARIS` variable was introduced to
+  indicate when CMake is running on an Oracle Solaris host.
diff --git a/Help/variable/CMAKE_HOST_SOLARIS.rst 
b/Help/variable/CMAKE_HOST_SOLARIS.rst
new file mode 100644
index 000..82b5d69
--- /dev/null
+++ b/Help/variable/CMAKE_HOST_SOLARIS.rst
@@ -0,0 +1,6 @@
+CMAKE_HOST_SOLARIS
+--
+
+``True`` for Oracle Solaris operating systems.
+
+Set to ``true`` when the host system is Oracle Solaris.
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index be8e418..7670c10 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1425,6 +1425,9 @@ void cmState::Snapshot::SetDefaultDefinitions()
 this->SetDefinition("APPLE", "1");
 this->SetDefinition("CMAKE_HOST_APPLE", "1");
   #endif
+  #if defined(__sun__)
+this->SetDefinition("CMAKE_HOST_SOLARIS", "1");
+  #endif
 
 char temp[1024];
 sprintf(temp, "%d", cmVersion::GetMinorVersion());

---

Summary of changes:
 Help/manual/cmake-variables.7.rst   |1 +
 Help/release/dev/cmake-host-solaris.rst |5 +
 Help/variable/CMAKE_HOST_SOLARIS.rst|6 ++
 Source/cmState.cxx  |3 +++
 4 files changed, 15 insertions(+)
 create mode 100644 Help/release/dev/cmake-host-solaris.rst
 create mode 100644 Help/variable/CMAKE_HOST_SOLARIS.rst


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, release, updated. v3.5.1-15-g80bcbe2

[Brad King]

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, release has been updated
   via  80bcbe2d85232d748e31fb4de1016af60788505d (commit)
  from  9729dfb76547cf88183314ece57cb14e1d20f046 (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 -
---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.5.1-452-g52dddef

[Brad King]

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  52dddefcbbd2a79826fe9cb5b5fe787c6cdfe2a8 (commit)
   via  80bcbe2d85232d748e31fb4de1016af60788505d (commit)
  from  c42aa3ed8b11d96fe27d2cdda185da0ed45f38ef (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 -
---

Summary of changes:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.1-957-gac248c6

[Jean-Christophe Fillion-Robin]

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, next has been updated
   via  ac248c6f775c7f85cafb438480253541c1143d39 (commit)
   via  66fb6be4ce6f8b8c58c1f367f2746af43126f2f8 (commit)
  from  ca24bb4eff3c972fdb38ef8958264a987b592284 (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=ac248c6f775c7f85cafb438480253541c1143d39
commit ac248c6f775c7f85cafb438480253541c1143d39
Merge: ca24bb4 66fb6be
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Fri Apr 15 12:08:41 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 12:08:41 2016 -0400

Merge topic 'teach-custom-command-crosscompiling-emulator' into next

66fb6be4 CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATOR


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66fb6be4ce6f8b8c58c1f367f2746af43126f2f8
commit 66fb6be4ce6f8b8c58c1f367f2746af43126f2f8
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Fri Apr 15 02:50:11 2016 -0400
Commit: Jean-Christophe Fillion-Robin 
CommitDate: Fri Apr 15 02:50:11 2016 -0400

CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATOR

This commit teaches 'add_custom_command' and 'add_custom_target'
commands to prepend crosscompiling emulator if the first argument
of the associated command parameters if it is a target with
CROSSCOMPILING_EMULATOR property set.

diff --git a/Help/command/add_custom_command.rst 
b/Help/command/add_custom_command.rst
index 8726b70..021dcad 100644
--- a/Help/command/add_custom_command.rst
+++ b/Help/command/add_custom_command.rst
@@ -78,7 +78,9 @@ The options are:
 
   If ``COMMAND`` specifies an executable target (created by the
   :command:`add_executable` command) it will automatically be replaced
-  by the location of the executable created at build time.
+  by the location of the executable created at build time. If set, the
+  :variable:`CMAKE_CROSSCOMPILING_EMULATOR` variable will also be prepended
+  to the command to allow the executable to run on the host.
   (Use the ``TARGET_FILE``
   :manual:`generator expression ` to
   reference an executable later in the command line.)
diff --git a/Help/command/add_custom_target.rst 
b/Help/command/add_custom_target.rst
index 82d69db..f67f55a 100644
--- a/Help/command/add_custom_target.rst
+++ b/Help/command/add_custom_target.rst
@@ -60,7 +60,9 @@ The options are:
 
   If ``COMMAND`` specifies an executable target (created by the
   :command:`add_executable` command) it will automatically be replaced
-  by the location of the executable created at build time.
+  by the location of the executable created at build time. If set, the
+  :variable:`CMAKE_CROSSCOMPILING_EMULATOR` variable will also be prepended
+  to the command to allow the executable to run on the host.
   Additionally a target-level dependency will be added so that the
   executable target will be built before this custom target.
 
diff --git a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst 
b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
index 3ef8e03..626f339 100644
--- a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
+++ b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
@@ -2,5 +2,5 @@ CROSSCOMPILING_EMULATOR
 ---
 
 Use the given emulator to run executables created when crosscompiling.  This
-command will be added as a prefix to :command:`add_test` test commands for
-built target system executables.
+command will be added as a prefix to :command:`add_test`, 
:command:`add_custom_command`
+and :command:`add_custom_target` commands for built target system executables.
diff --git a/Source/cmCustomCommandGenerator.cxx 
b/Source/cmCustomCommandGenerator.cxx
index dc06678..238fd66 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -39,6 +39,39 @@ unsigned int cmCustomCommandGenerator::GetNumberOfCommands() 
const
 }
 
 //
+const char* LookupCrossCompilingEmulator(
+cmsys::auto_ptr cge)
+{
+  for(std::set::const_iterator ci =
+  cge->GetTargets().begin();
+  ci != cge->GetTargets().end(); ++ci)
+{
+cmGeneratorTarget* target = (*ci);
+const char* emulator = target->GetProperty("CROSSCOMPILING_EMULATOR");
+if (emulator != 0)
+  {
+  return emulator;
+  }
+}
+  return 0;
+}
+
+//
+bool 

[Cmake-commits] CMake branch, next, updated. v3.5.1-955-gca24bb4

[Jean-Christophe Fillion-Robin]

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, next has been updated
   via  ca24bb4eff3c972fdb38ef8958264a987b592284 (commit)
   via  78077d705000986decbd0282014c09b214461d45 (commit)
   via  7df92ec78dc22692f89a12ad6feec4e193c7edaa (commit)
  from  46007cb42fda49cbdf012ed35c728749c1f27a1b (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=ca24bb4eff3c972fdb38ef8958264a987b592284
commit ca24bb4eff3c972fdb38ef8958264a987b592284
Merge: 46007cb 78077d7
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Fri Apr 15 12:07:00 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 12:07:00 2016 -0400

Merge topic 'fix-addtest-and-crosscompiling-emulator-to-work-globally' into 
next

78077d70 TestGenerator: Fix CROSSCOMPILING_EMULATOR support.
7df92ec7 TestGenerator: Extend crosscompiling emulator test case


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78077d705000986decbd0282014c09b214461d45
commit 78077d705000986decbd0282014c09b214461d45
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Thu Apr 14 14:17:10 2016 -0400
Commit: Jean-Christophe Fillion-Robin 
CommitDate: Thu Apr 14 14:17:10 2016 -0400

TestGenerator: Fix CROSSCOMPILING_EMULATOR support.

Improve support originally added in 9160d6c by ensuring test commands are
now consistently prefixed with the CROSSCOMPILING_EMULATOR property for
target executables.

diff --git 
a/Help/release/dev/fix-CROSSCOMPILING_EMULATOR-TestGenerator-support.rst 
b/Help/release/dev/fix-CROSSCOMPILING_EMULATOR-TestGenerator-support.rst
new file mode 100644
index 000..5be2e27
--- /dev/null
+++ b/Help/release/dev/fix-CROSSCOMPILING_EMULATOR-TestGenerator-support.rst
@@ -0,0 +1,6 @@
+Fix CROSSCOMPILING_EMULATOR TestGenerator support
+-
+
+If specified, emulator is now consistently added as a prefix
+to :command:`add_test` test commands for built target system
+executables. It works for tests added in a parent directory.
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index b411f15..152d48a 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -83,6 +83,8 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& 
os,
   // Get the test command line to be executed.
   std::vector const& command = this->Test->GetCommand();
 
+  const char * emulator = 0;
+
   // Check whether the command executable is a target whose name is to
   // be translated.
   std::string exe = command[0];
@@ -93,30 +95,45 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& 
os,
 // Use the target file on disk.
 exe = target->GetFullPath(config);
 
-// Prepend with the emulator when cross compiling if required.
-const char * emulator =
-  target->GetProperty("CROSSCOMPILING_EMULATOR");
-if (emulator != 0)
+// Lookup emulator
+emulator = target->GetProperty("CROSSCOMPILING_EMULATOR");
+}
+  else
+{
+// Use the command name given.
+cmsys::auto_ptr cge = ge.Parse(exe.c_str());
+exe = cge->Evaluate(this->LG, config);
+cmSystemTools::ConvertToUnixSlashes(exe);
+
+// Lookup emulator
+for(std::set::const_iterator ci =
+cge->GetTargets().begin();
+ci != cge->GetTargets().end(); ++ci)
   {
-  std::vector emulatorWithArgs;
-  cmSystemTools::ExpandListArgument(emulator, emulatorWithArgs);
-  std::string emulatorExe(emulatorWithArgs[0]);
-  cmSystemTools::ConvertToUnixSlashes(emulatorExe);
-  os << cmOutputConverter::EscapeForCMake(emulatorExe) << " ";
-  for(std::vector::const_iterator ei =
-  emulatorWithArgs.begin()+1;
-  ei != emulatorWithArgs.end();
-  ++ei)
+  target = (*ci);
+  emulator = target->GetProperty("CROSSCOMPILING_EMULATOR");
+  if (emulator != 0)
 {
-os << cmOutputConverter::EscapeForCMake(*ei) << " ";
+break;
 }
   }
 }
-  else
+
+  // Prepend with the emulator when cross compiling if required.
+  if (emulator != 0)
 {
-// Use the command name given.
-exe = ge.Parse(exe.c_str())->Evaluate(this->LG, config);
-cmSystemTools::ConvertToUnixSlashes(exe);
+std::vector emulatorWithArgs;
+cmSystemTools::ExpandListArgument(emulator, emulatorWithArgs);
+std::string emulatorExe(emulatorWithArgs[0]);
+cmSystemTools::ConvertToUnixSlashes(emulatorExe);
+os << cmOutputConverter::EscapeForCMake(emulatorExe) << " ";
+

[Cmake-commits] CMake branch, next, updated. v3.5.1-952-g46007cb

[Brad King]

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, next has been updated
   via  46007cb42fda49cbdf012ed35c728749c1f27a1b (commit)
   via  bbcfacae8e4e98a4cad1050f4a145fd8a7f23bea (commit)
   via  a3dec5a7090ede11448bd400570f561e40d5ffd2 (commit)
   via  a10a19d60082709058b0b070412b9702d5bf1af1 (commit)
   via  1f6bd8a93f602f9d4dde1c3ea697211897f25827 (commit)
   via  18b6676bff6d50ebc38c75e7998298fca75a01c5 (commit)
  from  fb70fd0af84fbbaf41d12447af134dd37785ac46 (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=46007cb42fda49cbdf012ed35c728749c1f27a1b
commit 46007cb42fda49cbdf012ed35c728749c1f27a1b
Merge: fb70fd0 bbcfaca
Author: Brad King 
AuthorDate: Fri Apr 15 12:01:58 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 12:01:58 2016 -0400

Merge topic 'refactor-cmListFileBacktrace' into next

bbcfacae Remove unused cmake::IssueMessage overload
a3dec5a7 cmState: Remove unused entry point fields from snapshot data
a10a19d6 cmListFileBacktrace: Refactor storage to provide efficient value 
semantics
1f6bd8a9 cmState: Avoid accumulating snapshot storage for backtraces
18b6676b cmState: Add Snapshot method to get bottom of call stack


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbcfacae8e4e98a4cad1050f4a145fd8a7f23bea
commit bbcfacae8e4e98a4cad1050f4a145fd8a7f23bea
Author: Brad King 
AuthorDate: Fri Apr 15 10:32:54 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 11:30:18 2016 -0400

Remove unused cmake::IssueMessage overload

All callers now pass a full backtrace so we do not need the alternative
that takes a cmListFileContext directly.  Drop this overload to remove
the code duplication.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index dcc95af..8e3380f 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2785,41 +2785,6 @@ void cmake::IssueMessage(cmake::MessageType t, 
std::string const& text,
 }
 
 //
-void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
- cmListFileContext const& lfc,
- bool force)
-{
-  if (!force)
-{
-// override the message type, if needed, for warnings and errors
-cmake::MessageType override = this->ConvertMessageType(t);
-if (override != t)
-  {
-  t = override;
-  force = true;
-  }
-}
-
-  if (!force && !this->IsMessageTypeVisible(t))
-{
-return;
-}
-
-  std::ostringstream msg;
-  if (!this->PrintMessagePreamble(t, msg))
-{
-return;
-}
-
-  // Add the immediate context.
-  msg << (lfc.Line ? " at " : " in ") << lfc;
-
-  printMessageText(msg, text);
-
-  displayMessage(t, msg);
-}
-
-//
 std::vector cmake::GetDebugConfigs()
 {
   std::vector configs;
diff --git a/Source/cmake.h b/Source/cmake.h
index 8496705..8644dda 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -358,9 +358,6 @@ class cmake
   void IssueMessage(cmake::MessageType t, std::string const& text,
 cmListFileBacktrace const& backtrace = cmListFileBacktrace(),
 bool force = false);
-  void IssueMessage(cmake::MessageType t, std::string const& text,
-cmListFileContext const& lfc,
-bool force = false);
 
   ///! run the --build option
   int Build(const std::string& dir,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3dec5a7090ede11448bd400570f561e40d5ffd2
commit a3dec5a7090ede11448bd400570f561e40d5ffd2
Author: Brad King 
AuthorDate: Fri Apr 15 11:05:33 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 11:30:18 2016 -0400

cmState: Remove unused entry point fields from snapshot data

This information is now kept in cmMakefile::Backtrace.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index f4ca113..bafb09e 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -35,8 +35,6 @@ struct cmState::SnapshotDataType
   cmLinkedTree::iterator Vars;
   cmLinkedTree::iterator Root;
   cmLinkedTree::iterator Parent;
-  std::string EntryPointCommand;
-  long EntryPointLine;
   std::vector::size_type IncludeDirectoryPosition;
   std::vector::size_type CompileDefinitionsPosition;
   std::vector::size_type CompileOptionsPosition;
@@ -1116,16 +1114,6 @@ std::string cmState::Snapshot::GetExecutionListFile() 
const
   return *this->Position->ExecutionListFile;
 }
 

Re: [cmake-developers] Segmentation fault during run cmake 3.5.1

[Brad King]

On 04/15/2016 11:44 AM, Bartosz Kosiorek wrote:
> How I could get souce code for CMAKE 3.5.2 for testing purposes ?

  $ git clone -b release https://cmake.org/cmake.git

-Brad

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] Segmentation fault during run cmake 3.5.1

[Brad King]

On 04/15/2016 11:09 AM, Bartosz Kosiorek wrote:
> Program terminated with signal SIGSEGV, Segmentation fault.
> #0  0x005bb427 in cmTarget::GetProperty(std::string const&, 
> cmMakefile*) const ()

Is this  https://cmake.org/Bug/view.php?id=16044 ?

-Brad

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[cmake-developers] [CMake 0016068]: qt5 autorcc uses wrong output folder

[Mantis Bug Tracker]

The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=16068 
== 
Reported By:Martin Haaß
Assigned To:
== 
Project:CMake
Issue ID:   16068
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2016-04-15 10:56 EDT
Last Modified:  2016-04-15 10:56 EDT
== 
Summary:qt5 autorcc uses wrong output folder
Description: 
The file qrc_Editor.cpp generated by the qt5 rcc compile step from Editor.qrc is
put into CMAKE_BINARY_DIR/CMakeFiles/${target}.dir
where it cannot be found/referenced.
Files generated by automoc and autoui are put in CMAKE_BINARY_DIR, where they
can be found. 
Inside CMAKE_BINARY_DIR/CMakeFiles/${target}.dir there is another folder
${target}.dir/CMakeFiles/${target}.dir which contains qrc_Editor.cpp.o.
To me it looks like cmake start the rcc step with the wrong folder
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2016-04-15 10:56 Martin HaaßNew Issue
==

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, next, updated. v3.5.1-946-gfb70fd0

[Brad King]

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, next has been updated
   via  fb70fd0af84fbbaf41d12447af134dd37785ac46 (commit)
   via  2faa8b362050c716cc5626f9bb9d8a8612b97f95 (commit)
   via  da07c506b9044e89ad9d904450aa590bb260bd78 (commit)
  from  c591fc554dbadf24ab0481d3f77e62ce74275dbc (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=fb70fd0af84fbbaf41d12447af134dd37785ac46
commit fb70fd0af84fbbaf41d12447af134dd37785ac46
Merge: c591fc5 2faa8b3
Author: Brad King 
AuthorDate: Fri Apr 15 10:29:06 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 10:29:06 2016 -0400

Merge topic 'minor-cleanups' into next

2faa8b36 Add call stack to unused/uninitialized variable warnings
da07c506 cmLocalGenerator: Simplify IssueMessage implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2faa8b362050c716cc5626f9bb9d8a8612b97f95
commit 2faa8b362050c716cc5626f9bb9d8a8612b97f95
Author: Brad King 
AuthorDate: Fri Apr 15 10:13:12 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 10:13:12 2016 -0400

Add call stack to unused/uninitialized variable warnings

In commit v2.8.4~32^2~14 (Use cmake::IssueMessage for warnings,
2010-12-07) these warnings became formatted.  It is more informative to
give the full call stack with such warnings.  Also it is easier to
implement warnings with a full call stack because we do not have to
construct a custom backtrace with only the top.

diff --git a/Source/cmCommandArgumentParserHelper.cxx 
b/Source/cmCommandArgumentParserHelper.cxx
index 14e9e56..15ab746 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -140,15 +140,8 @@ char* cmCommandArgumentParserHelper::ExpandVariable(const 
char* var)
  this->Makefile->GetHomeOutputDirectory()))
 {
 std::ostringstream msg;
-cmListFileContext lfc;
-cmOutputConverter converter(this->Makefile->GetStateSnapshot());
-lfc.FilePath = converter.Convert(this->FileName,
- cmOutputConverter::HOME);
-
-lfc.Line = this->FileLine;
 msg << "uninitialized variable \'" << var << "\'";
-this->Makefile->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
-msg.str(), lfc);
+this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, msg.str());
 }
   }
 return 0;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 162d3e7..13bcdac 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1961,21 +1961,15 @@ void cmMakefile::LogUnused(const char* reason,
   if (this->WarnUnused)
 {
 std::string path;
-cmListFileContext lfc;
 if (!this->ExecutionStatusStack.empty())
   {
-  lfc = this->GetExecutionContext();
-  path = lfc.FilePath;
+  path = this->GetExecutionContext().FilePath;
   }
 else
   {
   path = this->GetCurrentSourceDirectory();
   path += "/CMakeLists.txt";
-  lfc.FilePath = path;
-  lfc.Line = 0;
   }
-cmOutputConverter converter(this->StateSnapshot);
-lfc.FilePath = converter.Convert(lfc.FilePath, cmOutputConverter::HOME);
 
 if (this->CheckSystemVars ||
 cmSystemTools::IsSubDirectory(path,
@@ -1987,9 +1981,7 @@ void cmMakefile::LogUnused(const char* reason,
   {
   std::ostringstream msg;
   msg << "unused variable (" << reason << ") \'" << name << "\'";
-  this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
- msg.str(),
- lfc);
+  this->IssueMessage(cmake::AUTHOR_WARNING, msg.str());
   }
 }
 }
@@ -2919,14 +2911,8 @@ cmake::MessageType 
cmMakefile::ExpandVariablesInStringNew(
  this->GetHomeOutputDirectory()))
 {
 std::ostringstream msg;
-cmListFileContext lfc;
-cmOutputConverter converter(this->StateSnapshot);
-lfc.FilePath =
-converter.Convert(filename, cmOutputConverter::HOME);
-lfc.Line = line;
 msg << "uninitialized variable \'" << lookup << "\'";
-this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
-   msg.str(), lfc);
+

[cmake-developers] [CMake 0016067]: $<TARGET_POLICY:*> generator expression evaluates to NEW instead of 1

[Mantis Bug Tracker]

The following issue has been SUBMITTED. 
== 
https://cmake.org/Bug/view.php?id=16067 
== 
Reported By:Johannes S. Mueller-Roemer
Assigned To:
== 
Project:CMake
Issue ID:   16067
Category:   CMake
Reproducibility:always
Severity:   major
Priority:   normal
Status: new
== 
Date Submitted: 2016-04-15 10:20 EDT
Last Modified:  2016-04-15 10:20 EDT
== 
Summary:$ generator expression evaluates to
NEW instead of 1
Description: 
When the $ generator expression is used, it should evaluate to
1 if the given policy is new and 0 if it is old, as documented here:
https://cmake.org/cmake/help/v3.5/manual/cmake-generator-expressions.7.html

However, with the current version of CMake it evaluates to NEW in the true case.
I did not test the false case, which probably evaluates to OLD.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2016-04-15 10:20 Johannes S. Mueller-RoemerNew Issue
   
==

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[cmake-developers] [CMake 0016066]: Compilation error on ./bootstrap

[Mantis Bug Tracker]

The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=16066 
== 
Reported By:alexfc
Assigned To:
== 
Project:CMake
Issue ID:   16066
Category:   CMakeSetup
Reproducibility:always
Severity:   major
Priority:   normal
Status: new
== 
Date Submitted: 2016-04-15 09:45 EDT
Last Modified:  2016-04-15 09:45 EDT
== 
Summary:Compilation error on ./bootstrap
Description: 
While compiling file cmake-3.5.1/Source/cmPolicies.cxx when launching
./bootstrap.error is :
isdigit not declared in this scope

Steps to Reproduce: 
Download and extract cmake-3.5.1
cd cmake-3.5.1
./boostrap

Additional Information: 
Compilation successful when adding 
#include 
in the file cmake-3.5.1/Source/cmPolicies.cxx
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2016-04-15 09:45 alexfc New Issue
==

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, next, updated. v3.5.1-943-gc591fc5

[Brad King]

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, next has been updated
   via  c591fc554dbadf24ab0481d3f77e62ce74275dbc (commit)
   via  c2996c7be869a2e8ed30237ca5c890e8ebe05498 (commit)
   via  80bcbe2d85232d748e31fb4de1016af60788505d (commit)
  from  0eb96ab1f34ea78a2c24443f140a8bf8ddd043fd (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=c591fc554dbadf24ab0481d3f77e62ce74275dbc
commit c591fc554dbadf24ab0481d3f77e62ce74275dbc
Merge: 0eb96ab c2996c7
Author: Brad King 
AuthorDate: Fri Apr 15 08:51:25 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 08:51:25 2016 -0400

Merge topic 'test-release' into next

c2996c7b Merge branch 'release' into test-release
80bcbe2d CMake 3.5.2


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2996c7be869a2e8ed30237ca5c890e8ebe05498
commit c2996c7be869a2e8ed30237ca5c890e8ebe05498
Merge: c42aa3e 80bcbe2
Author: Brad King 
AuthorDate: Fri Apr 15 08:51:06 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 08:51:06 2016 -0400

Merge branch 'release' into test-release


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80bcbe2d85232d748e31fb4de1016af60788505d
commit 80bcbe2d85232d748e31fb4de1016af60788505d
Author: Brad King 
AuthorDate: Fri Apr 15 08:48:23 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 08:48:23 2016 -0400

CMake 3.5.2

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 683da43..dea1541 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 5)
-set(CMake_VERSION_PATCH 1)
+set(CMake_VERSION_PATCH 2)
 #set(CMake_VERSION_RC 0)

---

Summary of changes:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.1-940-g0eb96ab

[Brad King]

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, next has been updated
   via  0eb96ab1f34ea78a2c24443f140a8bf8ddd043fd (commit)
   via  c42aa3ed8b11d96fe27d2cdda185da0ed45f38ef (commit)
  from  99da0758b5fcc23db7a958a27dc51ef825dbb393 (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=0eb96ab1f34ea78a2c24443f140a8bf8ddd043fd
commit 0eb96ab1f34ea78a2c24443f140a8bf8ddd043fd
Merge: 99da075 c42aa3e
Author: Brad King 
AuthorDate: Fri Apr 15 08:50:46 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 08:50:46 2016 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.5.1-938-g99da075

[Brad King]

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, next has been updated
   via  99da0758b5fcc23db7a958a27dc51ef825dbb393 (commit)
   via  cc7aed77a8774c565c8bc6c4965f10e3560f8d64 (commit)
   via  c50285dee66394b68eb3df17d190072289a33a4e (commit)
   via  b6ed71b17c888c5f79129871bf7bc865b43063e3 (commit)
   via  a559f0f6b020697a064517637ae04f0733ffc6ea (commit)
   via  7503deb2c55a32f72c9ec34f17a800d4ab1e4c75 (commit)
  from  9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c (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=99da0758b5fcc23db7a958a27dc51ef825dbb393
commit 99da0758b5fcc23db7a958a27dc51ef825dbb393
Merge: 9f42343 cc7aed7
Author: Brad King 
AuthorDate: Fri Apr 15 08:46:46 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 08:46:46 2016 -0400

Merge topic 'minor-cleanups' into next

cc7aed77 cmLocalGenerator: Use own IssueMessage method
c50285de cmOutputConverter: Assert construction with a valid snapshot
b6ed71b1 cmMakefile: Move cmMakefileCall to .cxx file
a559f0f6 cmWhileCommand: Simplify context construction
7503deb2 cmIfCommand: Simplify execution context construction


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc7aed77a8774c565c8bc6c4965f10e3560f8d64
commit cc7aed77a8774c565c8bc6c4965f10e3560f8d64
Author: Brad King 
AuthorDate: Thu Apr 14 16:35:12 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 08:34:05 2016 -0400

cmLocalGenerator: Use own IssueMessage method

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 0195b9e..746bcab 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1608,7 +1608,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& 
linkLibraries,
 "For compatibility with older versions of CMake, "
 "additional flags may be added to export symbols on all "
 "executables regardless of thier ENABLE_EXPORTS property.";
-  this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
+  this->IssueMessage(cmake::AUTHOR_WARNING, w.str());
   }
   case cmPolicies::OLD:
 // OLD behavior is to always add the flags
@@ -1616,7 +1616,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& 
linkLibraries,
 break;
   case cmPolicies::REQUIRED_IF_USED:
   case cmPolicies::REQUIRED_ALWAYS:
-this->Makefile->IssueMessage(
+this->IssueMessage(
   cmake::FATAL_ERROR,
   cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0065)
   );

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50285dee66394b68eb3df17d190072289a33a4e
commit c50285dee66394b68eb3df17d190072289a33a4e
Author: Brad King 
AuthorDate: Thu Apr 14 11:49:32 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 08:34:05 2016 -0400

cmOutputConverter: Assert construction with a valid snapshot

We unconditionally use information from the snapshot so it must be
valid.

diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 5acae2f..59fb2e9 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -22,6 +22,7 @@
 cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot)
   : StateSnapshot(snapshot), LinkScriptShell(false)
 {
+  assert(this->StateSnapshot.IsValid());
 }
 
 //

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6ed71b17c888c5f79129871bf7bc865b43063e3
commit b6ed71b17c888c5f79129871bf7bc865b43063e3
Author: Brad King 
AuthorDate: Thu Apr 14 11:02:40 2016 -0400
Commit: Brad King 
CommitDate: Fri Apr 15 08:32:15 2016 -0400

cmMakefile: Move cmMakefileCall to .cxx file

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7be6b88..162d3e7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -222,6 +222,26 @@ void cmMakefile::PrintCommandTrace(const 
cmListFileFunction& lff) const
   cmSystemTools::Message(msg.str().c_str());
 }
 
+// Helper class to make sure the call stack is valid.
+class cmMakefileCall
+{
+public:
+  cmMakefileCall(cmMakefile* mf, const cmCommandContext& lfc,
+ cmExecutionStatus& status): Makefile(mf)
+{
+this->Makefile->ContextStack.push_back();
+this->Makefile->ExecutionStatusStack.push_back();
+}
+
+  ~cmMakefileCall()
+{
+

[Cmake-commits] CMake branch, next, updated. v3.5.1-932-g9f42343

[Robert Maynard]

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, next has been updated
   via  9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c (commit)
   via  3dcd7eded5682de6f92ceb4efc82c65ba5827941 (commit)
   via  66594ff3baf0c358e639f703b3e2b7776d9becbd (commit)
   via  003d4e57521a876b7340ed164a737d99eabb164d (commit)
  from  ee786eaf3e502aeadc0e1b2913cf26fd0ec451a8 (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=9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c
commit 9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c
Merge: ee786ea 3dcd7ed
Author: Robert Maynard 
AuthorDate: Fri Apr 15 08:20:18 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Apr 15 08:20:18 2016 -0400

Merge topic 'intel_compiler_feature_detection' into next

3dcd7ede Add Intel to list of supported compiler for feature detection.
66594ff3 Add CXX_STANDARD support to Intel C++ compilers
003d4e57 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dcd7eded5682de6f92ceb4efc82c65ba5827941
commit 3dcd7eded5682de6f92ceb4efc82c65ba5827941
Author: Robert Maynard 
AuthorDate: Thu Apr 14 08:57:07 2016 -0400
Commit: Robert Maynard 
CommitDate: Thu Apr 14 15:48:02 2016 -0400

Add Intel to list of supported compiler for feature detection.

diff --git a/Help/manual/cmake-compile-features.7.rst 
b/Help/manual/cmake-compile-features.7.rst
index caf5bac..84c6bca 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -309,3 +309,4 @@ versions specified for each:
 * ``GNU``: GNU compiler versions 4.4 through 5.0.
 * ``MSVC``: Microsoft Visual Studio versions 2010 through 2015.
 * ``SunPro``: Oracle SolarisStudio version 12.4.
+* ``Intel``: Intel compiler versions 14.0 through 16.0
diff --git a/Modules/WriteCompilerDetectionHeader.cmake 
b/Modules/WriteCompilerDetectionHeader.cmake
index a3b73bb..2669a84 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -36,7 +36,7 @@
 #  PREFIX ClimbingStats
 #  OUTPUT_FILES_VAR support_files
 #  OUTPUT_DIR compilers
-#  COMPILERS GNU Clang MSVC
+#  COMPILERS GNU Clang MSVC Intel
 #  FEATURES cxx_variadic_templates
 #)
 #install(FILES
@@ -100,7 +100,7 @@
 #write_compiler_detection_header(
 #  FILE climbingstats_compiler_detection.h
 #  PREFIX ClimbingStats
-#  COMPILERS GNU Clang AppleClang MSVC
+#  COMPILERS GNU Clang AppleClang MSVC Intel
 #  FEATURES cxx_variadic_templates
 #)
 #
@@ -323,6 +323,7 @@ function(write_compiler_detection_header
 AppleClang
 MSVC
 SunPro
+Intel
   )
 
   set(_hex_compilers ADSP Borland Embarcadero SunPro)
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt 
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index c538280..c3f5b4c 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -11,7 +11,7 @@ get_property(c_known_features GLOBAL PROPERTY 
CMAKE_C_KNOWN_FEATURES)
 write_compiler_detection_header(
   FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h"
   PREFIX TEST
-  COMPILERS GNU Clang AppleClang MSVC SunPro
+  COMPILERS GNU Clang AppleClang MSVC SunPro Intel
   VERSION 3.1
   PROLOG "// something"
   EPILOG "// more"
@@ -78,6 +78,13 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   endif()
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  list(APPEND false_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS)
+  list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
+  set(true_defs "")
+endif()
+
+
 if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
 OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
 OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
@@ -104,7 +111,7 @@ write_compiler_detection_header(
   PREFIX MULTI
   OUTPUT_FILES_VAR multi_files
   OUTPUT_DIR 
"${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support"
-  COMPILERS GNU Clang AppleClang MSVC SunPro
+  COMPILERS GNU Clang AppleClang MSVC SunPro Intel
   VERSION 3.1
   FEATURES
 ${cxx_known_features} ${c_known_features}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66594ff3baf0c358e639f703b3e2b7776d9becbd
commit 66594ff3baf0c358e639f703b3e2b7776d9becbd
Author: Levi Morrison 
AuthorDate: Mon Nov 16 09:19:30 2015 -0700
Commit: Robert Maynard 
CommitDate: Thu Apr 14 15:48:01 2016 -0400

Add CXX_STANDARD support to Intel 

[CMake] How to include public-headers of dependent targets first, before arguments in target_include_directories()

[quanzhao198757]

I want to cross-compile cairo in many systems, and cairo depend on zlib, libpng 
and pixman, optionally search for freetype and fontconfig. I got sources of 
zlib, libpng and pixman, and use cmake to compile and link them. But when 
compile cairo, I got following flags by cmake:

C_INCLUDES = -I/Users/quanzhao/git-space/tigerknows-mapcore/externals/cairo/src 
-I/Users/quanzhao/git-space/tigerknows-mapcore/x86_64-macosx-clang-debug.make.build/cairo/cairo
 -I/Users/quanzhao/git-space/homebrew/include/freetype2 
-I/Users/quanzhao/git-space/homebrew/include 
-I/Users/quanzhao/git-space/tigerknows-mapcore/x86_64-macosx-clang-debug.make.build/zlib/zlib-interface
 
-I/Users/quanzhao/git-space/tigerknows-mapcore/x86_64-macosx-clang-debug.make.build/png/png-interface
 
-I/Users/quanzhao/git-space/tigerknows-mapcore/x86_64-macosx-clang-debug.make.build/pixman/pixman-interface

Header of library fontconfig is installed in 
'/Users/quanzhao/git-space/homebrew/include' where a libpng(version 16) is 
installed... My local sources of libpng is version 15 so I fail to ran my 
program right... 

How can I include interface-headers of dependent targets first? In this example 
it is the flag 
'-I/Users/quanzhao/git-space/tigerknows-mapcore/x86_64-macosx-clang-debug.make.build/png/png-interface'
 added by cmake automatically.
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake