date:20160119

On Mon, Jan 11, 2016 at 5:16 PM, Stephen Kelly  wrote:
> Taylor Braun-Jones wrote:
>
>> Consider library project Foo that uses a header-only project Bar. In
>> FooConfig.cmake, it is a important to ensure any projects using Foo also
>> use the exact same version of Bar that Foo was originally built with
>
> COMPATIBLE_INTERFACE_STRING and similar properties are designed for that use
> case.
>
> You would populate an INTERFACE_ property on the INTERFACE target, which is
> whitelisted already:
>
>  
> https://cmake.org/cmake/help/v3.4/manual/cmake-buildsystem.7.html#compatible-interface-properties
>
>  http://article.gmane.org/gmane.comp.programming.tools.cmake.devel/5813

Thanks - that's exactly what I was looking for!

Taylor
-- 

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.4.2-2023-g683f5b1

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  683f5b178974acfe2d387e2ab0a4040ed023b51e (commit)
   via  1040e690c6c99979f8edf2a121de6d835be96dbe (commit)
   via  ce3b713baa1c899ae7739c192040e24445368a0a (commit)
   via  dc039cc02c857b2c418481533a236dad6a586a7f (commit)
   via  ffa2a8c967df09c4630e50e7c7339e36b027ecaf (commit)
   via  92e9bb21758f73266e1f805e366ce90d2cbd688d (commit)
   via  fb1526f57fe4720aff596b312e6a767502b86e13 (commit)
  from  2610a2b988323fa4653fb602935c3a6079d8b68a (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=683f5b178974acfe2d387e2ab0a4040ed023b51e
commit 683f5b178974acfe2d387e2ab0a4040ed023b51e
Merge: 2610a2b 1040e69
Author: Brad King 
AuthorDate: Tue Jan 19 16:02:17 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 16:02:17 2016 -0500

Merge topic 'cleanup-RunSingleCommand' into next

1040e690 cmSystemTools: Teach RunSingleCommand to merge child pipes when 
possible
ce3b713b cmSystemTools: Simplify RunSingleCommand output string construction
dc039cc0 cmSystemTools: Drop redundant condition in RunSingleCommand
ffa2a8c9 cmSystemTools: Rename OUTPUT_NORMAL to OUTPUT_FORWARD to clarify 
its purpose
92e9bb21 cmcmd.cxx: Remove unused code in __run_iwyu implementation
fb1526f5 cmake: Change `-E chdir` to pass through stdout/stderr directly


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1040e690c6c99979f8edf2a121de6d835be96dbe
commit 1040e690c6c99979f8edf2a121de6d835be96dbe
Author: Brad King 
AuthorDate: Thu Jan 14 16:11:23 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 15:55:05 2016 -0500

cmSystemTools: Teach RunSingleCommand to merge child pipes when possible

Audit the code to make sure there are no callers that use OUTPUT_MERGE
with separate capture strings.  Then change RunSingleCommand to
implement output merging by giving the child process a single pipe for
both its stdout and stderr descriptors.  This will more cleanly merge
the content on atomic write boundaries in the child instead of on
arbitrary buffering boundaries in the parent.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3a730b2..3ba7287 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 #ifdef __QNX__
 # include  /* for malloc/free on QNX */
 #endif
@@ -673,7 +674,16 @@ bool 
cmSystemTools::RunSingleCommand(std::vectorconst& command,
 {
 cmsysProcess_SetPipeShared(cp, cmsysProcess_Pipe_STDOUT, 1);
 cmsysProcess_SetPipeShared(cp, cmsysProcess_Pipe_STDERR, 1);
+captureStdOut = 0;
+captureStdErr = 0;
 }
+  else if (outputflag == OUTPUT_MERGE ||
+   (captureStdErr && captureStdErr == captureStdOut))
+{
+cmsysProcess_SetOption(cp, cmsysProcess_Option_MergeOutput, 1);
+captureStdErr = 0;
+}
+  assert(!captureStdErr || captureStdErr != captureStdOut);
 
   cmsysProcess_SetTimeout(cp, timeout);
   cmsysProcess_Execute(cp);
@@ -699,38 +709,26 @@ bool 
cmSystemTools::RunSingleCommand(std::vectorconst& command,
   }
 }
 
-  if(pipe == cmsysProcess_Pipe_STDOUT ||
- (pipe == cmsysProcess_Pipe_STDERR &&
-  captureStdOut == captureStdErr))
+  if (pipe == cmsysProcess_Pipe_STDOUT)
 {
-if (captureStdOut)
+if (outputflag != OUTPUT_NONE)
   {
-  tempStdOut.insert(tempStdOut.end(), data, data+length);
+  cmSystemTools::Stdout(data, length);
   }
-}
-  else if(pipe == cmsysProcess_Pipe_STDERR)
-{
-if (captureStdErr)
+if (captureStdOut)
   {
-  tempStdErr.insert(tempStdErr.end(), data, data+length);
+  tempStdOut.insert(tempStdOut.end(), data, data+length);
   }
 }
-  if(outputflag != OUTPUT_NONE)
+  else if (pipe == cmsysProcess_Pipe_STDERR)
 {
-if(outputflag == OUTPUT_MERGE)
+if (outputflag != OUTPUT_NONE)
   {
-  cmSystemTools::Stdout(data, length);
+  cmSystemTools::Stderr(data, length);
   }
-else
+if (captureStdErr)
   {
-  if(pipe == cmsysProcess_Pipe_STDERR)
-{
-cmSystemTools::Stderr(data, length);
-}
-  else if(pipe == cmsysProcess_Pipe_STDOUT)
-{
-cmSystemTools::Stdout(data, length);
-}
+

[Cmake-commits] CMake branch, next, updated. v3.4.2-2025-gbde6c55

2016-01-19 Thread Clinton Stimpson

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  bde6c5547e181b72aaefba092bdd9a79ba01 (commit)
   via  a15e375cddb415ebe89aa5896d783b821aca940c (commit)
  from  683f5b178974acfe2d387e2ab0a4040ed023b51e (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=bde6c5547e181b72aaefba092bdd9a79ba01
commit bde6c5547e181b72aaefba092bdd9a79ba01
Merge: 683f5b1 a15e375
Author: Clinton Stimpson 
AuthorDate: Tue Jan 19 16:06:07 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 16:06:07 2016 -0500

Merge topic 'mfc-utility-targets' into next

a15e375c Fix MFC setting on utility targets (#15867)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a15e375cddb415ebe89aa5896d783b821aca940c
commit a15e375cddb415ebe89aa5896d783b821aca940c
Author: Clinton Stimpson 
AuthorDate: Tue Jan 19 14:01:08 2016 -0700
Commit: Clinton Stimpson 
CommitDate: Tue Jan 19 14:04:15 2016 -0700

Fix MFC setting on utility targets (#15867)

Multi-byte MFC is deprecated, and some projects will not compile if MFC is 
enabled.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index 27ae685..09d4a90 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -762,13 +762,16 @@ void cmVisualStudio10TargetGenerator
   std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
 
   std::string useOfMfcValue = "false";
-  if(mfcFlagValue == "1")
-{
-useOfMfcValue = "Static";
-}
-  else if(mfcFlagValue == "2")
+  if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
 {
-useOfMfcValue = "Dynamic";
+if(mfcFlagValue == "1")
+  {
+  useOfMfcValue = "Static";
+  }
+else if(mfcFlagValue == "2")
+  {
+  useOfMfcValue = "Dynamic";
+  }
 }
   std::string mfcLine = "";
   mfcLine += useOfMfcValue + "\n";

---

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)


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

Re: [cmake-developers] BUG: Pass --build-config option to ctest for multi-config ExternalProjects

On 01/19/2016 03:54 PM, Taylor Braun-Jones wrote:
> For ExternalProjects built with a multi-config generator like "Visual
> Studio 12" with `TEST_BEFORE_INSTALL ON` I need this patch:
> 
> https://github.com/Kitware/CMake/compare/master...nocnokneo:patch-1
> 
> Otherwise, the test step gives the error "Test not available without
> configuration."

Good catch.  Please try these changes:

 ExternalProject: Simplify `cmake --build` configuration passing
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b95be1cf

 ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f565f9fa

Thanks,
-Brad
-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.4.2-2030-gf0f0470

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  f0f0470cbf18cdea04873fd1ad67a6504f88a779 (commit)
   via  78ff8bba81c7fa4dec884c9b59e4058cc830e818 (commit)
  from  d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec (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=f0f0470cbf18cdea04873fd1ad67a6504f88a779
commit f0f0470cbf18cdea04873fd1ad67a6504f88a779
Merge: d1a35c5 78ff8bb
Author: Brad King 
AuthorDate: Tue Jan 19 16:18:43 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 16:18:43 2016 -0500

Merge topic 'xalanc' into next

78ff8bba FindXalanC: Do not require XercesC unconditionally


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78ff8bba81c7fa4dec884c9b59e4058cc830e818
commit 78ff8bba81c7fa4dec884c9b59e4058cc830e818
Author: Brad King 
AuthorDate: Tue Jan 19 16:15:02 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 16:15:02 2016 -0500

FindXalanC: Do not require XercesC unconditionally

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index 99b31d1..bdb823a 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -110,7 +110,7 @@ unset(XalanC_VERSION_MAJOR)
 unset(XalanC_VERSION_MINOR)
 unset(XalanC_VERSION_PATCH)
 
-find_package(XercesC REQUIRED)
+find_package(XercesC) # TODO: require if we are required
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XalanC

---

Summary of changes:
 Modules/FindXalanC.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

Re: [cmake-developers] [CMake] Why does INTERFACE type targets only support whitelisted properties?

On Mon, Jan 11, 2016 at 5:16 PM, Stephen Kelly  wrote:
> Taylor Braun-Jones wrote:
>
>> Consider library project Foo that uses a header-only project Bar. In
>> FooConfig.cmake, it is a important to ensure any projects using Foo also
>> use the exact same version of Bar that Foo was originally built with
>
> COMPATIBLE_INTERFACE_STRING and similar properties are designed for that use
> case.
>
> You would populate an INTERFACE_ property on the INTERFACE target, which is
> whitelisted already:
>
>  
> https://cmake.org/cmake/help/v3.4/manual/cmake-buildsystem.7.html#compatible-interface-properties
>
>  http://article.gmane.org/gmane.comp.programming.tools.cmake.devel/5813

Thanks - that's exactly what I was looking for!

Taylor
-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.4.2-2028-gd1a35c5

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  d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec (commit)
   via  f565f9fa038d57958a4d34a6829d3ae175063704 (commit)
   via  b95be1cf8bf2504b4a5d8c9667ea7e936e19a4f6 (commit)
  from  bde6c5547e181b72aaefba092bdd9a79ba01 (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=d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec
commit d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec
Merge: bde6c55 f565f9f
Author: Brad King 
AuthorDate: Tue Jan 19 16:17:03 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 16:17:03 2016 -0500

Merge topic 'ExternalProject-ctest-config' into next

f565f9fa ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config 
generators
b95be1cf ExternalProject: Simplify `cmake --build` configuration passing


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f565f9fa038d57958a4d34a6829d3ae175063704
commit f565f9fa038d57958a4d34a6829d3ae175063704
Author: Brad King 
AuthorDate: Tue Jan 19 16:09:29 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 16:09:29 2016 -0500

ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators

In multi-config generators we must tell `ctest` what configuration to
test.

Reported-by: Taylor Braun-Jones 

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index f8ed0c8..200c488 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1240,6 +1240,9 @@ function(_ep_get_build_command name step cmd_var)
 if("x${step}x" STREQUAL "xTESTx")
   string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd 
"${cmd}")
   set(args "")
+  if(CMAKE_CONFIGURATION_TYPES)
+list(APPEND args -C $)
+  endif()
 endif()
   endif()
 else()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b95be1cf8bf2504b4a5d8c9667ea7e936e19a4f6
commit b95be1cf8bf2504b4a5d8c9667ea7e936e19a4f6
Author: Brad King 
AuthorDate: Tue Jan 19 16:07:28 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 16:09:23 2016 -0500

ExternalProject: Simplify `cmake --build` configuration passing

Check CMAKE_CONFIGURATION_TYPES instead of CMAKE_CFG_INTDIR in order
to recognize multi-config generators.  Then use $ to
pass the configuration value.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 5c5c54a..f8ed0c8 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1230,9 +1230,9 @@ function(_ep_get_build_command name step cmd_var)
   set(cmd "${CMAKE_COMMAND}")
 endif()
 set(args --build ".")
-if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
-  list(APPEND args --config "${CMAKE_CFG_INTDIR}")
-endif ()
+if(CMAKE_CONFIGURATION_TYPES)
+  list(APPEND args --config $)
+endif()
 if(step STREQUAL "INSTALL")
   list(APPEND args --target install)
 endif()

---

Summary of changes:
 Modules/ExternalProject.cmake |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)


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

Re: [cmake-developers] BUG: Pass --build-config option to ctest for multi-config ExternalProjects

On Tue, Jan 19, 2016 at 4:18 PM, Brad King  wrote:
> On 01/19/2016 03:54 PM, Taylor Braun-Jones wrote:
>> For ExternalProjects built with a multi-config generator like "Visual
>> Studio 12" with `TEST_BEFORE_INSTALL ON` I need this patch:
>>
>> https://github.com/Kitware/CMake/compare/master...nocnokneo:patch-1
>>
>> Otherwise, the test step gives the error "Test not available without
>> configuration."
>
> Good catch.  Please try these changes:
>
>  ExternalProject: Simplify `cmake --build` configuration passing
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b95be1cf
>
>  ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f565f9fa

Thanks - works!

However, these patches use the deprecated $ generator
expression instead of $. The rest of ExternalProject.cmake
uses $.

Taylor
-- 

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] BUG: Pass --build-config option to ctest for multi-config ExternalProjects

For ExternalProjects built with a multi-config generator like "Visual
Studio 12" with `TEST_BEFORE_INSTALL ON` I need this patch:

https://github.com/Kitware/CMake/compare/master...nocnokneo:patch-1

Otherwise, the test step gives the error "Test not available without
configuration."

Thanks,
Taylor
-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] Access output from CheckCXXSourceRuns and CheckCSourceRuns

On 01/19/2016 12:03 PM, Harry Mallon wrote:
> I cannot retrieve a version number without linking and interrogating
> the library. I could be missing something though.

Are you saying that the only API provided by the package in question
to get its version number is a runtime call?  There is no version
number provided by its header files as a preprocessor macro?

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.4.1-2029-g2610a2b

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  2610a2b988323fa4653fb602935c3a6079d8b68a (commit)
   via  9451ea5a6a55f0e46ad68cd622e05a130ca0988f (commit)
  from  078e8a2dcbe4e64ad63bdd04c60aba75bdd8b734 (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=2610a2b988323fa4653fb602935c3a6079d8b68a
commit 2610a2b988323fa4653fb602935c3a6079d8b68a
Merge: 078e8a2 9451ea5
Author: Brad King 
AuthorDate: Tue Jan 19 14:57:16 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 14:57:16 2016 -0500

Merge topic 'FindPNG-imported-targets' into next

9451ea5a FindPNG: Create an imported PNG::PNG target (#15911)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9451ea5a6a55f0e46ad68cd622e05a130ca0988f
commit 9451ea5a6a55f0e46ad68cd622e05a130ca0988f
Author: Sam Thursfield 
AuthorDate: Tue Jan 19 17:43:05 2016 +
Commit: Brad King 
CommitDate: Tue Jan 19 14:56:23 2016 -0500

FindPNG: Create an imported PNG::PNG target (#15911)

Imported targets are now the recommended way of dealing with external
library dependencies.  Add one for FindPNG and update documentation
accordingly.  Also add a test case activated by CMake_TEST_FindPNG.

diff --git a/Help/release/dev/FindPNG-imported-targets.rst 
b/Help/release/dev/FindPNG-imported-targets.rst
new file mode 100644
index 000..e0d0ab1
--- /dev/null
+++ b/Help/release/dev/FindPNG-imported-targets.rst
@@ -0,0 +1,4 @@
+FindPNG-imported-targets
+
+
+* The :module:`FindPNG` module now provides imported targets.
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 7cf3f22..4eb3b86 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -2,13 +2,20 @@
 # FindPNG
 # ---
 #
-# Find the native PNG includes and library
+# Find libpng, the official reference library for the PNG image format.
 #
+# Imported targets
+# 
 #
+# This module defines the following :prop_tgt:`IMPORTED` target:
 #
-# This module searches libpng, the library for working with PNG images.
+# ``PNG::PNG``
+#   The libpng library, if found.
 #
-# It defines the following variables
+# Result variables
+# 
+#
+# This module will set the following variables in your project:
 #
 # ``PNG_INCLUDE_DIRS``
 #   where to find png.h, etc.
@@ -22,19 +29,22 @@
 # ``PNG_VERSION_STRING``
 #   the version of the PNG library found (since CMake 2.8.8)
 #
-# Also defined, but not for general use are
+# Obsolete variables
+# ^^
+#
+# The following variables may also be set, for backwards compatibility:
 #
 # ``PNG_LIBRARY``
 #   where to find the PNG library.
-#
-# For backward compatiblity the variable PNG_INCLUDE_DIR is also set.
-# It has the same value as PNG_INCLUDE_DIRS.
+# ``PNG_INCLUDE_DIR``
+#   where to find the PNG headers (same as PNG_INCLUDE_DIRS)
 #
 # Since PNG depends on the ZLib compression library, none of the above
 # will be defined unless ZLib can be found.
 
 #=
 # Copyright 2002-2009 Kitware, Inc.
+# Copyright 2016 Raumfeld
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -105,6 +115,32 @@ if(ZLIB_FOUND)
 endif()
   endif ()
 
+  if(NOT TARGET PNG::PNG)
+add_library(PNG::PNG UNKNOWN IMPORTED)
+set_target_properties(PNG::PNG PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
+  INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
+  INTERFACE_LIBRARIES "${PNG_LIBRARIES}")
+if(EXISTS "${PNG_LIBRARY}")
+  set_target_properties(PNG::PNG PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+IMPORTED_LOCATION "${PNG_LIBRARY}")
+endif()
+if(EXISTS "${PNG_LIBRARY_DEBUG}")
+  set_property(TARGET PNG::PNG APPEND PROPERTY
+IMPORTED_CONFIGURATIONS DEBUG)
+  set_target_properties(PNG::PNG PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
+endif()
+if(EXISTS "${PNG_LIBRARY_RELEASE}")
+  set_property(TARGET PNG::PNG APPEND PROPERTY
+IMPORTED_CONFIGURATIONS RELEASE)
+  set_target_properties(PNG::PNG PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+IMPORTED_LOCATION_RELEASE "${PNG_LIBRARY_RELEASE}")
+endif()
+

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

2016-01-19 Thread Robert Maynard

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

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

Thanks for your support!

-
Changes in 3.4.2 since 3.4.1:

Brad King (6):
CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
VS: Do not select a partial Windows 10 SDK folder (#15831)
VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
cmSystemTools: Add VersionCompareEqual helper
VS: Fix Windows 10 SDK version selection (#15831)
CMake 3.4.2

Marc Chevrier (2):
FindJava: Fix typos in IdlJ and JarSigner component implementation
AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW
-- 

Powered by www.kitware.com

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

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

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

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

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

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

2016-01-19 Thread Robert Maynard

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The annotated tag, v3.4.2 has been created
at  e7153bdf97a402eb9b74b3811487b6299c3c441b (tag)
   tagging  6506dcaa20a7d17737517dbcba6102be564d8d66 (commit)
  replaces  v3.4.1
 tagged by  Brad King
on  Tue Jan 19 14:43:06 2016 -0500

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

iQIcBAABAgAGBQJWnpHKAAoJEC0s7xA0khaE+tYP/RCJIuPQx57adtYlXen+mfq3
ssnRLxjNsAeG6J0YvvzWk9NtEsCIDzwI46lbqnAh2rRsbffmezlny9aKu8ctnHyD
vthB+YakSI8uKod+BItmwyDbrQDzlgw6nsC3hafGwotuZsNFKWjHMrkO9rNM+YSq
eLweIR1ecbZxQYWXw1kLtZXID4bhCmFdn6lCweFt4Fy+Rr+AOGK/utfvGnwBSmPP
xG8wwYNfEUBPhWgfS7OtnV9lyPMHQigJ0g6q/1Hlxz0IHTj2XZS6kLrx3Yybr4RV
0K/ZR+FzLPnGiukGH/IVz1DyPC4RXdZ78z5o7uteGmKiC+DORw+/vwQQ94lVI0g+
kzI56gbUYjLp8pTOok0R4lo9RxWfi8MUI2CCEiaWH24859GbFhDYgTmiGKLP9wtA
diYhYIxQqd+7ST6TjbOSg6QORVaze+s+Rf+cj0ZmhZfwrHaIWQtVZ8++ArlJrmOj
Ah4utwaF1km7Pj240RNJm6RuzZ4Yzspk60hWmkDrijnr4tXuJv9ZyuN5LaKT41wP
wddwqgRvept1EaOGmL7TNvp5RpS8/TxLVQq4H7YtJUFptnaTzetIlddnkFMRQHWe
yTKssJc/LWmJjs+Cl1q6quIjz6ze3eWfLST2pymzd9kuxl18/SQexJQwFn2EmKCX
85OshBbkaY59U9jgLGNp
=kQq7
-END PGP SIGNATURE-

Brad King (11):
  Merge branch 'fix-java-idlj-jarsigner-typos' into release
  Merge branch 'fix-CMP0065-NEW-AIX-HP' into release
  CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
  Merge branch 'vs-compiler-id-itanium' into release
  VS: Do not select a partial Windows 10 SDK folder (#15831)
  VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
  Merge branch 'vs14-debug-enum' into release
  cmSystemTools: Add VersionCompareEqual helper
  VS: Fix Windows 10 SDK version selection (#15831)
  Merge branch 'vs-win10-sdk' into release
  CMake 3.4.2

Marc Chevrier (2):
  FindJava: Fix typos in IdlJ and JarSigner component implementation
  AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW

---


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

[CMake] [ANNOUNCE] CMake 3.4.2 available for download

2016-01-19 Thread Robert Maynard

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

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

Thanks for your support!

-
Changes in 3.4.2 since 3.4.1:

Brad King (6):
CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
VS: Do not select a partial Windows 10 SDK folder (#15831)
VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
cmSystemTools: Add VersionCompareEqual helper
VS: Fix Windows 10 SDK version selection (#15831)
CMake 3.4.2

Marc Chevrier (2):
FindJava: Fix typos in IdlJ and JarSigner component implementation
AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW
-- 

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

Re: [cmake-developers] Access output from CheckCXXSourceRuns and CheckCSourceRuns

2016-01-19 Thread Harry Mallon

Yep. The headers are the same version to version but provide a function to 
retrieve a filled version struct.

H

Harry Mallon

CODEX | Software Engineer

60 Poland Street | London | England | W1F 7NT

E ha...@codexdigital.com | T +44 203 7000 
989

Website | Facebook 
| Twitter

[http://www.codexdigital.com/?action=asset=E55D8A6F-AF62-4978-8FF1-435A85AFADBF]

On 19 Jan 2016 19:30, Brad King  wrote:
On 01/19/2016 12:03 PM, Harry Mallon wrote:
> I cannot retrieve a version number without linking and interrogating
> the library. I could be missing something though.

Are you saying that the only API provided by the package in question
to get its version number is a runtime call?  There is no version
number provided by its header files as a preprocessor macro?

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [PATCH] FindPNG: Create an imported PNG::PNG target

On 01/19/2016 12:43 PM, Sam Thursfield wrote:
> Imported targets are now the recommended way of dealing with external
> library dependencies.

Thanks!  Applied with minor doc format fixup and merged to 'next'
for testing:

 FindPNG: Create an imported PNG::PNG target (#15911)
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9451ea5a

> + INTERFACE_LIBRARIES "${PNG_LIBRARIES}")

Shouldn't this refer to zlib instead of png libraries again?

Thanks,
-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

[cmake-developers] [PATCH] FindPNG: Create an imported PNG::PNG target

2016-01-19 Thread Sam Thursfield

Imported targets are now the recommended way of dealing with external
library dependencies.

The documentation for FindPNG is rewritten slightly.

This commit also adds a test case, you can run it like this:

cmake ... -DCMake_TEST_FindPNG=ON
ctest -R FindPNG --output-on-failure

The testcase requires the libpng library and headers to be installed.

This change is based on the equivalent changes to FindTIFF, found in
commit ebaca6290d2c0be7dec22452389632949a700d28.

https://cmake.org/Bug/view.php?id=15911
---
 Help/release/dev/FindPNG-imported-targets.rst |  4 +++
 Modules/FindPNG.cmake | 50 +++
 Tests/CMakeLists.txt  |  4 +++
 Tests/FindPNG/CMakeLists.txt  | 10 ++
 Tests/FindPNG/Test/CMakeLists.txt | 16 +
 Tests/FindPNG/Test/main.c | 20 +++
 6 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 Help/release/dev/FindPNG-imported-targets.rst
 create mode 100644 Tests/FindPNG/CMakeLists.txt
 create mode 100644 Tests/FindPNG/Test/CMakeLists.txt
 create mode 100644 Tests/FindPNG/Test/main.c

diff --git a/Help/release/dev/FindPNG-imported-targets.rst 
b/Help/release/dev/FindPNG-imported-targets.rst
new file mode 100644
index 000..e0d0ab1
--- /dev/null
+++ b/Help/release/dev/FindPNG-imported-targets.rst
@@ -0,0 +1,4 @@
+FindPNG-imported-targets
+
+
+* The :module:`FindPNG` module now provides imported targets.
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 7cf3f22..d1d5e67 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -2,13 +2,20 @@
 # FindPNG
 # ---
 #
-# Find the native PNG includes and library
+# Find libpng, the official reference library for the PNG image format.
 #
+# Imported targets
+# 
 #
+# This module defines the following :prop_tgt:`IMPORTED` target:
 #
-# This module searches libpng, the library for working with PNG images.
+# ``PNG::PNG``
+#   The libpng library, if found.
 #
-# It defines the following variables
+# Result variables
+# 
+#
+# This module will set the following variables in your project:
 #
 # ``PNG_INCLUDE_DIRS``
 #   where to find png.h, etc.
@@ -22,19 +29,22 @@
 # ``PNG_VERSION_STRING``
 #   the version of the PNG library found (since CMake 2.8.8)
 #
-# Also defined, but not for general use are
+# Obsolete variables
+# ^^^
+#
+# The following variables may also be set, for backwards compatibility:
 #
 # ``PNG_LIBRARY``
 #   where to find the PNG library.
-#
-# For backward compatiblity the variable PNG_INCLUDE_DIR is also set.
-# It has the same value as PNG_INCLUDE_DIRS.
+# ``PNG_INCLUDE_DIR``
+#   where to find the PNG headers (same as PNG_INCLUDE_DIRS)
 #
 # Since PNG depends on the ZLib compression library, none of the above
 # will be defined unless ZLib can be found.
 
 #=
 # Copyright 2002-2009 Kitware, Inc.
+# Copyright 2016 Raumfeld
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -105,6 +115,32 @@ if(ZLIB_FOUND)
 endif()
   endif ()
 
+  if(NOT TARGET PNG::PNG)
+add_library(PNG::PNG UNKNOWN IMPORTED)
+set_target_properties(PNG::PNG PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
+  INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
+  INTERFACE_LIBRARIES "${PNG_LIBRARIES}")
+if(EXISTS "${PNG_LIBRARY}")
+  set_target_properties(PNG::PNG PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+IMPORTED_LOCATION "${PNG_LIBRARY}")
+endif()
+if(EXISTS "${PNG_LIBRARY_DEBUG}")
+  set_property(TARGET PNG::PNG APPEND PROPERTY
+IMPORTED_CONFIGURATIONS DEBUG)
+  set_target_properties(PNG::PNG PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
+endif()
+if(EXISTS "${PNG_LIBRARY_RELEASE}")
+  set_property(TARGET PNG::PNG APPEND PROPERTY
+IMPORTED_CONFIGURATIONS RELEASE)
+  set_target_properties(PNG::PNG PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+IMPORTED_LOCATION_RELEASE "${PNG_LIBRARY_RELEASE}")
+endif()
+  endif()
   endif ()
 
   if (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h")
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 043b757..3cca77b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1375,6 +1375,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P 
${CMake_SOURCE_DIR}/Utilities/Release
 add_subdirectory(FindOpenSSL)
   endif()
 
+  if(CMake_TEST_FindPNG)
+add_subdirectory(FindPNG)
+  endif()
+
   if(CMake_TEST_FindTIFF)
 add_subdirectory(FindTIFF)
   endif()
diff --git

Re: [cmake-developers] [PATCH] FindALSA: Create an imported ALSA:ASound target

On 01/19/2016 11:50 AM, Sam Thursfield wrote:
> Imported targets are now the recommended way of dealing with external
> library dependencies.

Thanks!  Adding Roger Leigh to Cc because he has implemented several
of these for other modules.

> +  set(ALSA_LIBRARIES ${ALSA_LIBRARY})
> +  set(ALSA_INCLUDE_DIRS ${ALSA_INCLUDE_DIR})
> +
> +  if(NOT TARGET ALSA::ASound)
> +add_library(ALSA::ASound UNKNOWN IMPORTED)
> +set_target_properties(ALSA::ASound PROPERTIES
> +  IMPORTED_LINK_INTERFACE_LANGUAGES "C"
> +  IMPORTED_LOCATION "${ALSA_LIBRARY}"
> +  INTERFACE_INCLUDE_DIRECTORIES "${ALSA_INCLUDE_DIRS}"
> +  INTERFACE_LIBRARIES "${ALSA_LIBRARY}"

We shouldn't need to use INTERFACE_LIBRARIES here.  The IMPORTED_LOCATION
of an imported library should be enough to get it linked.

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [PATCH 0/3] FindwxWidgets improvements

On 09/09/2015 11:01 AM, Brad King wrote:
>  FindwxWidgets: allow specifying required version
>  http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6089fde5

This introduced a regression reported here:

 https://cmake.org/Bug/view.php?id=15928

The version extraction from the header is breaking the reported case.

> + find_file(_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} 
> NO_DEFAULT_PATH)

This call is affected by CMAKE_FIND_ROOT_PATH.  Please take a look.

Thanks,
-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.4.1-2027-g078e8a2

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  078e8a2dcbe4e64ad63bdd04c60aba75bdd8b734 (commit)
   via  c13ed964012bcdf3765ada195db66930d6a0fcf9 (commit)
  from  9641548007af875da7a25525037cae7447ae07dd (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=078e8a2dcbe4e64ad63bdd04c60aba75bdd8b734
commit 078e8a2dcbe4e64ad63bdd04c60aba75bdd8b734
Merge: 9641548 c13ed96
Author: Brad King 
AuthorDate: Tue Jan 19 14:41:11 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 14:41:11 2016 -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.4.1-871-gc13ed96

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  c13ed964012bcdf3765ada195db66930d6a0fcf9 (commit)
   via  6506dcaa20a7d17737517dbcba6102be564d8d66 (commit)
  from  e4a135dc446475b01a2c4d60dac0d8c5c8078590 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
---

Summary of changes:


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

[Cmake-commits] CMake branch, release, updated. v3.4.1-13-g6506dca

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  6506dcaa20a7d17737517dbcba6102be564d8d66 (commit)
  from  8ce5ff8d9e411d7d27176881b98bf733da90791f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
---

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


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

Re: [cmake-developers] [patch] New find module FindXalanC


On 19/01/2016 19:14, Brad King wrote:

On 01/19/2016 12:02 PM, Roger Leigh wrote:

+find_package(XercesC 3.0.0 REQUIRED)


I think this is an assumption leaking from my own usage of it. I've
removed the version here.


Thanks.  The CMakeOnly.AllFindModules and FindModulesExecuteAll
tests fail when XercesC is not available.  It should be required
only if XalanC is required (XalanC_FIND_REQUIRED).


This should be fixed now.


Thanks,
Roger

--

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.4.2-2032-gda0dd89

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  da0dd89221bbf9a46dd6065c18023b9f62f682a2 (commit)
   via  3b61ef9dd48eaaacc2fa5123974d9cb9f68ae96d (commit)
  from  f0f0470cbf18cdea04873fd1ad67a6504f88a779 (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=da0dd89221bbf9a46dd6065c18023b9f62f682a2
commit da0dd89221bbf9a46dd6065c18023b9f62f682a2
Merge: f0f0470 3b61ef9
Author: Roger Leigh 
AuthorDate: Tue Jan 19 19:04:10 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 19:04:10 2016 -0500

Merge topic 'xalanc' into next

3b61ef9d FindXercesC: Pass REQUIRED flag to find_package conditionally


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b61ef9dd48eaaacc2fa5123974d9cb9f68ae96d
commit 3b61ef9dd48eaaacc2fa5123974d9cb9f68ae96d
Author: Roger Leigh 
AuthorDate: Tue Jan 19 23:57:55 2016 +
Commit: Roger Leigh 
CommitDate: Wed Jan 20 00:00:44 2016 +

FindXercesC: Pass REQUIRED flag to find_package conditionally

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index bdb823a..016b7aa 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -110,7 +110,12 @@ unset(XalanC_VERSION_MAJOR)
 unset(XalanC_VERSION_MINOR)
 unset(XalanC_VERSION_PATCH)
 
-find_package(XercesC) # TODO: require if we are required
+unset(XalanC_XERCESC_REQUIRED)
+if(XalanC_FIND_REQUIRED)
+  set(XalanC_XERCESC_REQUIRED REQUIRED)
+endif()
+find_package(XercesC ${XalanC_XERCESC_REQUIRED})
+unset(XalanC_XERCESC_REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XalanC

---

Summary of changes:
 Modules/FindXalanC.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

Re: [CMake] XCode Generation Issue

2016-01-19 Thread David Morsberger

Any help would be appreciated. In particular I’d like to know how the default compiler arguments are set when ‘cmake -G Xcode’ is executed. The attached file contains the cmake test compile extracted and reformatted from CMakeOutput.log that should have failed. Again, what is setting all the clang compiler options when this is executed?
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 \
 -x \
 c \
 -arch \
 x86_64 \
 -fmessage-length=0 \
 -fdiagnostics-show-note-include-stack \
 -fmacro-backtrace-limit=0 \
 -Wno-trigraphs \
 -fpascal-strings \
 -O0 \
 -Wno-missing-field-initializers \
 -Wno-missing-prototypes \
 -Wno-return-type \
 -Wno-missing-braces \
 -Wparentheses \
 -Wswitch \
 -Wno-unused-function \
 -Wno-unused-label \
 -Wno-unused-parameter \
 -Wno-unused-variable \
 -Wunused-value \
 -Wno-empty-body \
 -Wno-uninitialized \
 -Wno-unknown-pragmas \
 -Wno-shadow \
 -Wno-four-char-constants \
 -Wno-conversion \
 -Wno-constant-conversion \
 -Wno-int-conversion \
 -Wno-bool-conversion \
 -Wno-enum-conversion \
 -Wno-shorten-64-to-32 \
 -Wpointer-sign \
 -Wno-newline-eof \
 -DCMAKE_INTDIR=\"Debug\" \
 -isysroot \
 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
 \
 -fasm-blocks \
 -fstrict-aliasing \
 -Wdeprecated-declarations \
 -mmacosx-version-min=10.11 \
 -g \
 -Wno-sign-conversion \
 
-I/Users/user1/develop/wireshark-2.0/xcode_build/CMakeFiles/CMakeTmp/Debug/include
 \
 
-I/Users/user1/develop/wireshark-2.0/xcode_build/CMakeFiles/CMakeTmp/CMAKE_TRY_COMPILE.build/Debug/cmTC_3674d.build/DerivedSources/x86_64
 \
 
-I/Users/user1/develop/wireshark-2.0/xcode_build/CMakeFiles/CMakeTmp/CMAKE_TRY_COMPILE.build/Debug/cmTC_3674d.build/DerivedSources
 \
 -Wmost \
 -Wno-four-char-constants \
 -Wno-unknown-pragmas \
 -F/Users/user1/develop/wireshark-2.0/xcode_build/CMakeFiles/CMakeTmp/Debug \
 -Wall \
 -W \
 -Wextra \
 -Wendif-labels \
 -Wpointer-arith \
 -Warray-bounds \
 -Wformat-security \
 -fwrapv \
 -fno-strict-overflow \
 -Wvla \
 -Waddress \
 -Wattributes \
 -Wdiv-by-zero \
 -Wignored-qualifiers \
 -Wpragmas \
 -Wno-overlength-strings \
 -Wno-long-long \
 -Wheader-guard \
 -Wunused-const-variable \
 -Qunused-arguments \
 -Wc++-compat \
 -Wdeclaration-after-statement \
 -Wshadow \
 -Wno-pointer-sign \
 -Wold-style-definition \
 -Wstrict-prototypes \
 -Wshorten-64-to-32 \
 -fvisibility=hidden \
 -DWS_LD_FLAG_VALID0 \
 -Wl,--as-needed \
 -fPIE \
 -MMD \
 -MT \
 dependencies \
 -MF \
 /Users/user1/develop/src.d \
 --serialize-diagnostics \
 /Users/user1/develop/src.dia \
 -c \
 /Users/user1/develop/src.c \
 -o \
 /Users/user1/develop/src.o
All help is appreciatedOn Jan 18, 2016, at 2:58 PM, David Morsberger  wrote:I’m having an issue generating and using a XCode project using cmake -G.cmake —version    cmake version 3.4.1Xcode Version 7.2 (7C68)Mac OS 10.11.My CMakeLists.txt has a clang option that fails during the -G Xcode pass but fails when linking within XCode.The compiler / linker option is ‘-Wl,—as-needed’The test compile/link step in ‘cmake -G Xcode' creates a long clang command with arguments ‘-Wl,—as-needed’ plus ‘—serialize-diagnostics ’The link step within Xcode after the project created has the ‘-Wl,—as-needed’ argument and does not have the ‘—serialize-diagnostics ’ argument. The link fails because ‘-Wl,—as-needed’ isn’t supported.If copy and execute the long clang command from the ‘cmake -G Xcode’ command and remove the ‘—serialize-diagnostics ’ then it successfully fails with ‘-Wl, —as-needed’ isn’t supported. Finally, when I use cmake to generate unix makefiles it works meaning cmake determines ‘-Wl—as-needed’ isn’t supported and doesn’t add it to the argument list.Questions: - Where is the ‘—serialized-diagnostics’ argument coming from when executing ‘cmake -G Xcode’? - What is a .dia file and how do I read it? - What’s the preferred / recommended way of detecting the non-supported ‘-Wl,—as-needed’ argument during the ‘cmake -G Xcode’ phase? One option might to be to remove the ‘—serialize-diagnostics’ argument during the generation phase.I can provide more details on request.David-- 

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] Internal error bug in v3.4.2.

2016-01-19 Thread Gonzalo

I compiled v3.4.2 and after installing it in /usr/local, I tried running 
it in a project that was working fine with cmake 2.8.  I removed 
cmake2.8 from my computer.


I get:

-- Buildir 
/media/Linux/code/applications/mrViewer/BUILD/Linux-3.16.0-57-generic-64/Release


cd 
/media/Linux/code/applications/mrViewer/BUILD/Linux-3.16.0-57-generic-64/Release/tmp




cmake ../../../.. -DCMAKE_INSTALL_PREFIX=/usr/local 
-DEXECUTABLE_OUTPUT_PATH=/media/Linux/code/applications/mrViewer/BUILD/Linux-3.16.0-57-generic-64/Release/bin
 
-DLIBRARY_OUTPUT_PATH=/media/Linux/code/applications/mrViewer/BUILD/Linux-3.16.0-57-generic-64/Release/lib
 
-DCMAKE_LIBRARY_PATH=/media/Linux/code/applications/mrViewer/BUILD/Linux-3.16.0-57-generic-64/Release/lib
 -DCMAKE_NATIVE_ARCH=64 -DCMAKE_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release 
-DCMAKE_CFG_INTDIR=/Release -G 'Ninja'



BOOST LIBRARY DIR: /usr/lib

-- Looking for XOpenDisplay in 
/usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so
-- Looking for XOpenDisplay in 
/usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so - found
-- Looking for gethostbyname
-- Looking for gethostbyname - found
-- Looking for connect
-- Looking for connect - found
-- Looking for remove
-- Looking for remove - found
-- Looking for shmat
-- Looking for shmat - found
-- Looking for IceConnectionNumber in ICE
-- Looking for IceConnectionNumber in ICE - found
-- Found X11: /usr/lib/x86_64-linux-gnu/libX11.so

BOOST LIBRARY DIR: /usr/lib

FLTK2_INCLUDE_DIR/usr/local/include/usr/local/include
-- 
SEARCH=/usr/local/bin/../lib;/usr/local/include/lib/x64/Release;/usr/local/include/lib/x64/Debug;/usr/lib;/usr/local/lib;/usr/local/fltk2/lib;/usr/X11R6/lib;/usr/local/include/lib/
FLTK2 
LIBS=/usr/local/lib/libfltk2_images.so/usr/local/lib/libfltk2_gl.so-ljpeg-lz/usr/local/lib/libfltk2.so/usr/lib/x86_64-linux-gnu/libSM.so/usr/lib/x86_64-linux-gnu/libICE.so/usr/lib/x86_64-linux-gnu/libX11.so/usr/lib/x86_64-linux-gnu/libXext.so-lm
-- MAGICK: /VisualMagick/lib
IlmImf=/usr/local/lib/libIlmImf-2_2.so
/lib/x64/Release/lib/Win32/Release/lib/Release/lib/x64/Debug/lib/Debug/lib/lib/x64/Release/lib/Win32/Release/lib/Release/lib/x64/Debug/lib/Debug/lib/usr/local/lib64/usr/lib64
SEARCH 
DIRS=/bin/static/lib/libavcodec/libavdevice/libavfilter/libavformat/libavutil/libpostproc/libswscale/usr/local/lib64
-- FFMPEG_INCLUDE_DIR=/usr/local/include
-- FFMPEG_avutil_LIBRARY=/usr/local/lib/libavutil.so
-- FFMPEG_avformat_LIBRARY=/usr/local/lib/libavformat.so
-- FFMPEG_avcodec_LIBRARY=/usr/local/lib/libavcodec.so
-- FFMPEG_avdevice_LIBRARY=/usr/local/lib/libavdevice.so
-- FFMPEG_swscale_LIBRARY=/usr/local/lib/libswscale.so
-- FFMPEG_swresample_LIBRARY=/usr/local/lib/libswresample.so
-- GLEW ROOT=
-- LIBINTL was not found.
SampleICC_INCLUDE_DIR= /usr/local/include/SampleICC
SEARCH_INCLUDE_PATHS=  
/IccProfLib;/SampleICC;/include/IccProfLib;/include/SampleICC;/include;/usr/include/w32api;/usr/X11R6/include;/usr/include/X11;/usr/pkg/include;/opt/csw/include;/opt/include;/usr/openwin/include;/usr/local/include/SampleICC;/usr/include/SampleICC
SEARCH_PATHS=  /usr/local/lib64;/opt/local/lib64;/opt/lib64;/usr/lib64
-- Found SampleICC: /usr/local/lib64/libSampleICC.so
-- -
-- Summary for mrViewer:
-- -
-- FLTK2: YES
-- OpenEXR:   YES
-- ImageMagick:   YES 6.9.3
-- ffmpeg:YES
-- Boost: YES
-- TCLAP: YES
-- CTL:   YES
-- libintl:   NO
-- TinyXML2:  YES
-- GLUT INCLUDE DIR=/usr/include
-- GLUT 
LIBRARIES=/usr/lib/x86_64-linux-gnu/libglut.so;/usr/lib/x86_64-linux-gnu/libXmu.so;/usr/lib/x86_64-linux-gnu/libXi.so
-- FLTK2 INCLUDE DIR=/usr/local/include
-- FLTK2 
LIBRARIES=/usr/local/lib/libfltk2_images.so;/usr/local/lib/libfltk2_gl.so;-ljpeg;-lz;/usr/local/lib/libfltk2.so;/usr/lib/x86_64-linux-gnu/libSM.so;/usr/lib/x86_64-linux-gnu/libICE.so;/usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so;-lm
-- ImageMagick   include: /usr/local/include/ImageMagick-6
-- ImageMagick   library: /usr/local/lib
-- ImageMagick++ include: /usr/local/include/ImageMagick-6
-- ImageMagick++ library: /usr/local/lib
-- ImageMagick++ libs:
/usr/local/lib/libMagick++-6.Q32HDRI.so;/usr/local/lib/libMagickWand-6.Q32HDRI.so;/usr/local/lib/libMagickCore-6.Q32HDRI.so
-- OpenEXR include:   /usr/local/include/OpenEXR
-- OpenEXR library:   /usr/local/lib
-- OpenEXR libs:  
/usr/local/lib/libIlmImfUtil-2_2.so;/usr/local/lib/libIlmImf-2_2.so;/usr/local/lib/libImath-2_2.so;/usr/local/lib/libHalf.so;/usr/local/lib/libIexMath-2_2.so;/usr/local/lib/libIex-2_2.so;/usr/local/lib/libIlmThread-2_2.so
-- FLTK2 include: /usr/local/include
-- FLTK2 library: /usr/local/lib
-- FLTK2 libs:

Re: [CMake] XCode Generation Issue

2016-01-19 Thread Eric Wing

On 1/19/16, David Morsberger  wrote:
> Any help would be appreciated.
>
> In particular I’d like to know how the default compiler arguments are set
> when ‘cmake -G Xcode’ is executed. The attached file contains the cmake test
> compile extracted and reformatted from CMakeOutput.log that should have
> failed. Again, what is setting all the clang compiler options when this is
> executed?
>
>
>
> All help is appreciated
>
>> On Jan 18, 2016, at 2:58 PM, David Morsberger 
>> wrote:
>>
>> I’m having an issue generating and using a XCode project using cmake -G.
>>
>> cmake —version
>> cmake version 3.4.1
>>
>> Xcode Version 7.2 (7C68)
>>
>> Mac OS 10.11.
>>
>>
>> My CMakeLists.txt has a clang option that fails during the -G Xcode pass
>> but fails when linking within XCode.
>>
>> The compiler / linker option is ‘-Wl,—as-needed’
>>
>> The test compile/link step in ‘cmake -G Xcode' creates a long clang
>> command with arguments ‘-Wl,—as-needed’ plus ‘—serialize-diagnostics > to .dia file>’
>>
>> The link step within Xcode after the project created has the
>> ‘-Wl,—as-needed’ argument and does not have the ‘—serialize-diagnostics
>> ’ argument. The link fails because ‘-Wl,—as-needed’
>> isn’t supported.
>>
>> If copy and execute the long clang command from the ‘cmake -G Xcode’
>> command and remove the ‘—serialize-diagnostics ’ then
>> it successfully fails with ‘-Wl, —as-needed’ isn’t supported.
>>
>> Finally, when I use cmake to generate unix makefiles it works meaning
>> cmake determines ‘-Wl—as-needed’ isn’t supported and doesn’t add it to the
>> argument list.
>>
>> Questions:
>>  - Where is the ‘—serialized-diagnostics’ argument coming from when
>> executing ‘cmake -G Xcode’?
>>
>>  - What is a .dia file and how do I read it?
>>
>>  - What’s the preferred / recommended way of detecting the non-supported
>> ‘-Wl,—as-needed’ argument during the ‘cmake -G Xcode’ phase? One option
>> might to be to remove the ‘—serialize-diagnostics’ argument during the
>> generation phase.
>>
>> I can provide more details on request.
>>
>> David
>>
>>
>>


I just spot checked one of my Xcode compile logs. I see the
—serialize-diagnostics flag, but I don't have —as-needed anywhere.
Maybe one of your CMake scripts is adding that in, or you have set
some kind of environment variable that clang or Xcode is picking up?
(This recently happened to me on Linux.)
-- 

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-developers] [PATCH] Fix args handling in cmake -E time

2016-01-19 Thread Andrey Pokrovskiy

>From 7b01d1aed22b16fd81c3ae47dd51311e9a15187a Mon Sep 17 00:00:00 2001
From: wonder-mice 
Date: Tue, 19 Jan 2016 18:13:10 -0800
Subject: [PATCH] Fix args handling in cmake -E time

Previous implementation had two issues:
* Quotes in arguments where not escaped
* No special treatment for arguments with spaces

Because of that, following command line:
  cmake -E time cmake "-GUnix Makefile"
was interpreted as
  cmake -E time cmake "-GUnix" "Makefile"
Proposed patch fixes that by escaping all quotes in arguments and
wrapping all arguments in quotes before concatenating them.
---
 Source/cmAlgorithms.h | 2 +-
 Source/cmcmd.cxx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index ef607d2..5b76429 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -230,7 +230,7 @@ template
 std::string cmJoin(Range const& r, std::string delimiter)
 {
   return cmJoin(r, delimiter.c_str());
-};
+}

 template
 typename Range::const_iterator cmRemoveN(Range& r, size_t n)
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index fb7b1f5..5643cb9 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -555,7 +555,7 @@ int
cmcmd::ExecuteCMakeCommand(std::vector& args)
 // Clock command
 else if (args[1] == "time" && args.size() > 2)
   {
-  std::string command = cmJoin(cmMakeRange(args).advance(2), " ");
+  std::string command = cmWrap('"', cmMakeRange(args).advance(2),
'"', " ");

   clock_t clock_start, clock_finish;
   time_t time_start, time_finish;
-- 
2.5.4 (Apple Git-61)


0001-Fix-args-handling-in-cmake-E-time.patch
Description: Binary data
-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, master, updated. v3.4.2-859-g15fe480

2016-01-19 Thread 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  15fe480bf06f5ab5aae5641d2ebe6ca368099450 (commit)
  from  c13ed964012bcdf3765ada195db66930d6a0fcf9 (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=15fe480bf06f5ab5aae5641d2ebe6ca368099450
commit 15fe480bf06f5ab5aae5641d2ebe6ca368099450
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Jan 20 00:01:12 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jan 20 00:01:12 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b38f6eb..1c3bcf7 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 4)
-set(CMake_VERSION_PATCH 20160119)
+set(CMake_VERSION_PATCH 20160120)
 #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

Re: [CMake] [ANNOUNCE] CMake 3.4.2 available for download

2016-01-19 Thread Andrew Maclean

Works well, although I did find that I had to update my Windows SDK
to 10.0.10586.0 when using Visual Studio 2015 on Windows 10. This is
because CMake detected the system as Windows - 10.0.10586 - AMD64.

This was not the case with the previous version of CMake (3.4.1).

Andrew



> -- Forwarded message --
> From: Robert Maynard 
> To: CMake MailingList 
> Cc:
> Date: Tue, 19 Jan 2016 15:14:31 -0500
> Subject: [CMake] [ANNOUNCE] CMake 3.4.2 available for download
> We are pleased to announce that CMake 3.4.2 is now available for download.
>
> Please use the latest release from our download page:
>   https://cmake.org/download/
>
> Thanks for your support!
>
> -
> Changes in 3.4.2 since 3.4.1:
>
> Brad King (6):
> CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
> VS: Do not select a partial Windows 10 SDK folder (#15831)
> VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation
> (#15894)
> cmSystemTools: Add VersionCompareEqual helper
> VS: Fix Windows 10 SDK version selection (#15831)
> CMake 3.4.2
>
> Marc Chevrier (2):
> FindJava: Fix typos in IdlJ and JarSigner component implementation
> AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW
>
>
>
>
> --
>
> 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
>



-- 
___
Andrew J. P. Maclean

___
-- 

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

Re: [CMake] add_custom_command scope

2016-01-19 Thread Hendrik Sattler



Am 19. Januar 2016 12:30:39 MEZ, schrieb Lars :
> Hello,
> 
>Using CMake 3.3 and VS2012.
> 
>The below cmake scripts generate "Policy CMP0040 is not set: The target
>in the TARGET signature of add_custom_command must exists". Why cannot
>the custom/CMakeLists.txt file see the target created in
>app/CMakeLists.txt ? Moving the ADD_CUSTOM_COMMAND to the
>app/CMakeLists.txt fixes the problem but I would like to keep them
>separate if possible.
> 
>PROJECT(TEST)
>ADD_DIRECTORY(app)
>ADD_DIRECTORY(custom)
> 
>The app CMakeLists.txt looks like this;
>ADD_EXECUTABLE(app main.cpp)
>TARGET_LINK_LIBRARIES(app)
> 
>The custom CMakeLists.txt looks like this;
>ADD_CUSTOM_COMMAND(
>  TARGET app 
>  POST_BUILD
>  COMMAND tbd.exe)
> 
>Appreciate any input.

Make that its own custom target and let it depend on app target.

>Kind regards, Lars
> 
>
>

-- 

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-developers] [CMake 0015926]: FindCURL.cmake exposed variables are empty

2016-01-19 Thread Mantis Bug Tracker


The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=15926 
== 
Reported By:Lars Kühne
Assigned To:
== 
Project:CMake
Issue ID:   15926
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2016-01-19 08:52 EST
Last Modified:  2016-01-19 08:52 EST
== 
Summary:FindCURL.cmake exposed variables are empty
Description: 
The FindCURL.cmake module exposes variables CURL_INCLUDE_DIRS and
CURL_LIBRARIES, among others. These variables are empty, even though CURL_FOUND
is true. Internally, the FindCURL.cmake script uses CURL_INCLUDE_DIR and
CURL_LIBRARY variables. These are set correctly to the found locations on my
system. Using these instead of the variables documented in the reference and at
the beginning of the script works.

Steps to Reproduce: 
find_package(CURL REQUIRED)

message(CURL_FOUND)  # true on my system

message(${CURL_INCLUDE_DIRS})  # this fails
message(${CURL_LIBRARIES}) # this too

message(${CURL_INCLUDE_DIR})   # this works
message(${CURL_LIBRARY})   # this too
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2016-01-19 08:52 Lars Kühne New Issue
==

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, master, updated. v3.4.1-867-g249aac7

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  249aac71d0b0022031d16963f3b46f9860919104 (commit)
   via  aea1b03617bed037bbd12af36d7ef92feff0ba74 (commit)
   via  e5cbec14a5aec9203bd0e29fa0172fa00c97e521 (commit)
   via  0ca122fcb3df3331a6daaeec090bd967daa0f2b9 (commit)
  from  f8f531584716e732a8f0da44e285e996cb172574 (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=249aac71d0b0022031d16963f3b46f9860919104
commit 249aac71d0b0022031d16963f3b46f9860919104
Merge: f8f5315 aea1b03
Author: Brad King 
AuthorDate: Tue Jan 19 09:35:46 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 09:35:46 2016 -0500

Merge topic 'export-static-private-depend'

aea1b036 Fix export of STATIC library PRIVATE dependencies with CMP0022 NEW
e5cbec14 Tests: Use CMP0022 NEW behavior in some ExportImport cases
0ca122fc Tests: Isolate policy changes in ExportImport test


---

Summary of changes:
 Source/cmTargetLinkLibrariesCommand.cxx|7 +--
 Tests/ExportImport/Export/CMakeLists.txt   |   16 ++--
 Tests/ExportImport/Export/testLibDepends.c |7 ++-
 .../ExportImport/Export/testStaticLibRequiredPrivate.c |1 +
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 Tests/ExportImport/Export/testStaticLibRequiredPrivate.c


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.4.1-853-g2a73530

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  2a73530be91cd39c8aa534c9b924f16e79034bd2 (commit)
   via  09b2f1c3f5819a5a3ec03069e7c2811172ac3591 (commit)
  from  5079cc1243e3ffaea353c88a97b7d605c0807667 (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=2a73530be91cd39c8aa534c9b924f16e79034bd2
commit 2a73530be91cd39c8aa534c9b924f16e79034bd2
Merge: 5079cc1 09b2f1c
Author: Brad King 
AuthorDate: Tue Jan 19 09:35:30 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 09:35:30 2016 -0500

Merge topic 'windows-program-files'

09b2f1c3 Windows: Find Program Files directories more robustly from 
environment


---

Summary of changes:
 Modules/Platform/WindowsPaths.cmake |   52 +--
 1 file changed, 19 insertions(+), 33 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.4.1-855-gcaf4985

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  caf49853463a1ae7dec830cf82737c63b9625c3b (commit)
   via  3ec9226779776811240bde88a3f173c29aa935b5 (commit)
  from  2a73530be91cd39c8aa534c9b924f16e79034bd2 (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=caf49853463a1ae7dec830cf82737c63b9625c3b
commit caf49853463a1ae7dec830cf82737c63b9625c3b
Merge: 2a73530 3ec9226
Author: Brad King 
AuthorDate: Tue Jan 19 09:35:33 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 09:35:33 2016 -0500

Merge topic 'rpath-preserve-compiler-defined'

3ec92267 install: Do not remove compiler-defined RPATH entries


---

Summary of changes:
 Source/cmInstallTargetGenerator.cxx |   16 
 Source/cmSystemTools.cxx|   27 ++-
 2 files changed, 30 insertions(+), 13 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.4.1-861-g65146af

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  65146afc4e6b7fd9394e475e7d5e5ef9d0f10401 (commit)
   via  83d633919a75bde05acdf642ff79c5b310fce824 (commit)
  from  ceeea23323837bd3cd51f35dd339d4c6f9414c78 (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=65146afc4e6b7fd9394e475e7d5e5ef9d0f10401
commit 65146afc4e6b7fd9394e475e7d5e5ef9d0f10401
Merge: ceeea23 83d6339
Author: Brad King 
AuthorDate: Tue Jan 19 09:35:40 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 09:35:40 2016 -0500

Merge topic 'ExternalProject-git-clone-o'

83d63391 ExternalProject: Add option to set `git clone -o` argument


---

Summary of changes:
 Help/release/dev/ExternalProject-git-clone-o.rst |5 +
 Modules/ExternalProject.cmake|   23 --
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 Help/release/dev/ExternalProject-git-clone-o.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.4.1-863-gf8f5315

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  f8f531584716e732a8f0da44e285e996cb172574 (commit)
   via  8979a1070097fde3ca0ab45bdd6580b7acd07ca4 (commit)
  from  65146afc4e6b7fd9394e475e7d5e5ef9d0f10401 (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=f8f531584716e732a8f0da44e285e996cb172574
commit f8f531584716e732a8f0da44e285e996cb172574
Merge: 65146af 8979a10
Author: Brad King 
AuthorDate: Tue Jan 19 09:35:43 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 09:35:43 2016 -0500

Merge topic 'FindPkgConfig-fix-restore'

8979a107 FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment


---

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


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

[Cmake-commits] CMake branch, master, updated. v3.4.1-857-g790959a

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  790959aa9df923ae78ab5cb3c347a4413418273d (commit)
   via  6ccc307053f03c4c48a2cb9d5795f91d341a5c39 (commit)
  from  caf49853463a1ae7dec830cf82737c63b9625c3b (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=790959aa9df923ae78ab5cb3c347a4413418273d
commit 790959aa9df923ae78ab5cb3c347a4413418273d
Merge: caf4985 6ccc307
Author: Brad King 
AuthorDate: Tue Jan 19 09:35:35 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 09:35:35 2016 -0500

Merge topic 'FindCUDA-verbatim'

6ccc3070 FindCUDA: Support special characters in path (#15919)


---

Summary of changes:
 Modules/FindCUDA.cmake |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.4.1-2005-g29b8a5b

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  29b8a5bbf4460d565822bd6e46a8ea08d9ffb166 (commit)
   via  53511936e43c14f362b1e1ba069a77f5ba251ccc (commit)
  from  d78f9e3595c1b901670e9d57c9620e792c797470 (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=29b8a5bbf4460d565822bd6e46a8ea08d9ffb166
commit 29b8a5bbf4460d565822bd6e46a8ea08d9ffb166
Merge: d78f9e3 5351193
Author: Brad King 
AuthorDate: Tue Jan 19 09:39:39 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 09:39:39 2016 -0500

Merge topic 'FindPkgConfig-protect-semicolons' into next

53511936 FindPkgConfig: Quote ${_pkgconfig_path} to protect semicolons on 
Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53511936e43c14f362b1e1ba069a77f5ba251ccc
commit 53511936e43c14f362b1e1ba069a77f5ba251ccc
Author: Rob Gowin 
AuthorDate: Fri Jan 15 18:43:53 2016 -0600
Commit: Brad King 
CommitDate: Tue Jan 19 09:39:04 2016 -0500

FindPkgConfig: Quote ${_pkgconfig_path} to protect semicolons on Windows

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index f24d2da..177e7b8 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -238,8 +238,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent 
_no_cmake_path _no_cma
 if(NOT "${_extra_paths}" STREQUAL "")
   # Save the PKG_CONFIG_PATH environment variable, and add paths
   # from the CMAKE_PREFIX_PATH variables
-  set(_pkgconfig_path_old $ENV{PKG_CONFIG_PATH})
-  set(_pkgconfig_path ${_pkgconfig_path_old})
+  set(_pkgconfig_path_old "$ENV{PKG_CONFIG_PATH}")
+  set(_pkgconfig_path "${_pkgconfig_path_old}")
   if(NOT "${_pkgconfig_path}" STREQUAL "")
 file(TO_CMAKE_PATH "${_pkgconfig_path}" _pkgconfig_path)
   endif()
@@ -285,7 +285,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent 
_no_cmake_path _no_cma
   string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
   string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
 endif()
-set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path})
+set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path}")
   endif()
 
   # Unset variables
@@ -401,7 +401,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent 
_no_cmake_path _no_cma
 
 if(NOT "${_extra_paths}" STREQUAL "")
   # Restore the environment variable
-  set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path_old})
+  set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
 endif()
 
 unset(_extra_paths)

---

Summary of changes:
 Modules/FindPkgConfig.cmake |8 
 1 file 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.4.1-2003-gd78f9e3

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  d78f9e3595c1b901670e9d57c9620e792c797470 (commit)
   via  249aac71d0b0022031d16963f3b46f9860919104 (commit)
   via  f8f531584716e732a8f0da44e285e996cb172574 (commit)
   via  65146afc4e6b7fd9394e475e7d5e5ef9d0f10401 (commit)
   via  ceeea23323837bd3cd51f35dd339d4c6f9414c78 (commit)
   via  790959aa9df923ae78ab5cb3c347a4413418273d (commit)
   via  caf49853463a1ae7dec830cf82737c63b9625c3b (commit)
   via  2a73530be91cd39c8aa534c9b924f16e79034bd2 (commit)
   via  5079cc1243e3ffaea353c88a97b7d605c0807667 (commit)
   via  03c0303d2e4bc07b9c5df1ecdbf89da6e36259d9 (commit)
   via  27410a9c62f883f3bada885b0ef6cdb343ea40b5 (commit)
   via  66942a764cd7692921080247e184b26d43140e54 (commit)
  from  ba8912559febcc1614558d2fb08ec802aa6602f4 (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=d78f9e3595c1b901670e9d57c9620e792c797470
commit d78f9e3595c1b901670e9d57c9620e792c797470
Merge: ba89125 249aac7
Author: Brad King 
AuthorDate: Tue Jan 19 09:35:59 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 09:35:59 2016 -0500

Merge branch 'master' into next


---

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


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

[Cmake-commits] CMake branch, next, updated. v3.4.1-2007-g5c0d5f0

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  5c0d5f06d4e3a021abf17b2469ef7f7e0103b2fd (commit)
   via  77cd74a3ea964fa390d85c371902387e9ffc4a92 (commit)
  from  29b8a5bbf4460d565822bd6e46a8ea08d9ffb166 (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=5c0d5f06d4e3a021abf17b2469ef7f7e0103b2fd
commit 5c0d5f06d4e3a021abf17b2469ef7f7e0103b2fd
Merge: 29b8a5b 77cd74a
Author: Brad King 
AuthorDate: Tue Jan 19 10:20:15 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 10:20:15 2016 -0500

Merge topic 'cache-parse-error-line-number' into next

77cd74a3 Print line number of cache parse errors (#11109)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77cd74a3ea964fa390d85c371902387e9ffc4a92
commit 77cd74a3ea964fa390d85c371902387e9ffc4a92
Author: Ashley Whetter 
AuthorDate: Sun Jan 17 22:09:30 2016 +
Commit: Brad King 
CommitDate: Tue Jan 19 10:19:42 2016 -0500

Print line number of cache parse errors (#11109)

Track the line number while parsing `CMakeCache.txt` files and include
it in a parse failure error message.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index ce8af55..7466c29 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -64,12 +64,14 @@ bool cmCacheManager::LoadCache(const std::string& path,
   const char *realbuffer;
   std::string buffer;
   std::string entryKey;
+  unsigned int lineno = 0;
   while(fin)
 {
 // Format is key:type=value
 std::string helpString;
 CacheEntry e;
 cmSystemTools::GetLineFromStream(fin, buffer);
+lineno++;
 realbuffer = buffer.c_str();
 while(*realbuffer != '0' &&
   (*realbuffer == ' ' ||
@@ -77,6 +79,7 @@ bool cmCacheManager::LoadCache(const std::string& path,
*realbuffer == '\r' ||
*realbuffer == '\n'))
   {
+  if (*realbuffer == '\n') lineno++;
   realbuffer++;
   }
 // skip blank lines and comment lines
@@ -96,6 +99,7 @@ bool cmCacheManager::LoadCache(const std::string& path,
 helpString += [2];
 }
   cmSystemTools::GetLineFromStream(fin, buffer);
+  lineno++;
   realbuffer = buffer.c_str();
   if(!fin)
 {
@@ -138,8 +142,10 @@ bool cmCacheManager::LoadCache(const std::string& path,
   }
 else
   {
-  cmSystemTools::Error("Parse error in cache file ", cacheFile.c_str(),
-   ". Offending entry: ", realbuffer);
+  std::ostringstream error;
+  error << "Parse error in cache file " << cacheFile;
+  error << " on line " << lineno << ". Offending entry: " << realbuffer;
+  cmSystemTools::Error(error.str().c_str());
   }
 }
   this->CacheMajorVersion = 0;
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index e77ba1f..8068973 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -33,6 +33,11 @@ run_cmake_command(build-bad-dir
 run_cmake_command(build-bad-generator
   ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-bad-generator)
 
+run_cmake_command(cache-bad-entry
+  ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-bad-entry/)
+run_cmake_command(cache-empty-entry
+  ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-empty-entry/)
+
 function(run_BuildDir)
   # Use a single build tree for a few tests without cleaning.
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/BuildDir-build)
diff --git a/Tests/RunCMake/CommandLine/cache-bad-entry-result.txt 
b/Tests/RunCMake/CommandLine/cache-bad-entry-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/cache-bad-entry-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/cache-bad-entry-stderr.txt 
b/Tests/RunCMake/CommandLine/cache-bad-entry-stderr.txt
new file mode 100644
index 000..150d2ca
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/cache-bad-entry-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: Parse error in cache file 
.*/Tests/RunCMake/CommandLine/cache-bad-entry/CMakeCache.txt on line 7. 
Offending entry: BAD ENTRY.*
diff --git a/Tests/RunCMake/CommandLine/cache-bad-entry/CMakeCache.txt 
b/Tests/RunCMake/CommandLine/cache-bad-entry/CMakeCache.txt
new file mode 100644
index 000..75cd7c2
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/cache-bad-entry/CMakeCache.txt
@@ -0,0 +1,10 @@
+# This is a comment
+
+// That was an empty line. This

[cmake-developers] [CMake 0015927]: Escape semicolon "; " in CMake/CTest variables?

2016-01-19 Thread Mantis Bug Tracker


The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=15927 
== 
Reported By:Gehua Yang
Assigned To:
== 
Project:CMake
Issue ID:   15927
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2016-01-19 10:07 EST
Last Modified:  2016-01-19 10:07 EST
== 
Summary:Escape semicolon ";" in CMake/CTest variables?
Description: 
My CMake-Controlled private build depends on a couple external libraries.  On
Windows, the build needs to find the dll  files of external libraries in order
to run the automated tests.   The solution I came up with is to add those
folders to the PATH environment variable for the build.  Here is what I did in
the CTest script (using CMake 3.4.1 for Windows):

SET(MYPATH
"$ENV{PATH}\;C:\\Gehua\\Code\\tbb\\tbb43_20150611oss\\bin\\intel64\\vc14")
# set any extra envionment variables here
#   a. TBB path is needed to run tests
#   b. Use the "true" command-line plink for git's ssh use.
SET (CTEST_ENVIRONMENT
  "GIT_SSH=c:\\Program Files (x86)\\PuTTY\\plink.exe"
  "PATH=${MYPATH}"
  )
MESSAGE(STATUS "env=${CTEST_ENVIRONMENT}")

Here is the output from running the build from the code above:

-- env=GIT_SSH=c:\Program Files
(x86)\PuTTY\plink.exe;PATH=C:\ProgramData\Oracle\Java\javapath;C:\Program
Files\Broadcom\Broadcom 802.11 Network Adapter;C:\Program Files (x86)\Intel\iCLS
Client\;C:\Program Files\Intel\iCLS
Client\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;%USERPROFILE%\.dnx\bin;C:\Program
Files (x86)\Skype\Phone\;C:\Program Files\IDM Computer
Solutions\UltraCompare;C:\Program Files\IDM Computer
Solutions\UltraFinder\\;C:\Gehua\Code\tbb\tbb43_20150611oss\bin\intel64\vc14


But this change does NOT work for the tests.  The tests failed without
execution.  I suspected that it still did not find the depending dll files.  So
I added the following code in a simple test file:

  std::cout << "env PATH=" << getenv ("PATH") << '\n';
  std::cout << "env GIT_SSH=" << getenv ("GIT_SSH") << '\n';

The output is :

env PATH=C:\ProgramData\Oracle\Java\javapath
env GIT_SSH=c:\Program Files (x86)\PuTTY\plink.exe


As one can see, The PATH variable content was truncated at the semicolon mark
(";").  It is not surprising outcome as CMake use semicolon as delimiter of list
elements.  But in this particular case,  I am seeking for a way to escape the
semicolons so that CMake/CTest treats it as an integral part of the string.  Is
there a way to do it? 

Steps to Reproduce: 
SET(MYPATH
"$ENV{PATH}\;C:\\Gehua\\Code\\tbb\\tbb43_20150611oss\\bin\\intel64\\vc14")
# set any extra envionment variables here
#   a. TBB path is needed to run tests
#   b. Use the "true" command-line plink for git's ssh use.
SET (CTEST_ENVIRONMENT
  "GIT_SSH=c:\\Program Files (x86)\\PuTTY\\plink.exe"
  "PATH=${MYPATH}"
  )
MESSAGE(STATUS "env=${CTEST_ENVIRONMENT}")


But the result is:
PATH=C:\ProgramData\Oracle\Java\javapath
GIT_SSH=c:\Program Files (x86)\PuTTY\plink.exe
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2016-01-19 10:07 Gehua Yang New Issue
==

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.4.1-2019-gf1bbd97

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  f1bbd9719009f15afdbcf2a62c10c7779d5c1ace (commit)
   via  9696b5a2b71ca240b36a5ed7a7054b6bea677785 (commit)
  from  867a79a332bd3bf9c48e3a713962ead9d96d04c2 (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=f1bbd9719009f15afdbcf2a62c10c7779d5c1ace
commit f1bbd9719009f15afdbcf2a62c10c7779d5c1ace
Merge: 867a79a 9696b5a
Author: Brad King 
AuthorDate: Tue Jan 19 11:16:40 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 11:16:40 2016 -0500

Merge topic 'xalanc' into next

9696b5a2 fixup! FindXalanC: New module to find the Apache Xalan-C++ library


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9696b5a2b71ca240b36a5ed7a7054b6bea677785
commit 9696b5a2b71ca240b36a5ed7a7054b6bea677785
Author: Brad King 
AuthorDate: Tue Jan 19 11:13:09 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 11:14:37 2016 -0500

fixup! FindXalanC: New module to find the Apache Xalan-C++ library

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index c9219d5..10f05df 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -213,6 +213,7 @@ All Modules
/module/FindwxWidgets
/module/FindwxWindows
/module/FindXCTest
+   /module/FindXalanC
/module/FindXercesC
/module/FindX11
/module/FindXMLRPC
diff --git a/Help/module/FindXalanC.rst b/Help/module/FindXalanC.rst
new file mode 100644
index 000..b99d212
--- /dev/null
+++ b/Help/module/FindXalanC.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/FindXalanC.cmake

---

Summary of changes:
 Help/manual/cmake-modules.7.rst |1 +
 Help/module/FindXalanC.rst  |1 +
 2 files changed, 2 insertions(+)
 create mode 100644 Help/module/FindXalanC.rst


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

Re: [cmake-developers] [PATCH] Now prints warning when --build is not honored

On 01/17/2016 11:35 AM, Ashley Whetter wrote:
> As per issue 12641, this patch means that a warning is given when the 
> "--build"
> option is ignored.

Thanks for working on this.

> I'm not sure if you'd want a different error message here.

Ideally all unused arguments would get a warning but that will take significant
refactoring of how arguments are stored and passed around internally.

> I feel like it might be better to print something about the fact that 
> "--build"
> should be used after the binary tree has been generated,
> but I can't think of a good way to word it.

How about:

  Ignoring option '--build' because it is meant to be used only
  to drive an already-generated project build system.

?

Please also add a test somewhere in Tests/RunCMake for this.

Thanks,
-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [CMAKE][PATCH] fix create_javah on Windows

On 01/19/2016 03:58 AM, CHEVRIER, Marc wrote:
> Attached is a patch fixing erroneous handling of CLASSPATH
> Update tests accordingly.

Thanks, applied:

 UseJava: Fix create_javah CLASSPATH handling on Windows
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18c3714f

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [PATCH] Added FILTER subcommand to list command

On 01/16/2016 12:10 PM, Ashley Whetter wrote:
> In response to issue 0003986, I've implemented a FILTER subcommand to the 
> "list"
> command that filters a list using a regular expression.

Nice work.  The change looks good except I'd like to bikeshed the name
of the option.  This is the first list() API that will use a regular
expression as an argument, so I think "REGEX" should appear in the
name, e.g. "FILTER_REGEX".  Also the name should clarify whether the
filter result includes or excludes the matches.  Perhaps

 list(FILTER_REGEX_INCLUDE  )

?  Alternatively the name could still be "FILTER" and there could
be named arguments to control the rest of the details.  I have no
preference but would welcome other opinions.

Thanks,
-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, master, updated. v3.4.1-869-ge4a135d

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  e4a135dc446475b01a2c4d60dac0d8c5c8078590 (commit)
   via  8ce5ff8d9e411d7d27176881b98bf733da90791f (commit)
  from  249aac71d0b0022031d16963f3b46f9860919104 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.4.1-2012-g7ebea33a

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  7ebea33aa830e776fad129f2b238d0777abd626a (commit)
   via  e4a135dc446475b01a2c4d60dac0d8c5c8078590 (commit)
   via  8ce5ff8d9e411d7d27176881b98bf733da90791f (commit)
  from  ab20512b3440a17f47ea559d2df200b1bfd8a13e (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=7ebea33aa830e776fad129f2b238d0777abd626a
commit 7ebea33aa830e776fad129f2b238d0777abd626a
Merge: ab20512 e4a135d
Author: Brad King 
AuthorDate: Tue Jan 19 10:46:47 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 10:46:47 2016 -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

Re: [cmake-developers] [PATCH] Now prints line number of cache parse error

On 01/17/2016 05:09 PM, Ashley Whetter wrote:
> To fix issue 11109, this patch implements the printing of the line number of 
> the
> CMakeCache.txt file that causes a parse error when an error occurs.

Thanks!  Applied with minor fix to the test suite:

 Print line number of cache parse errors (#11109)
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77cd74a3

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] Adding Swift support to CMake for Linux/Makefiles

On 01/18/2016 01:51 PM, Eric Wing wrote:
> So the good news is I have a basic add_executable working with Swift
> on Linux via the Makefile generator.
> 
> It works with all Swift files, or intermixed C+Swift files. Bridging
> header is also supported.

Great!

> - I’m still copying over some CFLAGS to Swift_FLAGS. For example, I
> couldn’t figure out what was providing the ‘-I’ flag for include
> paths. Rules like this still need to be rewritten for Swift.

Try adding to CMakeSwiftInformation:

 set(CMAKE_INCLUDE_FLAG_Swift -I)

> - TODO: I need to look at Swift's DEFINE system.

Yes.  After we get things building correctly the first time then we'll
also need to see about adding needed dependencies to the build system.

> - Note: The new file is Linux-unknown-Swift.cmake. When I compile
> Swift myself, there is no company or organization identifier (swift
> --version) unlike the one Apple ships with Xcode, and CMake refers to
> the identifier as ‘unknown’. I made the file reflect this, but maybe
> we should rename this later (maybe Swift_org).

In an earlier Swift thread there was discussion about the name of the
compiler id and ``Apple`` was chosen because that is the vendor of
their version.  We definitely need to choose an id besides "unknown"
for this.  Perhaps ``SwiftOrg``?  Also, we need a good way to check
the id.  We could use `--version` if necessary but do we know whether
the language provides any kind of identifier for code to use for
conditional compilation?

> - To answer your question about whether ‘swift’ instead of ’swiftc’
> can be used for linking, I think the answer is yes, but I have been
> unable to figure out the correct incantation.

Okay.  Let's go with the ``c`` hack until we
know more.  I'd prefer not to have to expose a separate setting for
the link driver only to remove it later.

> - Swift Standard (or Core) Libraries: Swift comes with multiple
> standard libraries.
[snip]
> I think CMake should provide some variables to the full paths to
> these libraries since users like me will want to refer to them.

Perhaps, but we currently don't do that for any other languages.
We do provide CMAKE_{C,CXX,Fortran}_IMPLICIT_LINK_DIRECTORIES
listing directories that may contain the standard libraries.
This is the same as the information needed to use the C linker
to mix languages that we previously discussed trying to extract
for Swift.

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.4.1-2009-gab20512

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  ab20512b3440a17f47ea559d2df200b1bfd8a13e (commit)
   via  18c3714f4f4cf35f2b040d887850cb3607345e5d (commit)
  from  5c0d5f06d4e3a021abf17b2469ef7f7e0103b2fd (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=ab20512b3440a17f47ea559d2df200b1bfd8a13e
commit ab20512b3440a17f47ea559d2df200b1bfd8a13e
Merge: 5c0d5f0 18c3714
Author: Brad King 
AuthorDate: Tue Jan 19 10:38:05 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 10:38:05 2016 -0500

Merge topic 'java-updates' into next

18c3714f UseJava: Fix create_javah CLASSPATH handling on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18c3714f4f4cf35f2b040d887850cb3607345e5d
commit 18c3714f4f4cf35f2b040d887850cb3607345e5d
Author: Marc Chevrier 
AuthorDate: Tue Jan 19 09:52:04 2016 +0100
Commit: Brad King 
CommitDate: Tue Jan 19 10:36:11 2016 -0500

UseJava: Fix create_javah CLASSPATH handling on Windows

Preserve semicolons in the value.

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 6146d78..adaba02 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -1212,7 +1212,7 @@ function (create_javah)
 
 set (_output_files)
 if (WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
-  set(_classpath_sep ";")
+  set(_classpath_sep "$")
 else ()
   set(_classpath_sep ":")
 endif()
@@ -1242,7 +1242,7 @@ function (create_javah)
 endif()
   endforeach()
   string (REPLACE ";" "${_classpath_sep}" _classpath "${_classpath}")
-  list (APPEND _javah_options -classpath ${_classpath})
+  list (APPEND _javah_options -classpath "${_classpath}")
 endif()
 
 if (_create_javah_OUTPUT_DIR)
diff --git a/Tests/JavaJavah/C.cpp b/Tests/JavaJavah/C.cpp
new file mode 100644
index 000..ec75f42
--- /dev/null
+++ b/Tests/JavaJavah/C.cpp
@@ -0,0 +1,10 @@
+
+#include 
+#include 
+
+#include "C.h"
+
+JNIEXPORT void JNICALL Java_C_printName(JNIEnv *, jobject)
+{
+  printf("C\n");
+}
diff --git a/Tests/JavaJavah/C.java b/Tests/JavaJavah/C.java
new file mode 100644
index 000..54b1be2
--- /dev/null
+++ b/Tests/JavaJavah/C.java
@@ -0,0 +1,19 @@
+class C
+{
+  public C()
+{
+}
+
+public native void printName();
+
+static {
+try {
+
+System.loadLibrary("B");
+
+} catch (UnsatisfiedLinkError e) {
+System.err.println("Native code library failed to load.\n" + e);
+System.exit(1);
+}
+}
+}
diff --git a/Tests/JavaJavah/CMakeLists.txt b/Tests/JavaJavah/CMakeLists.txt
index 83b0ad0..071bf20 100644
--- a/Tests/JavaJavah/CMakeLists.txt
+++ b/Tests/JavaJavah/CMakeLists.txt
@@ -9,10 +9,13 @@ include (UseJava)
 # JNI support
 find_package(JNI)
 
-add_jar(hello3 B.java HelloWorld2.java)
-create_javah(TARGET B_javah CLASSES B CLASSPATH hello3)
+add_jar(B1 B.java)
+add_jar(C1 C.java)
+create_javah(TARGET B_javah CLASSES B C CLASSPATH B1 C1)
 
-add_library(B SHARED B.cpp)
+add_jar(hello3 HelloWorld2.java)
+
+add_library(B SHARED B.cpp C.cpp)
 add_dependencies(B B_javah)
 
 target_include_directories(B PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/Tests/JavaJavah/HelloWorld2.java b/Tests/JavaJavah/HelloWorld2.java
index faf7277..5ff710f 100644
--- a/Tests/JavaJavah/HelloWorld2.java
+++ b/Tests/JavaJavah/HelloWorld2.java
@@ -5,6 +5,11 @@ class HelloWorld2
 B b;
 b = new B();
 b.printName();
+
+C c;
+c = new C();
+c.printName();
+
 System.out.println("Hello World!");
 }
 }

---

Summary of changes:
 Modules/UseJava.cmake  |4 ++--
 Tests/JavaJavah/C.cpp  |   10 ++
 Tests/JavaJavah/{B.java => C.java} |4 ++--
 Tests/JavaJavah/CMakeLists.txt |9 ++---
 Tests/JavaJavah/HelloWorld2.java   |5 +
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 Tests/JavaJavah/C.cpp
 copy Tests/JavaJavah/{B.java => C.java} (93%)


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.4.1-2015-g6ed6ba6

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  6ed6ba600f7852c34d917dd8fcdff14992201352 (commit)
   via  be0031e0720e4e1a6ac7d2a8f77b27c7f6ab292a (commit)
   via  6506dcaa20a7d17737517dbcba6102be564d8d66 (commit)
  from  7ebea33aa830e776fad129f2b238d0777abd626a (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=6ed6ba600f7852c34d917dd8fcdff14992201352
commit 6ed6ba600f7852c34d917dd8fcdff14992201352
Merge: 7ebea33a be0031e
Author: Brad King 
AuthorDate: Tue Jan 19 10:48:59 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 10:48:59 2016 -0500

Merge topic 'test-release' into next

be0031e0 Merge branch 'release' into test-release
6506dcaa CMake 3.4.2


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be0031e0720e4e1a6ac7d2a8f77b27c7f6ab292a
commit be0031e0720e4e1a6ac7d2a8f77b27c7f6ab292a
Merge: e4a135d 6506dca
Author: Brad King 
AuthorDate: Tue Jan 19 10:48:46 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 10:48:46 2016 -0500

Merge branch 'release' into test-release


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6506dcaa20a7d17737517dbcba6102be564d8d66
commit 6506dcaa20a7d17737517dbcba6102be564d8d66
Author: Brad King 
AuthorDate: Tue Jan 19 10:47:26 2016 -0500
Commit: Brad King 
CommitDate: Tue Jan 19 10:47:26 2016 -0500

CMake 3.4.2

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 5717d37..4b3e7f7 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 4)
-set(CMake_VERSION_PATCH 1)
+set(CMake_VERSION_PATCH 2)
 #set(CMake_VERSION_RC 0)

---

Summary of changes:


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

Re: [cmake-developers] Access output from CheckCXXSourceRuns and CheckCSourceRuns

On 01/18/2016 01:32 PM, Harry Mallon wrote:
> https://github.com/Kitware/CMake/pull/209
> This passes through the output of the run (as well as the return value)
> so that users can access any output without using try_run.

Thanks.  The signature of the macro takes a variable for the return value
to be stored.  We need something similar to control the name of the variable
used to store the output.  This could either be done with an optional/named
argument or simply by documenting that the output will come in `_OUTPUT`.
We also need to define what happens when the check has already been run.
The normal `` result is cached to prevent repeat runs of the check.
I don't think we can reasonably cache the entire output of the run and
provide it on later re-runs of CMake when the check does not actually run.

OTOH your use case for extracting versions may have other solutions.
We generally try to avoid try_run because it only works when the toolchain
targets the host architecture and so does not work when cross compiling
in general.  Look at what Modules/CMakeDetermineCompilerId.cmake does to
extract the compiler id and version information.  It also leaves files
in build trees under CMakeFiles/${CMAKE_VERSION}/CompilerIdC that you
can see.  Basically it encodes the needed information in strings that
can be extracted from the binaries without running them.

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, release, updated. v3.4.1-12-g8ce5ff8

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  8ce5ff8d9e411d7d27176881b98bf733da90791f (commit)
   via  a57caf7eecdfe61e4ac5f63b145fc9269610f3f0 (commit)
   via  ad594de8cc9c4063830df58453b0679c209ff4d8 (commit)
   via  c173e37fa32b9d212cc6305f5e6dc881ba34e140 (commit)
  from  e1f9d3c0a01fa62eaf933142cb07308eba57acd9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
---

Summary of changes:
 Source/cmGlobalVisualStudio14Generator.cxx |   42 +---
 Source/cmSystemTools.cxx   |8 ++
 Source/cmSystemTools.h |2 ++
 3 files changed, 35 insertions(+), 17 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.4.1-2017-g867a79a

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  867a79a332bd3bf9c48e3a713962ead9d96d04c2 (commit)
   via  6100263329ac590e489f9454840be8ee71ef02fb (commit)
  from  6ed6ba600f7852c34d917dd8fcdff14992201352 (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=867a79a332bd3bf9c48e3a713962ead9d96d04c2
commit 867a79a332bd3bf9c48e3a713962ead9d96d04c2
Merge: 6ed6ba6 6100263
Author: Roger Leigh 
AuthorDate: Tue Jan 19 10:57:03 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 10:57:03 2016 -0500

Merge topic 'xalanc' into next

61002633 FindXalanC: New module to find the Apache Xalan-C++ library


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6100263329ac590e489f9454840be8ee71ef02fb
commit 6100263329ac590e489f9454840be8ee71ef02fb
Author: Roger Leigh 
AuthorDate: Tue Jan 19 13:32:38 2016 +
Commit: Roger Leigh 
CommitDate: Tue Jan 19 15:53:04 2016 +

FindXalanC: New module to find the Apache Xalan-C++ library

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
new file mode 100644
index 000..7599bd4
--- /dev/null
+++ b/Modules/FindXalanC.cmake
@@ -0,0 +1,150 @@
+#.rst:
+# FindXalanC
+# ---
+#
+# Find the Apache Xalan-C++ XSL transform processor headers and libraries.
+#
+# Imported targets
+# 
+#
+# This module defines the following :prop_tgt:`IMPORTED` targets:
+#
+# ``XalanC::XalanC``
+#   The Xalan-C++ ``xalan-c`` library, if found.
+#
+# Result variables
+# 
+#
+# This module will set the following variables in your project:
+#
+# ``XalanC_FOUND``
+#   true if the Xalan headers and libraries were found
+# ``XalanC_VERSION``
+#   Xalan release version
+# ``XalanC_INCLUDE_DIRS``
+#   the directory containing the Xalan headers; note
+#   ``XercesC_INCLUDE_DIRS`` is also required
+# ``XalanC_LIBRARIES``
+#   Xalan libraries to be linked; note ``XercesC_LIBRARIES`` is also
+#   required
+#
+# Cache variables
+# ^^^
+#
+# The following cache variables may also be set:
+#
+# ``XalanC_INCLUDE_DIR``
+#   the directory containing the Xalan headers
+# ``XalanC_LIBRARY``
+#   the Xalan library
+
+# Written by Roger Leigh 
+
+#=
+# Copyright 2016 University of Dundee
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+function(_XalanC_GET_VERSION  version_hdr)
+file(STRINGS ${version_hdr} _contents REGEX "^[ \t]*#define 
XALAN_VERSION_.*")
+if(_contents)
+string(REGEX REPLACE "[^*]*#define XALAN_VERSION_MAJOR[ 
\t]+([0-9]+).*" "\\1" XalanC_MAJOR "${_contents}")
+string(REGEX REPLACE "[^*]*#define XALAN_VERSION_MINOR[ 
\t]+([0-9]+).*" "\\1" XalanC_MINOR "${_contents}")
+string(REGEX REPLACE "[^*]*#define XALAN_VERSION_REVISION[ 
\t]+([0-9]+).*" "\\1" XalanC_PATCH "${_contents}")
+
+if(NOT XalanC_MAJOR MATCHES "^[0-9]+$")
+message(FATAL_ERROR "Version parsing failed for 
XALAN_VERSION_MAJOR!")
+endif()
+if(NOT XalanC_MINOR MATCHES "^[0-9]+$")
+message(FATAL_ERROR "Version parsing failed for 
XALAN_VERSION_MINOR!")
+endif()
+if(NOT XalanC_PATCH MATCHES "^[0-9]+$")
+message(FATAL_ERROR "Version parsing failed for 
XALAN_VERSION_REVISION!")
+endif()
+
+set(XalanC_VERSION "${XalanC_MAJOR}.${XalanC_MINOR}.${XalanC_PATCH}" 
PARENT_SCOPE)
+else()
+message(FATAL_ERROR "Include file ${version_hdr} does not exist or 
does not contain expected version information")
+endif()
+endfunction()
+
+# Find include directory
+find_path(XalanC_INCLUDE_DIR
+  NAMES "xalanc/XalanTransformer/XalanTransformer.hpp"
+  DOC "Xalan-C++ include directory")
+mark_as_advanced(XalanC_INCLUDE_DIR)
+
+if(XalanC_INCLUDE_DIR)
+  _XalanC_GET_VERSION("${XalanC_INCLUDE_DIR}/xalanc/Include/XalanVersion.hpp")
+endif()
+
+if(NOT XalanC_LIBRARY)
+  # Find all XalanC libraries
+  find_library(XalanC_LIBRARY_RELEASE
+   NAMES "Xalan-C" "xalan-c"
+

[Cmake-commits] CMake branch, next, updated. v3.4.1-2021-g4af8e76

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  4af8e762a976e3602c477d05275db3f7156e7a5f (commit)
   via  a11c0e7716d57fa7042632868d808b35d9372bb2 (commit)
  from  f1bbd9719009f15afdbcf2a62c10c7779d5c1ace (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=4af8e762a976e3602c477d05275db3f7156e7a5f
commit 4af8e762a976e3602c477d05275db3f7156e7a5f
Merge: f1bbd97 a11c0e7
Author: Roger Leigh 
AuthorDate: Tue Jan 19 11:38:01 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 19 11:38:01 2016 -0500

Merge topic 'xalanc' into next

a11c0e77 FindXalanC: Correct versioning for Windows DLLs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a11c0e7716d57fa7042632868d808b35d9372bb2
commit a11c0e7716d57fa7042632868d808b35d9372bb2
Author: Roger Leigh 
AuthorDate: Tue Jan 19 16:34:59 2016 +
Commit: Roger Leigh 
CommitDate: Tue Jan 19 16:37:39 2016 +

FindXalanC: Correct versioning for Windows DLLs

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index 7599bd4..58a68d8 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -71,6 +71,9 @@ function(_XalanC_GET_VERSION  version_hdr)
 endif()
 
 set(XalanC_VERSION "${XalanC_MAJOR}.${XalanC_MINOR}.${XalanC_PATCH}" 
PARENT_SCOPE)
+set(XalanC_VERSION_MAJOR "${XalanC_MAJOR}" PARENT_SCOPE)
+set(XalanC_VERSION_MINOR "${XalanC_MINOR}" PARENT_SCOPE)
+set(XalanC_VERSION_PATCH "${XalanC_PATCH}" PARENT_SCOPE)
 else()
 message(FATAL_ERROR "Include file ${version_hdr} does not exist or 
does not contain expected version information")
 endif()
@@ -90,19 +93,23 @@ if(NOT XalanC_LIBRARY)
   # Find all XalanC libraries
   find_library(XalanC_LIBRARY_RELEASE
NAMES "Xalan-C" "xalan-c"
- "Xalan-C_${XalanC_MAJOR}"
- "Xalan-C_${XalanC_MAJOR}_${XalanC_MINOR}"
+ "Xalan-C_${XalanC_VERSION_MAJOR}"
+ "Xalan-C_${XalanC_VERSION_MAJOR}_${XalanC_VERSION_MINOR}"
DOC "Xalan-C++ libraries (release)")
   find_library(XalanC_LIBRARY_DEBUG
NAMES "Xalan-CD" "xalan-cd"
- "Xalan-C_${XalanC_MAJOR}D"
- "Xalan-C_${XalanC_MAJOR}_${XalanC_MINOR}D"
+ "Xalan-C_${XalanC_VERSION_MAJOR}D"
+ "Xalan-C_${XalanC_VERSION_MAJOR}_${XalanC_VERSION_MINOR}D"
DOC "Xalan-C++ libraries (debug)")
   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
   select_library_configurations(XalanC)
   mark_as_advanced(XalanC_LIBRARY_RELEASE XalanC_LIBRARY_DEBUG)
 endif()
 
+unset(XalanC_VERSION_MAJOR)
+unset(XalanC_VERSION_MINOR)
+unset(XalanC_VERSION_PATCH)
+
 find_package(XercesC 3.0.0 REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)

---

Summary of changes:
 Modules/FindXalanC.cmake |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)


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

[cmake-developers] [patch] New find module FindXalanC

Merged into next from the staging branch "xalanc" for review and 
testing.  Includes a couple of unit tests to validate.  Since it depends 
on XercesC, I hope what I've done here for the imported and non-imported 
target cases is OK.


I've tested on Linux and Windows.


Regards,
Roger


--

Powered by www.kitware.com

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

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

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

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

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

[cmake-developers] [CMake 0015928]: FindwxWidgets Fails

2016-01-19 Thread Mantis Bug Tracker

The following issue has been SUBMITTED.
==
https://public.kitware.com/Bug/view.php?id=15928
==
Reported By:deaths_soul
Assigned To:
==
Project:CMake
Issue ID: 15928
Category: Modules
Reproducibility:always
Severity: minor
Priority: normal
Status: new
==
Date Submitted: 2016-01-19 11:47 EST
Last Modified: 2016-01-19 11:47 EST
==
Summary:FindwxWidgets Fails
Description:
When I try to use FindwxWidgets in CMake 3.4.1, I keep getting the following
error:
CMake Error at /usr/share/cmake/Modules/FindwxWidgets.cmake:870 (message):
wxWidgets wx/version.h file not found in

/home/User/Code/wxWidgets/win_build32/lib/wx/include/i686-w64-mingw32-msw-unicode-static-3.0;/home/User/Code/wxWidgets/include.

Even though the file exists and I've even made a symlink in the other location
to make sure. In either case, I get that error. However, if I downgrade to CMake
3.3.2, everything works as it should.

The full path to wx/version.h is /home/User/Code/wxWidgets/include/wx/version.h.

In CMakeCache.txt, the _filename variable is set as follows:
_filename:FILEPATH=_filename-NOTFOUND

It's set to this value in both the CMakeCache.txt for 3.3.2 and 3.4.1. In
testing, I even deleted the working directory and started from a clean slate and
the issue still occurred with 3.4.1.

This is under Fedora 23 and cross-compiling using MinGW. The wxWidgets library
is self-compiled.

CMAKE_FIND_ROOT_PATH is set to usr/x86_64-w64-mingw32/sys-root/mingw or
/usr/i686-w64-mingw32/sys-root/mingw depending on which architecture I'm
building for. I use a mixture of libraries from the repos and self-built,
though.

CMAKE_FIND_ROOT_PATH_MODE_INCLUDE is set to ONLY.

Manually passing -D_filename=/home/User/Code/wxWidgets/include/wx/version.h when
I run the CMake configuration fixes the issue.
==

Issue History
Date ModifiedUsername FieldChange
==
2016-01-19 11:47 deaths_soulNew Issue
==

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

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

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

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

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

Re: [cmake-developers] [patch] New find module FindXalanC


On 19/01/2016 16:50, Brad King wrote:

On 01/19/2016 11:39 AM, Roger Leigh wrote:

Merged into next from the staging branch "xalanc" for review and
testing.  Includes a couple of unit tests to validate.  Since it depends
on XercesC, I hope what I've done here for the imported and non-imported
target cases is OK.


Thanks.  Please also add a Help/release/dev/FindXalanC.rst release note
that mentions the new module.


Done.  I can add more detail if needed here.


I've updated one of our nightly testing machines to enable the new test
for this topic.


+find_package(XercesC 3.0.0 REQUIRED)

>

Please add a comment here justifying use of this particular version number.
Explain that/why it does not depend on the XalanC version requested.


I think this is an assumption leaking from my own usage of it. I've 
removed the version here.



+# ``XalanC_LIBRARIES``
+# Xalan libraries to be linked; note ``XercesC_LIBRARIES`` is also
+# required


Our convention is to include dependencies in reported values automatically.
See FindPNG for its use of ZLIB, for example.


OK, I've updated this to match.


Thanks,
Roger

--

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [patch] New find module FindXalanC

On 01/19/2016 11:39 AM, Roger Leigh wrote:
> Merged into next from the staging branch "xalanc" for review and 
> testing.  Includes a couple of unit tests to validate.  Since it depends 
> on XercesC, I hope what I've done here for the imported and non-imported 
> target cases is OK.

Thanks.  Please also add a Help/release/dev/FindXalanC.rst release note
that mentions the new module.

I've updated one of our nightly testing machines to enable the new test
for this topic.

> +find_package(XercesC 3.0.0 REQUIRED)

Please add a comment here justifying use of this particular version number.
Explain that/why it does not depend on the XalanC version requested.

> +# ``XalanC_LIBRARIES``
> +# Xalan libraries to be linked; note ``XercesC_LIBRARIES`` is also
> +# required

Our convention is to include dependencies in reported values automatically.
See FindPNG for its use of ZLIB, for example.

Thanks,
-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

[cmake-developers] [PATCH] FindALSA: Create an imported ALSA:ASound target

2016-01-19 Thread Sam Thursfield

Imported targets are now the recommended way of dealing with external
library dependencies.

The documentation for FindALSA is rewritten slightly.

This commit also adds a test case, you can run it like this:

cmake ... -DCMake_TEST_FindALSA=ON
ctest -R FindALSA --output-on-failure

The testcase requires the libasound library and headers to be installed.

This change is based on the equivalent changes to FindTIFF, found in
commit ebaca6290d2c0be7dec22452389632949a700d28.
---
 Modules/FindALSA.cmake | 51 --
 Tests/CMakeLists.txt   |  4 +++
 Tests/FindALSA/CMakeLists.txt  | 10 
 Tests/FindALSA/Test/CMakeLists.txt | 16 
 Tests/FindALSA/Test/main.c | 12 +
 5 files changed, 80 insertions(+), 13 deletions(-)
 create mode 100644 Tests/FindALSA/CMakeLists.txt
 create mode 100644 Tests/FindALSA/Test/CMakeLists.txt
 create mode 100644 Tests/FindALSA/Test/main.c

diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake
index 5c30eb9..7f98250 100644
--- a/Modules/FindALSA.cmake
+++ b/Modules/FindALSA.cmake
@@ -2,28 +2,42 @@
 # FindALSA
 # 
 #
-# Find alsa
+# Find the alsa libraries (asound).
 #
-# Find the alsa libraries (asound)
+# Imported targets
+# 
 #
-# ::
+# This module defines the following :prop_tgt:`IMPORTED` target:
 #
-#   This module defines the following variables:
-#  ALSA_FOUND   - True if ALSA_INCLUDE_DIR & ALSA_LIBRARY are found
-#  ALSA_LIBRARIES   - Set when ALSA_LIBRARY is found
-#  ALSA_INCLUDE_DIRS - Set when ALSA_INCLUDE_DIR is found
+# ``ALSA::ASound``
+#   The asound library, if found.
 #
+# Result variables
+# 
 #
+# This module will set the following variables in your project:
 #
-# ::
+# ``ALSA_FOUND``
+#   true if the ALSA headers and libraries were found
+# ``ALSA_INCLUDE_DIRS``
+#   the directory containing the ALSA headers
+# ``ALSA_LIBRARIES``
+#   ALSA libraries to be linked.
 #
-#  ALSA_INCLUDE_DIR - where to find asoundlib.h, etc.
-#  ALSA_LIBRARY - the asound library
-#  ALSA_VERSION_STRING - the version of alsa found (since CMake 2.8.8)
+# Cache variables
+# ^^^
+#
+# The following cache variables may also be set.
+#
+# ``ALSA_INCLUDE_DIR``
+#   the directory containing the ALSA headers
+# ``ALSA_LIBRARY``
+#   the path to the ALSA ASound library
 
 #=
 # Copyright 2009-2011 Kitware, Inc.
 # Copyright 2009-2011 Philip Lowman 
+# Copyright 2016 Raumfeld
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -58,8 +72,19 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALSA
   VERSION_VAR ALSA_VERSION_STRING)
 
 if(ALSA_FOUND)
-  set( ALSA_LIBRARIES ${ALSA_LIBRARY} )
-  set( ALSA_INCLUDE_DIRS ${ALSA_INCLUDE_DIR} )
+  set(ALSA_VERSION ${ALSA_VERSION_STRING})
+  set(ALSA_LIBRARIES ${ALSA_LIBRARY})
+  set(ALSA_INCLUDE_DIRS ${ALSA_INCLUDE_DIR})
+
+  if(NOT TARGET ALSA::ASound)
+add_library(ALSA::ASound UNKNOWN IMPORTED)
+set_target_properties(ALSA::ASound PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+  IMPORTED_LOCATION "${ALSA_LIBRARY}"
+  INTERFACE_INCLUDE_DIRECTORIES "${ALSA_INCLUDE_DIRS}"
+  INTERFACE_LIBRARIES "${ALSA_LIBRARY}"
+  )
+  endif()
 endif()
 
 mark_as_advanced(ALSA_INCLUDE_DIR ALSA_LIBRARY)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 043b757..26b0cee 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1355,6 +1355,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P 
${CMake_SOURCE_DIR}/Utilities/Release
 endif()
   endif()
 
+  if(CMake_TEST_FindALSA)
+add_subdirectory(FindALSA)
+  endif()
+
   if(CMake_TEST_FindBoost)
 add_subdirectory(FindBoost)
   endif()
diff --git a/Tests/FindALSA/CMakeLists.txt b/Tests/FindALSA/CMakeLists.txt
new file mode 100644
index 000..891f7a4
--- /dev/null
+++ b/Tests/FindALSA/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_test(NAME FindALSA.Test COMMAND
+  ${CMAKE_CTEST_COMMAND} -C $
+  --build-and-test
+  "${CMake_SOURCE_DIR}/Tests/FindALSA/Test"
+  "${CMake_BINARY_DIR}/Tests/FindALSA/Test"
+  ${build_generator_args}
+  --build-project TestFindALSA
+  --build-options ${build_options}
+  --test-command ${CMAKE_CTEST_COMMAND} -V -C $
+  )
diff --git a/Tests/FindALSA/Test/CMakeLists.txt 
b/Tests/FindALSA/Test/CMakeLists.txt
new file mode 100644
index 000..2dae457
--- /dev/null
+++ b/Tests/FindALSA/Test/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.4)
+project(TestFindALSA C)
+include(CTest)
+
+find_package(ALSA REQUIRED)
+
+add_definitions(-DCMAKE_ASOUNDLIB_EXPECTED_VERSION=\"${ALSA_VERSION}\")
+
+add_executable(test_tgt main.c)
+target_link_libraries(test_tgt ALSA::ASound)
+add_test(NAME test_tgt COMMAND test_tgt)
+
+add_executable(test_vars main.c)

Re: [cmake-developers] Access output from CheckCXXSourceRuns and CheckCSourceRuns

2016-01-19 Thread Harry Mallon

Inline responses.


Harry Mallon
CODEX | Software Engineer
60 Poland Street | London | England | W1F 7NT
E ha...@codexdigital.com | T +44 203 7000 989
> On 19 Jan 2016, at 15:42, Brad King  wrote:
>
> On 01/18/2016 01:32 PM, Harry Mallon wrote:
>> https://github.com/Kitware/CMake/pull/209
>> This passes through the output of the run (as well as the return value)
>> so that users can access any output without using try_run.
>
> Thanks.  The signature of the macro takes a variable for the return value
> to be stored.  We need something similar to control the name of the variable
> used to store the output.  This could either be done with an optional/named
> argument or simply by documenting that the output will come in `_OUTPUT`.

Sounds sensible

> We also need to define what happens when the check has already been run.
> The normal `` result is cached to prevent repeat runs of the check.
> I don't think we can reasonably cache the entire output of the run and
> provide it on later re-runs of CMake when the check does not actually run.

I agree, we shouldn't be caching all of that

> OTOH your use case for extracting versions may have other solutions.
> We generally try to avoid try_run because it only works when the toolchain
> targets the host architecture and so does not work when cross compiling
> in general.  Look at what Modules/CMakeDetermineCompilerId.cmake does to
> extract the compiler id and version information.  It also leaves files
> in build trees under CMakeFiles/${CMAKE_VERSION}/CompilerIdC that you
> can see.  Basically it encodes the needed information in strings that
> can be extracted from the binaries without running them.

I have read CMakeDetermineCompilerId.cmake but I can't see how I can use that 
kind of an approach. Having static const char* set by the preprocessor is a 
good idea for the reasons that you mention but I cannot retrieve a version 
number without linking and interrogating the library. I could be missing 
something though.

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-commits] CMake branch, next, updated. v3.4.1-2025-g9641548