[CMake] ExternalProject_Add and include_external_msproject dynamic duo... but what if their powers combined?

[Brian J. Davis]

Every time I create a superbuild using ExternalProject_Add sooner or 
later a project will not support cmake, but will have buried within its 
bowels  a visual studio solution project .sln and sometimes gobs of 
.vcxproj files (read CPython).  Now ofcourse include_external_msproject 
can do this.  If only these two wonder twins 
(https://en.wikipedia.org/wiki/Wonder_Twins) could work together in the 
same ExternalProject_Add command.  Maybe by adding after HG_TAG say 
VCX_PROJS or some such.


Only thing better would be getting original project maintainer to 
support CMake.


So feature request: Can we get ExternalProject_Add to support visual 
studio project files?




--

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] Linker flags on all except a couple of programs

[Paul Smith]

I have a CMake-based build that creates about 170 binaries (most of them
are individual unit test programs).

I have set the CMAKE_EXE_LINKER_FLAGS to a set of flags I wanted on all
the binaries.

Now it turns out that I need to remove, or not set, one specific flag on
a small number (like 5) of these binaries, but I still want it set on
all the others.  Unfortunately for this flag there's no "turn it off"
extra flag I can add to the end of the list of flags: I have to actually
remove the flag itself.

What's the cleanest/simplest way to accomplish this?  I don't really
want to modify my cmake files to add an explicit set_target_property()
to all 165 binaries that I _do_ want to have this flag set on, just so I
can avoid calling it on the 5 binaries I don't.  I want to add something
particular to the 5 "oddball" binaries, instead, to override these
values.

But I can't seem to come up with a way to remove a flag from a global
list like this, just for one (or a few) targets.


Any hints?
-- 

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, master, updated. v3.7.1-1030-g053adc6

[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  053adc60ee80e55f2a8c09fadadc5db6e789412d (commit)
  from  e0cc40ed58a16f63a26cf25c56f6e8471401fbfe (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=053adc60ee80e55f2a8c09fadadc5db6e789412d
commit 053adc60ee80e55f2a8c09fadadc5db6e789412d
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Thu Jan 12 00:01:06 2017 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jan 12 00:01:06 2017 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a5a07dc..fde01c1 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 7)
-set(CMake_VERSION_PATCH 20170111)
+set(CMake_VERSION_PATCH 20170112)
 #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-developers] [Discussion] Add python support for CMakeLists

[Shmuel H,]

Hello,

First of all, I have been using CMake for a few years now, it is awesome
tool, thank you.

The only problem I currently have with CMake is its language, which has not
really intended to be one. After reading a few endless discussions about
this topic, I decided to give it a try and do something practical.

My current design is using Python as an extension for the regular
CMakeLists.txt files: if there is a CMakeLists.py file, it would be loaded.

It should not be too hard to maintain, the current API design uses only 1-3
function that should be implemented in cmake.

For more information, see the [closed] merge request #389
.

I would be happy to hear your opinion about this idea.

Best regards,
Shmuel H.
-- 

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] deprecate check_function_exists?

[Stephen Sorley]

There are two big issues with the check_function_exists() module that I've
run into, and that others have also encountered:

(1) It can't detect functions that are inlined in system headers or
specified as a #define macro. (see
https://cmake.org/pipermail/cmake-developers/2015-July/025766.html)

(2) For 32-bit Windows builds, it can't link against functions declared
with a different calling convention than __cdecl. Since the Win32 API uses
__stdcall, check_function_exists can't detect anything from libraries like
kernel.lib or ws2_32.lib. (see
https://cmake.org/pipermail/cmake/2008-April/021099.html)

The check_symbol_exists() module solves both of the above problems, and it
does verify that the function is available at link time (if the symbol
isn't a #define).

So, could check_function_exists() be explicitly deprecated in the
documentation in favor of check_symbol_exists()?  I think most users find
it natural to try using check_function_exists() first because of the name,
when they really should be using check_symbol_exists() for all of the use
cases I can think of.


Thanks!

Stephen Sorley
-- 

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] Problems building a MODULE library (OpenFX plugin) with correct cuda object linking

[Robert Maynard]

I believe you will want to use the low level command CUDA_WRAP_SRCS
with the MODULE option. Since CUDA_WRAP_SRCS is a low level command,
If you need separable compilation you will need to manually invoke
those steps too ( read CUDA_SEPARABLE_COMPILATION documentation on
what methods you will need to use ).

On Tue, Jan 10, 2017 at 1:30 PM,   wrote:
> Hello,
>
> after hours and hours of searching and trying to get it to work I hope
> someone here can help me as I'm now out of ideas. I'm trying to build an
> OpenFX plugin for DaVinci Resolve (a movie color grading software,
> https://www.blackmagicdesign.com/products) via CMake. Resolve is delivered
> with a developer sample plugin using a standard Makefile (Mac) and project
> files for Apple XCode/VisualStudio. But for a better structure I wanted to
> build a CMake build framework for this plugin.
>
> Notes for better understanding: The CUDA implementation is a proprietary Add
> On to the OpenSource OpenFX interfaces as far as I understand it. Stock
> OpenFX would pass memory references only to host memory address space while
> the Resolve extension passed CUDA/OpenCL addresses to reduce memory transfer
> overhead for better real time processing. OpenFX plugins are build as
> bundles of objects(?) (MODULE library build in CMake).
>
> The basic structure is a plugin that offers processing with CPU, OpenCL or
> CUDA depending on the processing mode the host application is using. This
> plugin is bundled into a single module library which is loaded by Resolve.
> For the plugin a few helper classes are used to handle the Plugin metadata
> (user interface, host communication) while CUDA/OpenCL control code is also
> seperated into two separate files (OpenCLKernel.cpp and CudaKernel.cu). Both
> contain the GPU Kernel itselt and a host function which is included in the
> main Plugin just via extern declaration. Sample:
>>
>> extern void RunCudaKernel(int p_Width, int p_Height, float* p_Gain, const
>> float* p_Input, float* p_Output);
>
>
> The Makefile then just compiles all cpp files with the standard $(CXX)
> compiler and the CudaKernel.cu with $(NVCC) which is defined before. Then a
> simple
>>
>> $(CXX) -bundle $^ -o $@ -L${CUDAPATH}/lib -lcuda -lcudart
>> -F/Library/Frameworks -framework CUDA -framework OpenCL
>
> does the linking and works fine.
>
>
> I tried to replicate this structure of linking in CMake and it works as long
> as I keep CUDA deactivated (One of the reasons of building a flexible CMake
> infrastructure is making a few parts configurable via CMake/Compiler
> options). Most stuff is working now, but I have a problem integrating the
> CUDA part.
>
> For OpenCL I just build an object library from the OpenCLKernel.cpp and add
> it as a target object:
>>
>> add_library(GainLibOpenCL OBJECT OpenCLKernel.cpp)
>
> ...
>>
>> add_library(${PLUGIN_NAME} MODULE src/${PLUGIN_NAME}.cpp
>> $)
>
>
> I tried to replicate this for the CUDA code but cuda_add_library doesn't
> seem to support generating object files and a combination of cuda_compile +
> add_library also doesn't allow to generate object files so how do I
> replicate the Makefile result.
>
> Here are two examples how I tried different methods. Did a few more tests
> based on many results of questions on the net but non solved my problem.
>
> Variant 1:
>>
>>  cuda_add_library(GainLibCUDA CudaKernel.cu)
>>  set(LIBS ${LIBS} GainLibCUDA PARENT_SCOPE)
>
> Will compile but result in a crash of Resolve, with STATIC as an option for
> cuda_add_library it builds and Resolve stays open, but processing isn't
> working. And it links to the CUDA static libraries which isn't intended as
> the host cuda lib should be used.
>
>>  cuda_compile(cuda_exec_obj CudaKernel.cu)
>>  add_library(GainLibCUDA OBJECT CudaKernel.h ${cuda_exec_obj})
>>  set(TARGET_OBJECTS ${TARGET_OBJECTS} $
>> PARENT_SCOPE)
>
>
> Results in the error:
>>
>> CMake Error at src/CUDA/CMakeLists.txt:21 (add_library):
>>   OBJECT library "GainLibCUDA" contains:
>>
>> cuda_compile_1_generated_CudaKernel.cu.o
>>
>>   but may contain only sources that compile, header files, and other files
>>   that would not affect linking of a normal library.
>
>
> Also just adding "cuda_compile(cuda_exec_obj CudaKernel.cu)" and then
> ${cuda_exec_obj} as a file to the "add_library(${PLUGIN_NAME} MODULE ..."
> line results in and error: "Cannot find source file".
>
> So this mail got pretty long but I hope this helps someone to help me and
> then also help others if they reach a similar problem.
>
>
> Kind regards,
> Ingmar
> --
>
> 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: 

[Cmake-commits] CMake branch, next, updated. v3.7.1-2093-g3dd0616

[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  3dd0616af3c5928e5c880186d5cfd241506a4369 (commit)
   via  efff7086c66d63c62d9474eca5a3b2d21d725bfe (commit)
  from  a37e6e27efa5729c6136105f6bd702986050d58c (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=3dd0616af3c5928e5c880186d5cfd241506a4369
commit 3dd0616af3c5928e5c880186d5cfd241506a4369
Merge: a37e6e2 efff708
Author: Brad King 
AuthorDate: Wed Jan 11 15:06:11 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 15:06:11 2017 -0500

Merge topic 'asan_overriding_user_options' into next

efff7086 ctest_memcheck: Append sanitizers user options at the end to allow 
overriding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efff7086c66d63c62d9474eca5a3b2d21d725bfe
commit efff7086c66d63c62d9474eca5a3b2d21d725bfe
Author: Sylvain Joubert 
AuthorDate: Wed Jan 11 18:58:19 2017 +0100
Commit: Sylvain Joubert 
CommitDate: Wed Jan 11 19:27:45 2017 +0100

ctest_memcheck: Append sanitizers user options at the end to allow 
overriding

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx 
b/Source/CTest/cmCTestMemCheckHandler.cxx
index 4d23e45..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -634,7 +634,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
   std::string outputFile =
 envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
   this->MemoryTesterEnvironmentVariable =
-outputFile + extraOptions + suppressionsOption;
+outputFile + suppressionsOption + extraOptions;
   break;
 }
 default:

---

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |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.7.1-2091-ga37e6e2

[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  a37e6e27efa5729c6136105f6bd702986050d58c (commit)
   via  4b0c13a87ffb799334669f77978cc4d5e83f950a (commit)
  from  aedbd25e061fc348bd2b88862956d972a955059b (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=a37e6e27efa5729c6136105f6bd702986050d58c
commit a37e6e27efa5729c6136105f6bd702986050d58c
Merge: aedbd25 4b0c13a
Author: Brad King 
AuthorDate: Wed Jan 11 14:57:17 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 14:57:17 2017 -0500

Merge topic 'launcher-tests' into next

4b0c13a8 Tests: Add additional launcher tests


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b0c13a87ffb799334669f77978cc4d5e83f950a
commit 4b0c13a87ffb799334669f77978cc4d5e83f950a
Author: Matthew Woehlke 
AuthorDate: Tue Jan 10 13:48:59 2017 -0500
Commit: Matthew Woehlke 
CommitDate: Tue Jan 10 13:48:59 2017 -0500

Tests: Add additional launcher tests

Modify the launcher test to also try to build two executables, having
respectively build and link errors. This is intended to test that
launchers are used when running compile and link commands, as well as
custom commands. (In particular, this should catch breakage such as that
fixed by ce71bd9505a.)

diff --git 
a/Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt 
b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt
new file mode 100644
index 000..7376a40
--- /dev/null
+++ b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(launcher_compiler_test_project)
+
+include(CTest)
+
+add_executable(build_error build_error.cxx)
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake 
b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
similarity index 100%
copy from Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake
copy to 
Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
diff --git 
a/Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx 
b/Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx
new file mode 100644
index 000..2d51693
--- /dev/null
+++ b/Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx
@@ -0,0 +1,5 @@
+int main()
+{
+  int = 3;
+  return;
+}
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CMakeLists.txt 
b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CMakeLists.txt
similarity index 89%
rename from Tests/CTestTestLaunchers/launcher_test_project/CMakeLists.txt
rename to 
Tests/CTestTestLaunchers/launcher_custom_command_test_project/CMakeLists.txt
index 06c5725..b31f587 100644
--- a/Tests/CTestTestLaunchers/launcher_test_project/CMakeLists.txt
+++ 
b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.12)
 
-project(launcher_test_project)
+project(launcher_custom_command_test_project)
 
 include(CTest)
 
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake 
b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
similarity index 100%
copy from Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake
copy to 
Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/command.cmake 
b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/command.cmake
similarity index 100%
rename from Tests/CTestTestLaunchers/launcher_test_project/command.cmake
rename to 
Tests/CTestTestLaunchers/launcher_custom_command_test_project/command.cmake
diff --git 
a/Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt 
b/Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt
new file mode 100644
index 000..38980aa
--- /dev/null
+++ b/Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(launcher_linker_test_project)
+
+include(CTest)
+
+add_executable(link_error link_error.cxx)
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake 
b/Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake
similarity index 100%
rename from Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake
rename to 

[Cmake-commits] CMake branch, next, updated. v3.7.1-2089-gaedbd25

[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  aedbd25e061fc348bd2b88862956d972a955059b (commit)
   via  7bad99b0d3fb50853937d99cd68eb340a0975156 (commit)
  from  d3c7c8008643475c656562837bf3c072e57ef799 (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=aedbd25e061fc348bd2b88862956d972a955059b
commit aedbd25e061fc348bd2b88862956d972a955059b
Merge: d3c7c80 7bad99b
Author: Brad King 
AuthorDate: Wed Jan 11 13:51:56 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 13:51:56 2017 -0500

Merge topic 'cmFileMonitor-skip-empty-names' into next

7bad99b0 cmake-server: Do not try watching subdirectories with empty names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bad99b0d3fb50853937d99cd68eb340a0975156
commit 7bad99b0d3fb50853937d99cd68eb340a0975156
Author: Aleix Pol 
AuthorDate: Wed Jan 11 19:08:04 2017 +0100
Commit: Brad King 
CommitDate: Wed Jan 11 13:48:41 2017 -0500

cmake-server: Do not try watching subdirectories with empty names

`cmsys::SystemTools::SplitPath` will return empty segments on paths
where there's duplicaded consequent slashes (e.g.  `/home/dir/my//stuff`).
This makes the cmFileWatcher choke.  Teach cmFileMonitor to skip these
empty segments.

Closes: #16531

diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx
index ea37683..815de95 100644
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@@ -331,6 +331,9 @@ void cmFileMonitor::MonitorPaths(const 
std::vector& paths,
   rootSegment)); // Can not be both filename and root part of the path!
 
   const std::string& currentSegment = pathSegments[i];
+  if (currentSegment.empty()) {
+continue;
+  }
 
   cmIBaseWatcher* nextWatcher = currentWatcher->Find(currentSegment);
   if (!nextWatcher) {

---

Summary of changes:
 Source/cmFileMonitor.cxx |3 +++
 1 file changed, 3 insertions(+)


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.7.1-2087-gd3c7c80

[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  d3c7c8008643475c656562837bf3c072e57ef799 (commit)
   via  6310f7c3a06cf56ddfda7fd5d2a36decb6802e57 (commit)
  from  e80f026bd36fbfe70b0d88caa81bed429ca81b11 (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=d3c7c8008643475c656562837bf3c072e57ef799
commit d3c7c8008643475c656562837bf3c072e57ef799
Merge: e80f026 6310f7c
Author: Brad King 
AuthorDate: Wed Jan 11 13:25:59 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 13:25:59 2017 -0500

Merge topic 'add-cpack-ifw-configure-file' into next

6310f7c3 Add cpack_ifw_configure_file command


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6310f7c3a06cf56ddfda7fd5d2a36decb6802e57
commit 6310f7c3a06cf56ddfda7fd5d2a36decb6802e57
Author: Konstantin Podsvirov 
AuthorDate: Tue Dec 13 02:01:14 2016 +0300
Commit: Konstantin Podsvirov 
CommitDate: Wed Jan 11 13:56:45 2017 +0300

Add cpack_ifw_configure_file command

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 015e36e..d4712ba 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -59,6 +59,7 @@ All Modules
/module/CPackDeb
/module/CPackDMG
/module/CPackIFW
+   /module/CPackIFWConfigureFile
/module/CPackNSIS
/module/CPackPackageMaker
/module/CPackProductBuild
diff --git a/Help/module/CPackIFWConfigureFile.rst 
b/Help/module/CPackIFWConfigureFile.rst
new file mode 100644
index 000..e88517c
--- /dev/null
+++ b/Help/module/CPackIFWConfigureFile.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/CPackIFWConfigureFile.cmake
diff --git a/Help/release/dev/cpack-ifw-configure-file.rst 
b/Help/release/dev/cpack-ifw-configure-file.rst
new file mode 100644
index 000..c9a1220
--- /dev/null
+++ b/Help/release/dev/cpack-ifw-configure-file.rst
@@ -0,0 +1,9 @@
+cpack-ifw-configure-file
+
+
+* The :command:`cpack_ifw_configure_file` command was added
+  (in :module:`CPackIFWConfigureFile`) to configure file templates prepared
+  in QtIFW/SDK/Creator style.
+
+* The :module:`CPackIFWConfigureFile` module was added to define
+  :command:`cpack_ifw_configure_file` command.
diff --git a/Modules/CPackIFWConfigureFile.cmake 
b/Modules/CPackIFWConfigureFile.cmake
new file mode 100644
index 000..790574a
--- /dev/null
+++ b/Modules/CPackIFWConfigureFile.cmake
@@ -0,0 +1,65 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#.rst:
+# CPackIFWConfigureFile
+# -
+#
+# The module defines :command:`configure_file` similar command to
+# configure file templates prepared in QtIFW/SDK/Creator style.
+#
+#
+# Commands
+# 
+#
+# The module defines the following commands:
+#
+# .. command:: cpack_ifw_configure_file
+#
+#   Copy a file to another location and modify its contents.
+#
+#   ::
+#
+# cpack_ifw_configure_file( )
+#
+#   Copies an  file to an  file and substitutes variable
+#   values referenced as ``%{VAR}`` or ``%VAR%`` in the input file content.
+#   Each variable reference will be replaced with the current value of the
+#   variable, or the empty string if the variable is not defined.
+#
+
+# NOTE: This file used to himself packaging via CPack IFW generator and
+# should be compatible with minimal CMake version defined in
+# ../CMakeLists.txt file.
+
+if(NOT DEFINED CPackIFWConfigureFile_CMake_INCLUDED)
+set(CPackIFWConfigureFile_CMake_INCLUDED 1)
+
+macro(cpack_ifw_configure_file INPUT OUTPUT)
+  file(READ "${INPUT}" _tmp)
+  foreach(_tmp_regex "%{([^%}]+)}" "%([^%]+)%")
+string(REGEX MATCHALL "${_tmp_regex}" _tmp_vars "${_tmp}")
+while(_tmp_vars)
+  foreach(_tmp_var ${_tmp_vars})
+string(REGEX REPLACE "${_tmp_regex}" "\\1"
+  _tmp_var_name "${_tmp_var}")
+if(DEFINED ${_tmp_var_name})
+  set(_tmp_var_value "${${_tmp_var_name}}")
+elseif(NOT "$ENV{${_tmp_var_name}}" STREQUAL "")
+  set(_tmp_var_value "$ENV{${_tmp_var_name}}")
+else()
+  set(_tmp_var_value "")
+endif()
+string(REPLACE "${_tmp_var}" "${_tmp_var_value}" _tmp "${_tmp}")
+  endforeach()
+  string(REGEX MATCHALL "${_tmp_regex}" _tmp_vars "${_tmp}")
+endwhile()
+  endforeach()
+  if(IS_ABSOLUTE "${OUTPUT}")
+file(WRITE "${OUTPUT}" "${_tmp}")
+  else()
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}" "${_tmp}")
+ 

[Cmake-commits] CMake branch, next, updated. v3.7.1-2085-ge80f026

[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  e80f026bd36fbfe70b0d88caa81bed429ca81b11 (commit)
   via  0315ab7a31091eda95caac319d42409c24fc6fac (commit)
  from  6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5 (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=e80f026bd36fbfe70b0d88caa81bed429ca81b11
commit e80f026bd36fbfe70b0d88caa81bed429ca81b11
Merge: 6ec6ac2 0315ab7
Author: Brad King 
AuthorDate: Wed Jan 11 11:54:44 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 11:54:44 2017 -0500

Merge topic 'cmake-install-infix' into next

0315ab7a Add installation infix (empty by default)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0315ab7a31091eda95caac319d42409c24fc6fac
commit 0315ab7a31091eda95caac319d42409c24fc6fac
Author: Konstantin Podsvirov 
AuthorDate: Wed Jan 11 14:10:39 2017 +0300
Commit: Konstantin Podsvirov 
CommitDate: Wed Jan 11 14:10:39 2017 +0300

Add installation infix (empty by default)

diff --git a/Source/CMakeInstallDestinations.cmake 
b/Source/CMakeInstallDestinations.cmake
index 023f6c0..28f4e87 100644
--- a/Source/CMakeInstallDestinations.cmake
+++ b/Source/CMakeInstallDestinations.cmake
@@ -25,6 +25,12 @@ set(CMAKE_DOC_DIR_DESC "docs")
 set(CMAKE_MAN_DIR_DESC "man pages")
 set(CMAKE_XDGDATA_DIR_DESC "XDG specific files")
 
+set(CMake_INSTALL_INFIX "" CACHE STRING "")
+set_property(CACHE CMake_INSTALL_INFIX PROPERTY HELPSTRING
+  "Intermediate installation path (empty by default)"
+  )
+mark_as_advanced(CMake_INSTALL_INFIX)
+
 foreach(v
 CMAKE_BIN_DIR
 CMAKE_DATA_DIR
@@ -41,7 +47,7 @@ foreach(v
 
   # Use the default when the user did not set this variable.
   if(NOT ${v})
-set(${v} "${${v}_DEFAULT}")
+set(${v} "${CMake_INSTALL_INFIX}${${v}_DEFAULT}")
   endif()
   # Remove leading slash to treat as relative to install prefix.
   string(REGEX REPLACE "^/" "" ${v} "${${v}}")

---

Summary of changes:
 Source/CMakeInstallDestinations.cmake |8 +++-
 1 file changed, 7 insertions(+), 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.7.1-2083-g6ec6ac2

[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  6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5 (commit)
   via  3462118c6d700754e243492c3a65ef4ff26923f5 (commit)
  from  ef155cf6403be058f878d046045e111a1bff41d8 (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=6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5
commit 6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5
Merge: ef155cf 3462118
Author: Brad King 
AuthorDate: Wed Jan 11 11:48:11 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 11:48:11 2017 -0500

Merge topic 'codeblocks-nmake-makefiles-jom' into next

3462118c Allow CodeBlocks for NMake Makefiles JOM


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3462118c6d700754e243492c3a65ef4ff26923f5
commit 3462118c6d700754e243492c3a65ef4ff26923f5
Author: Konstantin Podsvirov 
AuthorDate: Tue Jan 10 01:23:18 2017 +0300
Commit: Konstantin Podsvirov 
CommitDate: Tue Jan 10 19:26:21 2017 +0300

Allow CodeBlocks for NMake Makefiles JOM

diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index 01798c7..d03cb0c 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,6 +18,9 @@ This "extra" generator may be specified as:
 ``CodeBlocks - NMake Makefiles``
  Generate with :generator:`NMake Makefiles`.
 
+``CodeBlocks - NMake Makefiles JOM``
+ Generate with :generator:`NMake Makefiles JOM`.
+
 ``CodeBlocks - Ninja``
  Generate with :generator:`Ninja`.
 
diff --git a/Help/release/dev/codeblocks-nmake-makefiles-jom.rst 
b/Help/release/dev/codeblocks-nmake-makefiles-jom.rst
new file mode 100644
index 000..f5612f0
--- /dev/null
+++ b/Help/release/dev/codeblocks-nmake-makefiles-jom.rst
@@ -0,0 +1,5 @@
+codeblocks-nmake-makefiles-jom
+--
+
+* The :generator:`CodeBlocks` now can generate with
+  :generator:`NMake Makefiles JOM`.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx 
b/Source/cmExtraCodeBlocksGenerator.cxx
index f544e8a..2dffcaa 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -48,6 +48,7 @@ cmExtraCodeBlocksGenerator::GetFactory()
 #if defined(_WIN32)
 factory.AddSupportedGlobalGenerator("MinGW Makefiles");
 factory.AddSupportedGlobalGenerator("NMake Makefiles");
+factory.AddSupportedGlobalGenerator("NMake Makefiles JOM");
 // disable until somebody actually tests it:
 // this->AddSupportedGlobalGenerator("MSYS Makefiles");
 #endif
@@ -741,7 +742,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   }
 
   std::string generator = this->GlobalGenerator->GetName();
-  if (generator == "NMake Makefiles") {
+  if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
 // For Windows ConvertToOutputPath already adds quotes when required.
 // These need to be escaped, see
 // https://gitlab.kitware.com/cmake/cmake/issues/13952

---

Summary of changes:
 Help/generator/CodeBlocks.rst   |3 +++
 Help/release/dev/codeblocks-nmake-makefiles-jom.rst |5 +
 Source/cmExtraCodeBlocksGenerator.cxx   |3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/codeblocks-nmake-makefiles-jom.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, next, updated. v3.7.1-2081-gef155cf

[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  ef155cf6403be058f878d046045e111a1bff41d8 (commit)
   via  eb728d266e171987616c71a63f3f772eab45ebf3 (commit)
  from  5c6d51bdf072a8fb6e683636321e57430c0268ac (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=ef155cf6403be058f878d046045e111a1bff41d8
commit ef155cf6403be058f878d046045e111a1bff41d8
Merge: 5c6d51b eb728d2
Author: Brad King 
AuthorDate: Wed Jan 11 11:45:17 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 11:45:17 2017 -0500

Merge topic 'FindJava-jre-hints' into next

eb728d26 FindJava: add hints for jre


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb728d266e171987616c71a63f3f772eab45ebf3
commit eb728d266e171987616c71a63f3f772eab45ebf3
Author: Rechi Rechi 
AuthorDate: Wed Jan 11 16:31:01 2017 +0100
Commit: Rechi Rechi 
CommitDate: Wed Jan 11 16:31:01 2017 +0100

FindJava: add hints for jre

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 5c0abb0..4265a97 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -86,6 +86,14 @@ list(APPEND _JAVA_HINTS
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.5;JavaHome]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.4;JavaHome]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.3;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\2.0;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\1.9;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\1.8;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\1.7;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\2.6;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\1.5;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\1.4;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime 
Environment\\1.3;JavaHome]/bin"
   )
 # Hard-coded guesses should still go in PATHS. This ensures that the user
 # environment can always override hard guesses.

---

Summary of changes:
 Modules/FindJava.cmake |8 
 1 file changed, 8 insertions(+)


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.7.1-2079-g5c6d51b

[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  5c6d51bdf072a8fb6e683636321e57430c0268ac (commit)
   via  e0ed1de4fb5e9d18c2d00775229496079d6e077a (commit)
  from  ee14e5aaa12451d93a0cc3787d2f73b2841ec950 (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=5c6d51bdf072a8fb6e683636321e57430c0268ac
commit 5c6d51bdf072a8fb6e683636321e57430c0268ac
Merge: ee14e5a e0ed1de
Author: Brad King 
AuthorDate: Wed Jan 11 11:33:56 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 11:33:56 2017 -0500

Merge topic 'InstallRequiredSystemLibraries-UCRT-configs' into next

e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install 
configurations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0ed1de4fb5e9d18c2d00775229496079d6e077a
commit e0ed1de4fb5e9d18c2d00775229496079d6e077a
Author: Bjoern Thiel 
AuthorDate: Wed Jan 11 04:49:22 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 11:20:47 2017 -0500

InstallRequiredSystemLibraries: Distinguish UCRT install configurations

Teach the `CMAKE_INSTALL_UCRT_LIBRARIES` feature to honor the
`CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY` and `CMAKE_INSTALL_DEBUG_LIBRARIES`
settings.

Closes: #16542

diff --git a/Modules/InstallRequiredSystemLibraries.cmake 
b/Modules/InstallRequiredSystemLibraries.cmake
index b0446c9..b04f044 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -204,21 +204,27 @@ if(MSVC)
 endif()
 
 if(CMAKE_INSTALL_UCRT_LIBRARIES AND NOT v VERSION_LESS 14)
-  # Find the Windows Universal CRT redistribution directory.
+  # Find the Windows Kits directory.
   get_filename_component(windows_kits_dir
 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed 
Roots;KitsRoot10]" ABSOLUTE)
   set(programfilesx86 "ProgramFiles(x86)")
-  find_path(WINDOWS_KITS_REDIST_DIR NAMES 
ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
+  find_path(WINDOWS_KITS_DIR NAMES 
Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
 PATHS
-"${windows_kits_dir}/Redist"
-"$ENV{ProgramFiles}/Windows Kits/10/Redist"
-"$ENV{${programfilesx86}}/Windows Kits/10/Redist"
+"${windows_kits_dir}"
+"$ENV{ProgramFiles}/Windows Kits/10"
+"$ENV{${programfilesx86}}/Windows Kits/10"
 )
-  mark_as_advanced(WINDOWS_KITS_REDIST_DIR)
+  mark_as_advanced(WINDOWS_KITS_DIR)
 
   # Glob the list of UCRT DLLs.
-  file(GLOB __ucrt_dlls 
"${WINDOWS_KITS_REDIST_DIR}/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
-  list(APPEND __install__libs ${__ucrt_dlls})
+  if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
+file(GLOB __ucrt_dlls 
"${WINDOWS_KITS_DIR}/Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
+list(APPEND __install__libs ${__ucrt_dlls})
+  endif()
+  if(CMAKE_INSTALL_DEBUG_LIBRARIES)
+file(GLOB __ucrt_dlls 
"${WINDOWS_KITS_DIR}/bin/${CMAKE_MSVC_ARCH}/ucrt/*.dll")
+list(APPEND __install__libs ${__ucrt_dlls})
+  endif()
 endif()
   endmacro()
 

---

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   22 ++
 1 file changed, 14 insertions(+), 8 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.7.1-2077-gee14e5a

[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  ee14e5aaa12451d93a0cc3787d2f73b2841ec950 (commit)
   via  1ce39a1e73d6a38ec53679113ba643ac6a51781c (commit)
  from  afd1fd49695b0dad9cca6f00749384568c214a9e (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=ee14e5aaa12451d93a0cc3787d2f73b2841ec950
commit ee14e5aaa12451d93a0cc3787d2f73b2841ec950
Merge: afd1fd4 1ce39a1
Author: Brad King 
AuthorDate: Wed Jan 11 11:14:55 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 11:14:55 2017 -0500

Merge topic 'cuda_compile_features_test_use_widely_supported_feature' into 
next

1ce39a1e CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler 
support


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ce39a1e73d6a38ec53679113ba643ac6a51781c
commit 1ce39a1e73d6a38ec53679113ba643ac6a51781c
Author: Robert Maynard 
AuthorDate: Wed Jan 11 10:40:38 2017 -0500
Commit: Robert Maynard 
CommitDate: Wed Jan 11 10:40:38 2017 -0500

CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support

We need to use a C++11 feature that is supported by the widest
range of compilers, so we chose nullptr instead of constexpr.

diff --git a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt 
b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
index 8361b9e..9fda2d0 100644
--- a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
+++ b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
@@ -11,7 +11,7 @@ project (CudaConsumeCompileFeatures CXX CUDA)
 
 
 add_library(CudaConsumeLib STATIC static.cpp static.cu)
-target_compile_features(CudaConsumeLib PUBLIC cxx_constexpr)
+target_compile_features(CudaConsumeLib PUBLIC cxx_nullptr)
 
 add_executable(CudaConsumeCompileFeatures main.cu)
 target_link_libraries(CudaConsumeCompileFeatures PRIVATE CudaConsumeLib)

---

Summary of changes:
 Tests/Cuda/ConsumeCompileFeatures/CMakeLists.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

[Cmake-commits] CMake branch, next, updated. v3.7.1-2075-gafd1fd4

[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  afd1fd49695b0dad9cca6f00749384568c214a9e (commit)
   via  17a0703d205d26048247e22174a1eda36498d341 (commit)
  from  6a7f9c025da31eff3cd63dd85c16dc5aad0534fe (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=afd1fd49695b0dad9cca6f00749384568c214a9e
commit afd1fd49695b0dad9cca6f00749384568c214a9e
Merge: 6a7f9c0 17a0703
Author: Brad King 
AuthorDate: Wed Jan 11 10:58:37 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 10:58:37 2017 -0500

Merge topic 'fix_get_prerequisites' into next

17a0703d GetPrerequisites: Do not fail on files we cannot find


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a0703d205d26048247e22174a1eda36498d341
commit 17a0703d205d26048247e22174a1eda36498d341
Author: Martin Koegler 
AuthorDate: Tue Jan 10 23:28:47 2017 +0100
Commit: Brad King 
CommitDate: Wed Jan 11 10:57:04 2017 -0500

GetPrerequisites: Do not fail on files we cannot find

Historically we have always warned and skipped missing files.  Since
commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for
execute_process() calls, 2015-07-29) we fail instead, but this was not
an intentional part of that change.  Restore the warn-only behavior so
that missing system libraries (e.g. during cross-compiling) do not cause
failure.

Closes: #16523

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 72775ce..d6a78de 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -654,6 +654,8 @@ function(get_prerequisites target prerequisites_var 
exclude_system recurse exepa
 
   if(NOT EXISTS "${target}")
 message("warning: target '${target}' does not exist...")
+set(${prerequisites_var} "" PARENT_SCOPE)
+return()
   endif()
 
   set(gp_cmd_paths ${gp_cmd_paths}

---

Summary of changes:
 Modules/GetPrerequisites.cmake |2 ++
 1 file changed, 2 insertions(+)


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.7.1-2073-g6a7f9c0

[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  6a7f9c025da31eff3cd63dd85c16dc5aad0534fe (commit)
   via  d6877e6c405eb67f0e3e9eae783de02d1d8be659 (commit)
  from  74a03183ffc0982cd948bf76ce84f7891b585d1e (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=6a7f9c025da31eff3cd63dd85c16dc5aad0534fe
commit 6a7f9c025da31eff3cd63dd85c16dc5aad0534fe
Merge: 74a0318 d6877e6
Author: Brad King 
AuthorDate: Wed Jan 11 10:53:36 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 10:53:36 2017 -0500

Merge topic 'dont-include-CMakeParseArguments' into next

d6877e6c Don't include CMakeParseArguments


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6877e6c405eb67f0e3e9eae783de02d1d8be659
commit d6877e6c405eb67f0e3e9eae783de02d1d8be659
Author: Daniel Pfeifer 
AuthorDate: Tue Dec 20 16:14:16 2016 +0100
Commit: Daniel Pfeifer 
CommitDate: Wed Jan 11 13:14:57 2017 +0100

Don't include CMakeParseArguments

The cmake_parse_arguments command is builtin with version 3.5.
The CMakeParseArguments module is empty and exists for backwards
compatibility with CMake 3.4 and lower.

Remove the includes of CMakeParseArguments from CMake's modules.
The modules are always used with the current version of CMake.

Leave the includes in the tests, as the tests may be run with an older
version of CMake.

diff --git a/Modules/CMakeAddFortranSubdirectory.cmake 
b/Modules/CMakeAddFortranSubdirectory.cmake
index 3b39bce..4649f35 100644
--- a/Modules/CMakeAddFortranSubdirectory.cmake
+++ b/Modules/CMakeAddFortranSubdirectory.cmake
@@ -45,7 +45,6 @@
 set(_MS_MINGW_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
 include(CheckLanguage)
 include(ExternalProject)
-include(CMakeParseArguments)
 
 function(_setup_mingw_config_and_build source_dir build_dir)
   # Look for a MinGW gfortran.
diff --git a/Modules/CMakeCompilerIdDetection.cmake 
b/Modules/CMakeCompilerIdDetection.cmake
index 484e1f0..7ca79bd 100644
--- a/Modules/CMakeCompilerIdDetection.cmake
+++ b/Modules/CMakeCompilerIdDetection.cmake
@@ -11,8 +11,6 @@ function(_readFile file)
   set(_compiler_id_pp_test_${CompilerId} ${_compiler_id_pp_test} PARENT_SCOPE)
 endfunction()
 
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
 function(compiler_id_detection outvar lang)
 
   if (NOT lang STREQUAL Fortran AND NOT lang STREQUAL CSharp)
diff --git a/Modules/CMakeExpandImportedTargets.cmake 
b/Modules/CMakeExpandImportedTargets.cmake
index add0c6d..ad065f0 100644
--- a/Modules/CMakeExpandImportedTargets.cmake
+++ b/Modules/CMakeExpandImportedTargets.cmake
@@ -37,9 +37,6 @@
 #   LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
 #   CONFIGURATION "${CMAKE_TRY_COMPILE_CONFIGURATION}" )
 
-
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
 function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT )
 
set(options )
diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index 8415641..3210222 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -201,9 +201,6 @@
 #
 #check_required_components(Foo)
 
-
-include(CMakeParseArguments)
-
 include(WriteBasicConfigVersionFile)
 
 macro(WRITE_BASIC_PACKAGE_VERSION_FILE)
diff --git a/Modules/CMakePrintHelpers.cmake b/Modules/CMakePrintHelpers.cmake
index bf98a42..21c333e 100644
--- a/Modules/CMakePrintHelpers.cmake
+++ b/Modules/CMakePrintHelpers.cmake
@@ -39,8 +39,6 @@
 #
 #   -- CMAKE_C_COMPILER="/usr/bin/gcc" ; CMAKE_MAJOR_VERSION="2" ; 
DOES_NOT_EXIST=""
 
-include(CMakeParseArguments)
-
 function(CMAKE_PRINT_VARIABLES)
set(msg "")
foreach(var ${ARGN})
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index d0d24ba..b3ab055 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -630,10 +630,6 @@ if(NOT CPackComponent_CMake_INCLUDED)
 include(CPackComponent)
 endif()
 
-if(NOT __CMAKE_PARSE_ARGUMENTS_INCLUDED)
-include(CMakeParseArguments)
-endif()
-
 # Resolve full filename for script file
 macro(_cpack_ifw_resolve_script _variable)
   set(_ifw_script_macro ${_variable})
diff --git a/Modules/CTestCoverageCollectGCOV.cmake 
b/Modules/CTestCoverageCollectGCOV.cmake
index 8451a6a..1203be4 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -65,7 +65,6 @@
 # Suppress non-error messages that otherwise would have been
 # printed out by this function.
 
-include(CMakeParseArguments)
 

[Cmake-commits] CMake branch, next, updated. v3.7.1-2071-g74a0318

[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  74a03183ffc0982cd948bf76ce84f7891b585d1e (commit)
   via  a7c5d5fb0e8d096dfc9b6e82e93f1e0d6225fe1f (commit)
  from  c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca (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=74a03183ffc0982cd948bf76ce84f7891b585d1e
commit 74a03183ffc0982cd948bf76ce84f7891b585d1e
Merge: c16ab96 a7c5d5f
Author: Brad King 
AuthorDate: Wed Jan 11 10:50:36 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 10:50:36 2017 -0500

Merge topic 'get_prerequisites_delayload' into next

a7c5d5fb GetPrerequisites: Exclude delay load dependencies on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7c5d5fb0e8d096dfc9b6e82e93f1e0d6225fe1f
commit a7c5d5fb0e8d096dfc9b6e82e93f1e0d6225fe1f
Author: Pascal Thomet 
AuthorDate: Thu Dec 22 12:28:26 2016 +0100
Commit: Brad King 
CommitDate: Wed Jan 11 10:48:36 2017 -0500

GetPrerequisites: Exclude delay load dependencies on Windows

With some Windows toolchains we use `objdump` which does not mention
delay load dependencies in its output.  Therefore, to get consistent
behavior we should always ignore them.

Use the `dumpbin` message "Image has the following delay load
dependencies" that precedes the delay load dependencies to recognize and
skip them.  Fortunately, this message is not translated to the current
locale (at least on "Windows 7 French", "Windows 10 French" and "Windows
Server 2008 R2 French").

Fixes: #16241

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 72775ce..d0cd5b9 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -810,6 +810,20 @@ function(get_prerequisites target prerequisites_var 
exclude_system recurse exepa
 OUTPUT_VARIABLE gp_cmd_ov
 ERROR_VARIABLE gp_ev
 )
+
+  if(gp_tool STREQUAL "dumpbin")
+# Exclude delay load dependencies under windows (they are listed in 
dumpbin output after the message below)
+string(FIND "${gp_cmd_ov}" "Image has the following delay load 
dependencies" gp_delayload_pos)
+if (${gp_delayload_pos} GREATER -1)
+  string(SUBSTRING "${gp_cmd_ov}" 0 ${gp_delayload_pos} 
gp_cmd_ov_no_delayload_deps)
+  string(SUBSTRING "${gp_cmd_ov}" ${gp_delayload_pos} -1 
gp_cmd_ov_delayload_deps)
+  if (verbose)
+message(STATUS "GetPrequisites(${target}) : ignoring the following 
delay load dependencies :\n ${gp_cmd_ov_delayload_deps}")
+  endif()
+  set(gp_cmd_ov ${gp_cmd_ov_no_delayload_deps})
+endif()
+  endif()
+
   if(NOT gp_rv STREQUAL "0")
 if(gp_tool STREQUAL "dumpbin")
   # dumpbin error messages seem to go to stdout

---

Summary of changes:
 Modules/GetPrerequisites.cmake |   14 ++
 1 file changed, 14 insertions(+)


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.7.1-17-ge9d3557

[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  e9d3557ccc4b26503aa7d59ec2eaf179c9924a5b (commit)
   via  a9b93501d435bcd30a96e3091255e509fedbb39f (commit)
   via  c046356a5c37f52292f65dfff2afd72cde1c47af (commit)
   via  5ffee691ee0c55d043238960cf1149cbcfb86047 (commit)
   via  68d13665e023f6ccb51ba0375cabd27e492db483 (commit)
   via  33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (commit)
   via  195ab50f635bb95035b5bf2fda7a3bf692a122f5 (commit)
   via  7789dd9a1ae79d6747883739a21cf90c139d1e54 (commit)
  from  12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc (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/FindBoost.cmake  |   17 -
 Modules/FindPostgreSQL.cmake |7 ++-
 Source/cmServerProtocol.cxx  |   10 --
 3 files changed, 30 insertions(+), 4 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.7.1-2069-gc16ab96

[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  c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca (commit)
   via  e0cc40ed58a16f63a26cf25c56f6e8471401fbfe (commit)
   via  e9d3557ccc4b26503aa7d59ec2eaf179c9924a5b (commit)
   via  c046356a5c37f52292f65dfff2afd72cde1c47af (commit)
   via  68d13665e023f6ccb51ba0375cabd27e492db483 (commit)
   via  195ab50f635bb95035b5bf2fda7a3bf692a122f5 (commit)
  from  374e984b7e143008d38b7d148b1700cadbccbb59 (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=c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca
commit c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca
Merge: 374e984 e0cc40e
Author: Brad King 
AuthorDate: Wed Jan 11 10:35:33 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 10:35:33 2017 -0500

Merge branch 'master' into next


---

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, master, updated. v3.7.1-1029-ge0cc40e

[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  e0cc40ed58a16f63a26cf25c56f6e8471401fbfe (commit)
   via  e9d3557ccc4b26503aa7d59ec2eaf179c9924a5b (commit)
   via  c046356a5c37f52292f65dfff2afd72cde1c47af (commit)
   via  68d13665e023f6ccb51ba0375cabd27e492db483 (commit)
   via  195ab50f635bb95035b5bf2fda7a3bf692a122f5 (commit)
  from  12d5ccd10a451301bf3cbdefe8fde744bf6c9467 (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] Response files not working with TI compilers

[Arturo Crespo]

Dear All,

I'm currently using CMake-3.7.1 to build a big project with different TI
compilers (cl6x, armcl, cl-arp32)  and since several months ago I started
to use linker response files because the linker command line was too long
for Windows and the build was failing.

When I tried to do this for the first time I got a linker error with an
invalid flag being used, as the TI linker doesn't support response files
(-@)

The way CMake invokes the TI linker is as mentioned in the TI documentation
by invoking the compiler with an option to run the linker, i.e. cl6x
--run_linker [options] filename1, ..., filenameN, in TI-CXX.cmake:

set(CMAKE_CXX_LINK_EXECUTABLE " --run_linker
--output_file= --map_file=.map 
  ")


The solution that I found was to change the order of the arguments passed
to the linker, because the TI compiler supports response files (-@) and it
passes that information to the linker, so by moving  before
--run_linker the problem was solved:

set(CMAKE_CXX_LINK_EXECUTABLE "  --run_linker
--output_file= --map_file=.map 
 ")


The same change is needed in TI-C.cmake

This issue is present since at least since CMake-3.3.2

Regards,
Arturo
-- 

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.7.1-2063-g374e984

[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  374e984b7e143008d38b7d148b1700cadbccbb59 (commit)
   via  097ac761334e18758e7f81ec46486ea200317eec (commit)
   via  cdd559eab5df6972ce89dbc6e24b6ab1b6081254 (commit)
  from  7f3e96623e6d1bc22e447926926409c2836e7d6a (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=374e984b7e143008d38b7d148b1700cadbccbb59
commit 374e984b7e143008d38b7d148b1700cadbccbb59
Merge: 7f3e966 097ac76
Author: Brad King 
AuthorDate: Wed Jan 11 10:27:28 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 10:27:28 2017 -0500

Merge topic 'cuda-windows' into next

097ac761 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
cdd559ea CUDA: Port test cases to Windows with MSVC host compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=097ac761334e18758e7f81ec46486ea200317eec
commit 097ac761334e18758e7f81ec46486ea200317eec
Author: Brad King 
AuthorDate: Thu Dec 15 15:17:08 2016 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 10:26:54 2017 -0500

CUDA: Enable CudaOnly.SeparateCompilation test runtime calls

Uncomment the calls in `main.cpp` (and fix the signatures).

diff --git a/Tests/CudaOnly/SeparateCompilation/main.cu 
b/Tests/CudaOnly/SeparateCompilation/main.cu
index d4520ae..5c8e150 100644
--- a/Tests/CudaOnly/SeparateCompilation/main.cu
+++ b/Tests/CudaOnly/SeparateCompilation/main.cu
@@ -4,12 +4,12 @@
 #include "file1.h"
 #include "file2.h"
 
-// result_type file4_launch_kernel(int x);
-// result_type file5_launch_kernel(int x);
+int file4_launch_kernel(int x);
+int file5_launch_kernel(int x);
 
 int main(int argc, char **argv)
 {
-  // file4_launch_kernel(42);
-  // file5_launch_kernel(42);
+  file4_launch_kernel(42);
+  file5_launch_kernel(42);
   return 0;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdd559eab5df6972ce89dbc6e24b6ab1b6081254
commit cdd559eab5df6972ce89dbc6e24b6ab1b6081254
Author: Brad King 
AuthorDate: Wed Dec 7 11:45:44 2016 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 10:26:53 2017 -0500

CUDA: Port test cases to Windows with MSVC host compiler

diff --git a/Tests/Cuda/Complex/dynamic.cpp b/Tests/Cuda/Complex/dynamic.cpp
index d579f1e..3848ce7 100644
--- a/Tests/Cuda/Complex/dynamic.cpp
+++ b/Tests/Cuda/Complex/dynamic.cpp
@@ -1,5 +1,11 @@
 
-int dynamic_base_func(int x)
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
+EXPORT int dynamic_base_func(int x)
 {
   return x * x;
 }
diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu
index ea52acb..a23dc25 100644
--- a/Tests/Cuda/Complex/dynamic.cu
+++ b/Tests/Cuda/Complex/dynamic.cu
@@ -3,9 +3,15 @@
 #include 
 #include 
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
 int dynamic_base_func(int);
 
-int __host__ cuda_dynamic_host_func(int x)
+EXPORT int __host__ cuda_dynamic_host_func(int x)
 {
   return dynamic_base_func(x);
 }
@@ -16,7 +22,7 @@ void DetermineIfValidCudaDevice()
 {
 }
 
-void cuda_dynamic_lib_func()
+EXPORT void cuda_dynamic_lib_func()
 {
   DetermineIfValidCudaDevice <<<1,1>>> ();
   cudaError_t err = cudaGetLastError();
diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp
index 32312d0..5a3f820 100644
--- a/Tests/Cuda/Complex/main.cpp
+++ b/Tests/Cuda/Complex/main.cpp
@@ -3,8 +3,14 @@
 #include "file1.h"
 #include "file2.h"
 
-int call_cuda_seperable_code(int x);
-int mixed_launch_kernel(int x);
+#ifdef _WIN32
+#define IMPORT __declspec(dllimport)
+#else
+#define IMPORT
+#endif
+
+IMPORT int call_cuda_seperable_code(int x);
+IMPORT int mixed_launch_kernel(int x);
 
 int main(int argc, char** argv)
 {
diff --git a/Tests/Cuda/Complex/mixed.cpp b/Tests/Cuda/Complex/mixed.cpp
index 205f091..bd32e51 100644
--- a/Tests/Cuda/Complex/mixed.cpp
+++ b/Tests/Cuda/Complex/mixed.cpp
@@ -1,6 +1,14 @@
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#else
+#define EXPORT
+#define IMPORT
+#endif
+
 int dynamic_base_func(int);
-int cuda_dynamic_host_func(int);
+IMPORT int cuda_dynamic_host_func(int);
 int file3_launch_kernel(int);
 
 int dynamic_final_func(int x)
@@ -8,7 +16,7 @@ int dynamic_final_func(int x)
   return cuda_dynamic_host_func(dynamic_base_func(x));
 }
 
-int call_cuda_seperable_code(int x)
+EXPORT int call_cuda_seperable_code(int x)
 {
   return file3_launch_kernel(x);
 }
diff --git 

[Cmake-commits] CMake branch, next, updated. v3.7.1-2060-g7f3e966

[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  7f3e96623e6d1bc22e447926926409c2836e7d6a (commit)
   via  5fddbf1382f9eca0354404ad062343da61cfc84a (commit)
  from  016ec962653d5f2060ebf05d09ecddc13deb0cab (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=7f3e96623e6d1bc22e447926926409c2836e7d6a
commit 7f3e96623e6d1bc22e447926926409c2836e7d6a
Merge: 016ec96 5fddbf1
Author: Brad King 
AuthorDate: Wed Jan 11 10:26:48 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 10:26:48 2017 -0500

Merge topic 'cuda-windows' into next

5fddbf13 fixup! CUDA: Port test cases to Windows with MSVC host compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fddbf1382f9eca0354404ad062343da61cfc84a
commit 5fddbf1382f9eca0354404ad062343da61cfc84a
Author: Brad King 
AuthorDate: Wed Jan 11 10:10:17 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 10:25:21 2017 -0500

fixup! CUDA: Port test cases to Windows with MSVC host compiler

diff --git a/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake 
b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
new file mode 100644
index 000..ea22152
--- /dev/null
+++ b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
@@ -0,0 +1,9 @@
+enable_language(CUDA)
+try_compile(result ${CMAKE_CURRENT_BINARY_DIR}
+  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.cu
+  CUDA_STANDARD 3 # bogus, but not used
+  OUTPUT_VARIABLE out
+  )
+if(NOT result)
+  message(FATAL_ERROR "try_compile failed:\n${out}")
+endif()
diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake 
b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
index 5452e6d..6a1bc64 100644
--- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
+++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
@@ -36,7 +36,11 @@ elseif(DEFINED CMAKE_CXX_STANDARD_DEFAULT)
   run_cmake(CxxStandardNoDefault)
 endif()
 if(CMake_TEST_CUDA)
-  run_cmake(CudaStandard)
+  if(CMAKE_HOST_WIN32)
+run_cmake(CudaStandardNoDefault)
+  else()
+run_cmake(CudaStandard)
+  endif()
 endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION 
VERSION_LESS 4.4)
   run_cmake(CStandardGNU)

---

Summary of changes:
 .../{CxxStandardNoDefault.cmake => CudaStandardNoDefault.cmake}  |6 +++---
 Tests/RunCMake/try_compile/RunCMakeTest.cmake|6 +-
 2 files changed, 8 insertions(+), 4 deletions(-)
 copy Tests/RunCMake/try_compile/{CxxStandardNoDefault.cmake => 
CudaStandardNoDefault.cmake} (58%)


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

Re: [CMake] MSVC15 variable available for Visual Studio 2017

[Brad King]

On 01/11/2017 08:33 AM, Gregor Jasny via CMake wrote:
> I wonder if there is a reason why no MSVC15 variable is available for 
> Visual Studio 2017?

The values correspond to the toolset versions:

* https://cmake.org/cmake/help/v3.7/variable/MSVC14.html

and VS 2017 uses toolset version v141 which is still "14".

At the time the VS 2017 generator was first written we were using a
VS 15 preview and its toolset was still called v140.  Please submit
a MR to update the above-linked docs to mention that MSVC14 is for
v140 or v141.

> I wonder how I could detect the v141(_xp) toolset?

Use CMAKE_C_COMPILER_VERSION instead.  The `MSVC##` variables are legacy,
though not deprecated because they can still be handy due to the
"or another compiler that simulates it" part of the documentation.

-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

[Cmake-commits] CMake branch, next, updated. v3.7.1-2058-g016ec96

[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  016ec962653d5f2060ebf05d09ecddc13deb0cab (commit)
   via  12d5ccd10a451301bf3cbdefe8fde744bf6c9467 (commit)
   via  9a670222758bff23645df36a5cb9d98cb1bafa8e (commit)
   via  bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982 (commit)
   via  474edf75f6234a9ed3b59b7e11c53d57f9bd2f78 (commit)
   via  039588e335fbf559f66719aff2a3c8920a078261 (commit)
   via  2eb5596503ab8cf2f5ded140d45aa013c9705436 (commit)
   via  d1682a8514f9ecbe91f59e651be917afec044907 (commit)
   via  445ab80c444b1f5d2800784f85601976867df411 (commit)
   via  34745595c3b87279b92ea402fd2ccb6351344307 (commit)
   via  0884c9e46a108e8d7b52f6d96242f147ab12d001 (commit)
   via  ff6a034e0bb7731c97a90afec849d8c80e2a783d (commit)
   via  396e9378a820cc5216aecce6bff42f526f4f7c26 (commit)
   via  a8b576244f729e543795750eb6c9e188c0e1fe66 (commit)
   via  1406408e61a001728eded5a7f28f3c392ff31c38 (commit)
   via  22dfda11121c2b0c2374a5eb29fd3a2f140ff92c (commit)
  from  3f697a732c4d737fa319020e435f43d973a29901 (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=016ec962653d5f2060ebf05d09ecddc13deb0cab
commit 016ec962653d5f2060ebf05d09ecddc13deb0cab
Merge: 3f697a7 12d5ccd
Author: Brad King 
AuthorDate: Wed Jan 11 10:02:26 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 10:02:26 2017 -0500

Merge branch 'master' into next


---

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, master, updated. v3.7.1-1012-g039588e

[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  039588e335fbf559f66719aff2a3c8920a078261 (commit)
   via  af77368ed3d81c877fc19a64831aff380cf4646e (commit)
  from  2eb5596503ab8cf2f5ded140d45aa013c9705436 (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=039588e335fbf559f66719aff2a3c8920a078261
commit 039588e335fbf559f66719aff2a3c8920a078261
Merge: 2eb5596 af77368
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:43 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:43 2017 -0500

Merge topic 'cpack-rpm-user-binary-spec-file-test'

af77368e CPack/RPM test for using custom binary spec file


---

Summary of changes:
 Tests/RunCMake/CPack/RunCMakeTest.cmake|1 +
 .../CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake|9 +++
 .../RPM-COMPONENT-stderr.txt   |2 +
 .../RPM-MONOLITHIC-stderr.txt  |1 +
 .../tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in   |   80 
 .../CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake |9 +++
 6 files changed, 102 insertions(+)
 create mode 100644 
Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
 create mode 100644 
Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
 create mode 100644 
Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
 create mode 100644 
Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
 create mode 100644 
Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.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, master, updated. v3.7.1-1014-g474edf7

[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  474edf75f6234a9ed3b59b7e11c53d57f9bd2f78 (commit)
   via  b1dc4ddbdd651e8bdd30878fa9afc840d97c9114 (commit)
  from  039588e335fbf559f66719aff2a3c8920a078261 (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=474edf75f6234a9ed3b59b7e11c53d57f9bd2f78
commit 474edf75f6234a9ed3b59b7e11c53d57f9bd2f78
Merge: 039588e b1dc4dd
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:46 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:46 2017 -0500

Merge topic 'BundleUtilities-symlink-structure'

b1dc4ddb BundleUtilities: Maintain symlink structure


---

Summary of changes:
 Modules/BundleUtilities.cmake |   58 ++---
 1 file changed, 55 insertions(+), 3 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, master, updated. v3.7.1-1017-gbc2cc80

[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  bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982 (commit)
   via  b7f0b1240f9c251d059fafcde878168f2b9a6664 (commit)
   via  ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e (commit)
  from  474edf75f6234a9ed3b59b7e11c53d57f9bd2f78 (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=bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982
commit bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982
Merge: 474edf7 b7f0b12
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:49 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:49 2017 -0500

Merge topic 'solaris-build-fixes'

b7f0b124 libuv requires _XOPEN_SOURCE 600 on Solaris 11
ba8bb321 Disable libuv on Solaris 10


---

Summary of changes:
 CMakeLists.txt   |3 +++
 Utilities/cmlibuv/CMakeLists.txt |   10 +-
 2 files changed, 12 insertions(+), 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.7.1-1010-g2eb5596

[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  2eb5596503ab8cf2f5ded140d45aa013c9705436 (commit)
   via  7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac (commit)
   via  6eabac26f5c8167481be9c872210a8142ead4b99 (commit)
   via  cbc07d331d1d5429dc1e0b7c6c7949ff8d9efdf1 (commit)
   via  c17e0a3ad58f06fcb0827910af520405670b3d51 (commit)
   via  53787bf8de2d3981f650e9036bb89cb6ed884a75 (commit)
   via  8dbdd3e726ead25c179e6eb4ffab212a1db3aba8 (commit)
   via  0699760d5c8b644242ddd4ac6d07d8c4c68f2b94 (commit)
   via  a84f0bb726ebcc8e9bf3db0b99e5b6fd8a720045 (commit)
   via  7b766b83952ec4c431a55d2f6e589a5f806834c9 (commit)
   via  2964b8cca4155fa318722f6ef17f0d4d56ee2f29 (commit)
   via  d58b6bf31c18cfedd4a2f15e009b8e5cbdc21b6e (commit)
   via  94c319f93309ff4cddd0280cdcbd48b50492db36 (commit)
   via  966be439e07131c3ff84175c1a9e3b6336908d8e (commit)
   via  de531432887487943dbe4ae5a1bde762d5582e06 (commit)
   via  d8e45536fb3637454cf17a638dcd9fc236e94660 (commit)
   via  d9313a82906ced0ff3c76828e86d9d7a248a5e49 (commit)
   via  32d3540e090c4a24d55b99c49c094a9cb574c9b3 (commit)
   via  e7280a7f1743d73cdab41ed709a9e1d0f99b6342 (commit)
   via  63d3ca4c1cab0c7b9c71d6c051c3b4c053eb7627 (commit)
   via  6ae19bf32e232beb59a0c427d82c0761e8248ab8 (commit)
   via  9986da4f0f2f49c0d7d260f9d21deaa906708376 (commit)
   via  d51cc88e844c78c01c1616e6a2fb102c0682dd00 (commit)
   via  cf1d5a9cdba49a2e9f08879d756ae118b22bfc6a (commit)
   via  f962275987e17cf94da663a919f52b6d0c8f44f4 (commit)
   via  c736c41ad192c89e1c74751a8f401c75955f5f3b (commit)
   via  cbd650c2642e40369eaa53d20dafee6cdccae4af (commit)
   via  0b1527ff3d1781380756ee72a9641b7c5c7c87cc (commit)
   via  2b9d795e63acf723a6abd79f3195ec70476442a5 (commit)
   via  2cfcdf757d032cdea8b980792007a6f9d749e6fb (commit)
   via  2f67aef23d4192fadb222dc79311fb5ffbbc36ce (commit)
   via  794fdf40a1bc85dded519d7c737f73690e3a6e42 (commit)
   via  a1e49bb155132606ed9f590c0b62e68f2e288d0b (commit)
  from  d1682a8514f9ecbe91f59e651be917afec044907 (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=2eb5596503ab8cf2f5ded140d45aa013c9705436
commit 2eb5596503ab8cf2f5ded140d45aa013c9705436
Merge: d1682a8 7db05f4
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:40 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:40 2017 -0500

Merge topic 'Autogen_Simplify'

7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties
c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test
53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test
8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test
0699760d AUTOGEN: Generators: Do moc/uic skip test during file list 
generation
a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification
7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only
2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in 
messages
d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods
94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC
966be439 AUTOGEN: Generators: Be verbose about skipping files
de531432 AUTOGEN: Generators: Remove unused variable
d8e45536 AUTOGEN: Initializer: Always remember skipped files
d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated 
sources
...


---

Summary of changes:
 Help/manual/cmake-properties.7.rst   |4 +
 Help/manual/cmake-qt.7.rst   |9 +
 Help/prop_sf/SKIP_AUTOGEN.rst|8 +
 Help/prop_sf/SKIP_AUTOMOC.rst|6 +
 Help/prop_sf/SKIP_AUTORCC.rst|6 +
 Help/prop_sf/SKIP_AUTOUIC.rst|6 +
 Help/prop_tgt/AUTOMOC.rst|3 +
 Help/prop_tgt/AUTORCC.rst|3 +
 Help/prop_tgt/AUTOUIC.rst|3 +
 Help/release/dev/QtAutogen_Skip.rst  |   12 +
 Modules/AutogenInfo.cmake.in |8 +-
 Source/cmQtAutoGeneratorInitializer.cxx  |  102 ++--
 Source/cmQtAutoGenerators.cxx|  741 --
 Source/cmQtAutoGenerators.h  |   46 +-
 

[Cmake-commits] CMake branch, master, updated. v3.7.1-971-g0884c9e

[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  0884c9e46a108e8d7b52f6d96242f147ab12d001 (commit)
   via  154def305e7a95d9280573b053170b17539c9f69 (commit)
  from  ff6a034e0bb7731c97a90afec849d8c80e2a783d (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=0884c9e46a108e8d7b52f6d96242f147ab12d001
commit 0884c9e46a108e8d7b52f6d96242f147ab12d001
Merge: ff6a034 154def3
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:28 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:28 2017 -0500

Merge topic 'SublimeText-no-VERBOSE'

154def30 Sublime: Do not build with verbose output


---

Summary of changes:
 Help/release/dev/SublimeText-no-VERBOSE.rst |6 ++
 Source/cmExtraSublimeTextGenerator.cxx  |   12 +++-
 2 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/SublimeText-no-VERBOSE.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, master, updated. v3.7.1-973-g3474559

[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  34745595c3b87279b92ea402fd2ccb6351344307 (commit)
   via  3578e86272b16b303edd640f29781dd316a857a4 (commit)
  from  0884c9e46a108e8d7b52f6d96242f147ab12d001 (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=34745595c3b87279b92ea402fd2ccb6351344307
commit 34745595c3b87279b92ea402fd2ccb6351344307
Merge: 0884c9e 3578e86
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:31 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:31 2017 -0500

Merge topic 'issue-16513-concrt140-dll'

3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0


---

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   10 --
 1 file changed, 8 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, master, updated. v3.7.1-967-g396e937

[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  396e9378a820cc5216aecce6bff42f526f4f7c26 (commit)
   via  5ffee691ee0c55d043238960cf1149cbcfb86047 (commit)
  from  a8b576244f729e543795750eb6c9e188c0e1fe66 (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=396e9378a820cc5216aecce6bff42f526f4f7c26
commit 396e9378a820cc5216aecce6bff42f526f4f7c26
Merge: a8b5762 5ffee69
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:22 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:22 2017 -0500

Merge topic 'pgsql-yum'

5ffee691 FindPostgreSQL: automatically find installations from 
yum.postgresql.org


---

Summary of changes:
 Modules/FindPostgreSQL.cmake |7 ++-
 1 file changed, 6 insertions(+), 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.7.1-977-gd1682a8

[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  d1682a8514f9ecbe91f59e651be917afec044907 (commit)
   via  524f5ee186f95a0dc0dc449e437910a72b175893 (commit)
  from  445ab80c444b1f5d2800784f85601976867df411 (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=d1682a8514f9ecbe91f59e651be917afec044907
commit d1682a8514f9ecbe91f59e651be917afec044907
Merge: 445ab80 524f5ee
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:37 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:37 2017 -0500

Merge topic 'android_clang_asm'

524f5ee1 Android: Set compiler target platform when compiling ASM with Clang


---

Summary of changes:
 .../Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake}|2 +-
 Modules/Platform/Android-Clang.cmake   |4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 copy Modules/Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake} (51%)


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.7.1-960-g22dfda1

[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  22dfda11121c2b0c2374a5eb29fd3a2f140ff92c (commit)
   via  ff91b1514be75dee07e8009a60ad39284e8844b4 (commit)
  from  3e5fbbd6cdc472cdf7823cf81c0e527c79653188 (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=22dfda11121c2b0c2374a5eb29fd3a2f140ff92c
commit 22dfda11121c2b0c2374a5eb29fd3a2f140ff92c
Merge: 3e5fbbd ff91b15
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:11 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:11 2017 -0500

Merge topic 'FindBoost-find-default'

ff91b151 FindBoost: Search official location of prebuilt binaries on Windows


---

Summary of changes:
 Modules/FindBoost.cmake |   22 --
 1 file changed, 12 insertions(+), 10 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, master, updated. v3.7.1-965-ga8b5762

[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  a8b576244f729e543795750eb6c9e188c0e1fe66 (commit)
   via  a9b93501d435bcd30a96e3091255e509fedbb39f (commit)
  from  1406408e61a001728eded5a7f28f3c392ff31c38 (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=a8b576244f729e543795750eb6c9e188c0e1fe66
commit a8b576244f729e543795750eb6c9e188c0e1fe66
Merge: 1406408 a9b9350
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:17 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:17 2017 -0500

Merge topic 'FindBoost-1.63'

a9b93501 FindBoost: Add support for 1.63


---

Summary of changes:
 Modules/FindBoost.cmake |   17 -
 1 file changed, 16 insertions(+), 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.7.1-969-gff6a034

[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  ff6a034e0bb7731c97a90afec849d8c80e2a783d (commit)
   via  696339a9d571ff7d3796164dd738a6a2b042 (commit)
  from  396e9378a820cc5216aecce6bff42f526f4f7c26 (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=ff6a034e0bb7731c97a90afec849d8c80e2a783d
commit ff6a034e0bb7731c97a90afec849d8c80e2a783d
Merge: 396e937 696339a
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:25 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:25 2017 -0500

Merge topic 'FindOpenSSL-check-both'

696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present


---

Summary of changes:
 Modules/FindOpenSSL.cmake |   13 ++---
 1 file changed, 6 insertions(+), 7 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, master, updated. v3.7.1-963-g1406408

[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  1406408e61a001728eded5a7f28f3c392ff31c38 (commit)
   via  8deb913d983eee5ad1439ccb98244817d8912602 (commit)
   via  eadd395a1396ed78a3ecea7740f8f4735ab84453 (commit)
  from  22dfda11121c2b0c2374a5eb29fd3a2f140ff92c (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=1406408e61a001728eded5a7f28f3c392ff31c38
commit 1406408e61a001728eded5a7f28f3c392ff31c38
Merge: 22dfda1 8deb913
Author: Brad King 
AuthorDate: Wed Jan 11 09:58:14 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:58:14 2017 -0500

Merge topic 'FindGTest-fixups'

8deb913d FindGTest: add lib search path for MSVC x64 platform
eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value


---

Summary of changes:
 Modules/FindGTest.cmake |   14 ++
 1 file changed, 10 insertions(+), 4 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.7.1-2042-g3f697a7

[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  3f697a732c4d737fa319020e435f43d973a29901 (commit)
   via  3a97a3713a498c9a89a1733131196f7fcd03552c (commit)
  from  2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3 (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=3f697a732c4d737fa319020e435f43d973a29901
commit 3f697a732c4d737fa319020e435f43d973a29901
Merge: 2e8f576 3a97a37
Author: Brad King 
AuthorDate: Wed Jan 11 09:45:12 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:45:12 2017 -0500

Merge topic 'vs15-detect-from-installer' into next

3a97a371 VS: Port Visual Studio Setup third-party header to older VS 
versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a97a3713a498c9a89a1733131196f7fcd03552c
commit 3a97a3713a498c9a89a1733131196f7fcd03552c
Author: Brad King 
AuthorDate: Tue Jan 10 16:45:12 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 09:45:05 2017 -0500

VS: Port Visual Studio Setup third-party header to older VS versions

diff --git a/Utilities/cmvssetup/Setup.Configuration.h 
b/Utilities/cmvssetup/Setup.Configuration.h
index cc01d27..6c9d8f9 100644
--- a/Utilities/cmvssetup/Setup.Configuration.h
+++ b/Utilities/cmvssetup/Setup.Configuration.h
@@ -23,6 +23,19 @@
 
 #if defined(_WIN32) && !defined(__MINGW32__) && 
!defined(__MINGW64_VERSION_MAJOR)
 
+#ifndef _Outptr_result_maybenull_
+#define _Outptr_result_maybenull_
+#endif
+#ifndef _Out_writes_to_
+#define _Out_writes_to_(x,y)
+#endif
+#ifndef _Reserved_
+#define _Reserved_
+#endif
+#ifndef MAXUINT
+#define MAXUINT ((UINT)~((UINT)0))
+#endif
+
 // Enumerations
 //
 /// 

---

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.7.1-2040-g2e8f576

[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  2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3 (commit)
   via  6ae52ce4a16a65338c3e6ef44d4f4891667e07d7 (commit)
  from  69d0bac3bb25152fa0b3c4b23139b2bddb96eed2 (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=2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3
commit 2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3
Merge: 69d0bac 6ae52ce
Author: Brad King 
AuthorDate: Wed Jan 11 09:41:58 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:41:58 2017 -0500

Merge topic 'vs15-detect-from-installer' into next

6ae52ce4 fixup! VS: Port Visual Studio Setup third-party header to older VS 
versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ae52ce4a16a65338c3e6ef44d4f4891667e07d7
commit 6ae52ce4a16a65338c3e6ef44d4f4891667e07d7
Author: Brad King 
AuthorDate: Wed Jan 11 09:41:48 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 09:41:48 2017 -0500

fixup! VS: Port Visual Studio Setup third-party header to older VS versions

diff --git a/Utilities/cmvssetup/Setup.Configuration.h 
b/Utilities/cmvssetup/Setup.Configuration.h
index 36b8747..6c9d8f9 100644
--- a/Utilities/cmvssetup/Setup.Configuration.h
+++ b/Utilities/cmvssetup/Setup.Configuration.h
@@ -32,6 +32,9 @@
 #ifndef _Reserved_
 #define _Reserved_
 #endif
+#ifndef MAXUINT
+#define MAXUINT ((UINT)~((UINT)0))
+#endif
 
 // Enumerations
 //

---

Summary of changes:
 Utilities/cmvssetup/Setup.Configuration.h |3 +++
 1 file changed, 3 insertions(+)


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.7.1-2038-g69d0bac

[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  69d0bac3bb25152fa0b3c4b23139b2bddb96eed2 (commit)
   via  6e6253ea88542e9a3c8afc9560f131bc7073ead7 (commit)
   via  3e5fbbd6cdc472cdf7823cf81c0e527c79653188 (commit)
  from  cae7d6db19197200455de775d457d0cbd4bb655d (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=69d0bac3bb25152fa0b3c4b23139b2bddb96eed2
commit 69d0bac3bb25152fa0b3c4b23139b2bddb96eed2
Merge: cae7d6d 6e6253e
Author: Brad King 
AuthorDate: Wed Jan 11 09:33:02 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:33:02 2017 -0500

Merge topic 'cmListFileLexer-warning-fix' into next

6e6253ea cmListFileLexer: Fix signature of cmListFileLexer_New
3e5fbbd6 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e6253ea88542e9a3c8afc9560f131bc7073ead7
commit 6e6253ea88542e9a3c8afc9560f131bc7073ead7
Author: Brad King 
AuthorDate: Wed Jan 11 09:32:00 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 09:32:00 2017 -0500

cmListFileLexer: Fix signature of cmListFileLexer_New

Add explicit `(void)` instead of an empty argument list, as suggested
by `-Wstrict-prototypes`.

diff --git a/Source/cmListFileLexer.c b/Source/cmListFileLexer.c
index 31faca1..56559f6 100644
--- a/Source/cmListFileLexer.c
+++ b/Source/cmListFileLexer.c
@@ -2518,7 +2518,7 @@ static void cmListFileLexerDestroy(cmListFileLexer* lexer)
 }
 
 /*--*/
-cmListFileLexer* cmListFileLexer_New()
+cmListFileLexer* cmListFileLexer_New(void)
 {
   cmListFileLexer* lexer = (cmListFileLexer*)malloc(sizeof(cmListFileLexer));
   if (!lexer) {
diff --git a/Source/cmListFileLexer.h b/Source/cmListFileLexer.h
index dfbad5e..c9fb6da 100644
--- a/Source/cmListFileLexer.h
+++ b/Source/cmListFileLexer.h
@@ -46,7 +46,7 @@ typedef struct cmListFileLexer_s cmListFileLexer;
 extern "C" {
 #endif
 
-cmListFileLexer* cmListFileLexer_New();
+cmListFileLexer* cmListFileLexer_New(void);
 int cmListFileLexer_SetFileName(cmListFileLexer*, const char*,
 cmListFileLexer_BOM* bom);
 int cmListFileLexer_SetString(cmListFileLexer*, const char*);
diff --git a/Source/cmListFileLexer.in.l b/Source/cmListFileLexer.in.l
index 4b389b9..dd64923 100644
--- a/Source/cmListFileLexer.in.l
+++ b/Source/cmListFileLexer.in.l
@@ -398,7 +398,7 @@ static void cmListFileLexerDestroy(cmListFileLexer* lexer)
 }
 
 /*--*/
-cmListFileLexer* cmListFileLexer_New()
+cmListFileLexer* cmListFileLexer_New(void)
 {
   cmListFileLexer* lexer = (cmListFileLexer*)malloc(sizeof(cmListFileLexer));
   if (!lexer) {

---

Summary of changes:
 Source/CMakeVersion.cmake   |2 +-
 Source/cmListFileLexer.c|2 +-
 Source/cmListFileLexer.h|2 +-
 Source/cmListFileLexer.in.l |2 +-
 4 files changed, 4 insertions(+), 4 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.7.1-2035-gcae7d6d

[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  cae7d6db19197200455de775d457d0cbd4bb655d (commit)
   via  7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac (commit)
   via  6eabac26f5c8167481be9c872210a8142ead4b99 (commit)
  from  0655d616d6e11b6e490b4cea2f1367caec36c4e2 (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=cae7d6db19197200455de775d457d0cbd4bb655d
commit cae7d6db19197200455de775d457d0cbd4bb655d
Merge: 0655d61 7db05f4
Author: Brad King 
AuthorDate: Wed Jan 11 09:25:59 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:25:59 2017 -0500

Merge topic 'Autogen_Simplify' into next

7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac
commit 7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac
Author: Sebastian Holtermann 
AuthorDate: Mon Jan 2 18:02:53 2017 +0100
Commit: Brad King 
CommitDate: Wed Jan 11 09:25:48 2017 -0500

AUTOGEN: Release notes for SKIP_AUTOX

diff --git a/Help/release/dev/QtAutogen_Skip.rst 
b/Help/release/dev/QtAutogen_Skip.rst
new file mode 100644
index 000..37f795c
--- /dev/null
+++ b/Help/release/dev/QtAutogen_Skip.rst
@@ -0,0 +1,12 @@
+QtAutogen_Skip
+--
+
+* The source file properties
+  :prop_sf:`SKIP_AUTOMOC`,
+  :prop_sf:`SKIP_AUTOUIC`,
+  :prop_sf:`SKIP_AUTORCC` and
+  :prop_sf:`SKIP_AUTOGEN`
+  allow to exclude files from
+  :prop_tgt:`AUTOMOC`,
+  :prop_tgt:`AUTOUIC` and
+  :prop_tgt:`AUTORCC` processing.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6eabac26f5c8167481be9c872210a8142ead4b99
commit 6eabac26f5c8167481be9c872210a8142ead4b99
Author: Sebastian Holtermann 
AuthorDate: Mon Jan 2 17:45:17 2017 +0100
Commit: Brad King 
CommitDate: Wed Jan 11 09:25:48 2017 -0500

AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index 80b0f49..56d4ca7 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -83,6 +83,9 @@ following targets by setting the :variable:`CMAKE_AUTOMOC` 
variable.  The
 options to pass to ``moc``. The :variable:`CMAKE_AUTOMOC_MOC_OPTIONS`
 variable may be populated to pre-set the options for all following targets.
 
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 .. _`Qt AUTOUIC`:
 
 AUTOUIC
@@ -149,6 +152,9 @@ result of linking with the :prop_tgt:`IMPORTED` target:
 Qt5::Widgets
   )
 
+Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
+enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 .. _`Qt AUTORCC`:
 
 AUTORCC
@@ -171,6 +177,9 @@ populated to pre-set the options for all following targets. 
 The
 ``.qrc`` file to set particular options for the file.  This
 overrides options from the :prop_tgt:`AUTORCC_OPTIONS` target property.
 
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 qtmain.lib on Windows
 =
 
diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst
index 30a39b1..b42643f 100644
--- a/Help/prop_tgt/AUTOMOC.rst
+++ b/Help/prop_tgt/AUTOMOC.rst
@@ -47,5 +47,8 @@ See the documentation for this variable for more details.
 The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group the
 automoc targets together in an IDE, e.g.  in MSVS.
 
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.
diff --git a/Help/prop_tgt/AUTORCC.rst b/Help/prop_tgt/AUTORCC.rst
index 158fdf8..1ad0895 100644
--- a/Help/prop_tgt/AUTORCC.rst
+++ b/Help/prop_tgt/AUTORCC.rst
@@ -24,5 +24,8 @@ generate unspecified unique names for ``rcc``.  Therefore if
 ``Q_INIT_RESOURCE()`` or ``Q_CLEANUP_RESOURCE()`` need to be used the
 ``.qrc`` file name must be unique.
 
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.
diff --git a/Help/prop_tgt/AUTOUIC.rst 

[Cmake-commits] CMake branch, next, updated. v3.7.1-2032-g0655d61

[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  0655d616d6e11b6e490b4cea2f1367caec36c4e2 (commit)
   via  0c59007843491c178b89ec6b4d318d9a478e6b76 (commit)
  from  55f86ceb1f2e5e925a678e9decf181141bb301dc (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=0655d616d6e11b6e490b4cea2f1367caec36c4e2
commit 0655d616d6e11b6e490b4cea2f1367caec36c4e2
Merge: 55f86ce 0c59007
Author: Brad King 
AuthorDate: Wed Jan 11 09:25:25 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 11 09:25:25 2017 -0500

Merge topic 'Autogen_Simplify' into next

0c590078 fixup! AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, 
AUTORCC


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c59007843491c178b89ec6b4d318d9a478e6b76
commit 0c59007843491c178b89ec6b4d318d9a478e6b76
Author: Brad King 
AuthorDate: Wed Jan 11 09:24:55 2017 -0500
Commit: Brad King 
CommitDate: Wed Jan 11 09:24:55 2017 -0500

fixup! AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index c348f3f..56d4ca7 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -152,11 +152,11 @@ result of linking with the :prop_tgt:`IMPORTED` target:
 Qt5::Widgets
   )
 
-.. _`Qt AUTORCC`:
-
 Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
 enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
 
+.. _`Qt AUTORCC`:
+
 AUTORCC
 ^^^
 

---

Summary of changes:
 Help/manual/cmake-qt.7.rst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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

[CMake] MSVC15 variable available for Visual Studio 2017

[Gregor Jasny via CMake]

Hello,

I wonder if there is a reason why no MSVC15 variable is available for 
Visual Studio 2017? I'm using those MSVCxx variables and 
CMAKE_GENERATOR_TOOLSET to detect the active toolset:



  # Visual Studio 2008
  if((MSVC90 AND "${CMAKE_GENERATOR_TOOLSET}" STREQUAL "") OR (CMAKE_GENERATOR_TOOLSET 
MATCHES "v90"))
set(COL_BUILD_TOOLCHAIN)
  elseif((MSVC11 AND "${CMAKE_GENERATOR_TOOLSET}" STREQUAL "") OR 
(CMAKE_GENERATOR_TOOLSET MATCHES "^v110.*"))
set(COL_BUILD_TOOLCHAIN _v110)
  elseif((MSVC12 AND "${CMAKE_GENERATOR_TOOLSET}" STREQUAL "") OR 
(CMAKE_GENERATOR_TOOLSET MATCHES "^v120.*"))
set(COL_BUILD_TOOLCHAIN _v120)
  elseif((MSVC14 AND "${CMAKE_GENERATOR_TOOLSET}" STREQUAL "") OR 
(CMAKE_GENERATOR_TOOLSET MATCHES "^v140.*"))
set(COL_BUILD_TOOLCHAIN _v140)
  else()
message(FATAL_ERROR "Unknown Visual Studio version (${MSVC_VERSION}) or 
generator toolset (${CMAKE_GENERATOR_TOOLSET})")
  endif()


If I now select the Visual Studio 2017 compiler but omit the toolset on 
the command line, the CMAKE_GENERATOR_TOOLSET is empty and MSVC15 is not 
set. I wonder how I could detect the v141(_xp) toolset?




Thanks,
Gregor
--

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