date:20160331

Re: [CMake] Creating a list of link directories from a variable

2016-03-31 Thread Hendrik Sattler

Hi,

If the library is a shared object, try to NOT use all those libraries. If they 
are used in the library but are not part of its public API, you most likely 
don't need to link them. If you have no missing symbols when linking, you can 
avoid overlinking you program.

If this is a static library, you have a lot more work. For each library without 
-l, use find_library() and use the library dirs as hints. Do NOT use 
link_directories().

HS




Am 1. April 2016 00:22:09 MESZ, schrieb "Salazar De Troya, Miguel" 
:
>Hello
>
>I am trying to compile a program with a library that provides a bash
>script to generate the dependencies, libraries and the link directories
>for the Makefile. I want to generate a CMakeLists.txt that can handle
>these dependencies from that library. I have been able to come up with
>regexp that can extract the information and put it into a variable with
>the dirs or library names separated by comma, for instance:
>
>INCLUDE_DIRS =
>
>/g/g92/miguel/code/libmesh_2D/include;/usr/include/curl;/usr/include/glpk;/usr/local/tools/vtk-6.1.0/include/vtk-6.1;/g/g92/miguel/petsc-3.6.2/include;/g/g92/miguel/petsc-3.6.2/miguel-opt/include;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi/opal/mca/hwloc/hwloc191/hwloc/include;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi/opal/mca/event/libevent2021/libevent;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi/opal/mca/event/libevent2021/libevent/include;/usr/local/tools/openmpi-intel-1.8.4/include;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi;/usr/local/tools/boost-mpi-1.55.0//include
>
>
>LIBS =
>
>-lcurl;-lhdf5;-lglpk;-lvtkIOCore-6.1;-lvtkCommonCore-6.1;-lvtkCommonDataModel-6.1;-lvtkFiltersCore-6.1;-lvtkIOXML-6.1;-lvtkImagingCore-6.1;-lvtkIOImage-6.1;-lvtkImagingMath-6.1;-lz;-lpetsc;-lcmumps;-ldmumps;-lsmumps;-lzmumps;-lmumps_common;-lpord;-lscalapack;-lHYPRE;-lml;-llapack;-lblas;-lparmetis;-lmetis;-lX11;-lhwloc;-lssl;-lcrypto;-lmpi_usempif08;-lmpi_usempi_ignore_tkr;-lmpi_mpifh;-lifport;-lifcore;-lm;-lmpi;-limf;-lsvml;-lirng;-lipgo;-ldecimal;-lcilkrts;-lstdc++;-lgcc_s;-lirc;-lpthread;-lirc_s;-ldl;-lmesh_opt
>
>
>LIB_DIRS =
>
>/usr/lib;/lib;/usr/lib64;/usr/local/tools/vtk-6.1.0/lib;/g/g92/miguel/petsc-3.6.2/miguel-opt/lib;/usr/local/tools/openmpi-intel-1.8.4/lib;/usr/local/tools/ic-14.0.174/composer_xe_2013_sp1.3.174/compiler/lib/intel64;/usr/lib/gcc/x86_64-redhat-linux/4.4.7;/g/g92/miguel/code/libmesh_2D/lib
>
>
>These are variables in my environment that I use in CMake with
>$ENV{VAR}. How can I use this information for the commands:
>
>include_directories($ENV{INCLUDE_DIRS})
>
>link_directories($ENV{LIB_DIRS})
>
>target_link_libraries($ENV{LIBS}) ?
>
>
>It seems that cmake can digest the include directories and the
>target_link_libraries (because they appear correctly in the
>compilation), but not the link_directories. Why? Also, I’ve read that
>it is more correct to use find_library() instead. How would I iterate
>over the LIBS? Can I use a single LIB_DIRS (with all the information
>above) in the PATHS argument of find_library()
>
>
>Thanks
>
>Miguel
>
>
>
>
>-- 
>
>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
-- 

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] Creating a list of link directories from a variable

2016-03-31 Thread Salazar De Troya, Miguel

Hello

I am trying to compile a program with a library that provides a bash script to 
generate the dependencies, libraries and the link directories for the Makefile. 
I want to generate a CMakeLists.txt that can handle these dependencies from 
that library. I have been able to come up with regexp that can extract the 
information and put it into a variable with the dirs or library names separated 
by comma, for instance:

INCLUDE_DIRS =

/g/g92/miguel/code/libmesh_2D/include;/usr/include/curl;/usr/include/glpk;/usr/local/tools/vtk-6.1.0/include/vtk-6.1;/g/g92/miguel/petsc-3.6.2/include;/g/g92/miguel/petsc-3.6.2/miguel-opt/include;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi/opal/mca/hwloc/hwloc191/hwloc/include;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi/opal/mca/event/libevent2021/libevent;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi/opal/mca/event/libevent2021/libevent/include;/usr/local/tools/openmpi-intel-1.8.4/include;/usr/local/tools/openmpi-intel-1.8.4/include/openmpi;/usr/local/tools/boost-mpi-1.55.0//include


LIBS =

-lcurl;-lhdf5;-lglpk;-lvtkIOCore-6.1;-lvtkCommonCore-6.1;-lvtkCommonDataModel-6.1;-lvtkFiltersCore-6.1;-lvtkIOXML-6.1;-lvtkImagingCore-6.1;-lvtkIOImage-6.1;-lvtkImagingMath-6.1;-lz;-lpetsc;-lcmumps;-ldmumps;-lsmumps;-lzmumps;-lmumps_common;-lpord;-lscalapack;-lHYPRE;-lml;-llapack;-lblas;-lparmetis;-lmetis;-lX11;-lhwloc;-lssl;-lcrypto;-lmpi_usempif08;-lmpi_usempi_ignore_tkr;-lmpi_mpifh;-lifport;-lifcore;-lm;-lmpi;-limf;-lsvml;-lirng;-lipgo;-ldecimal;-lcilkrts;-lstdc++;-lgcc_s;-lirc;-lpthread;-lirc_s;-ldl;-lmesh_opt


LIB_DIRS =

/usr/lib;/lib;/usr/lib64;/usr/local/tools/vtk-6.1.0/lib;/g/g92/miguel/petsc-3.6.2/miguel-opt/lib;/usr/local/tools/openmpi-intel-1.8.4/lib;/usr/local/tools/ic-14.0.174/composer_xe_2013_sp1.3.174/compiler/lib/intel64;/usr/lib/gcc/x86_64-redhat-linux/4.4.7;/g/g92/miguel/code/libmesh_2D/lib


These are variables in my environment that I use in CMake with $ENV{VAR}. How 
can I use this information for the commands:

include_directories($ENV{INCLUDE_DIRS})

link_directories($ENV{LIB_DIRS})

target_link_libraries($ENV{LIBS}) ?


It seems that cmake can digest the include directories and the 
target_link_libraries (because they appear correctly in the compilation), but 
not the link_directories. Why? Also, I’ve read that it is more correct to use 
find_library() instead. How would I iterate over the LIBS? Can I use a single 
LIB_DIRS (with all the information above) in the PATHS argument of 
find_library()


Thanks

Miguel
-- 

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] CPackRPM not dealing correctly with symlinks

2016-03-31 Thread Domen Vrankar

> I just tried, it seems to do the trick. An example source setup that was 
> breaking the RPM building before, is now functioning seemingly correctly. The 
> produced RPM gets the symlink, pointing at the location outside of the 
> package.
>
> I would actually prefer if the code printed a warning in this case. 
> (Requesting a relocatable package, yet pointing at a fixed location outside 
> of the package.) As in our case it was definitely a mistake to include soft 
> links like this in our build. But if that's hard to add to the code, then so 
> be it.

I've added warning message to the patch.

Patch is now on next branch:
https://cmake.org/gitweb?p=cmake.git;a=commit;h=5e5d0ab

Thanks,
Domen


  https://www.avast.com/sig-email?utm_medium=email_source=link_campaign=sig-email_content=webmail_term=oa-2115-v2-b;
target="_blank">https://ipmcdn.avast.com/images/2016/icons/icon-envelope-tick-round-orange-v1.png;
/>
Virus-free. https://www.avast.com/sig-email?utm_medium=email_source=link_campaign=sig-email_content=webmail_term=oa-2115-v2-b;
target="_blank" style="color: #4453ea;">www.avast.com



-- 

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] Mixing up project language settings?

2016-03-31 Thread Nicholas Braden

If the new C++ components are built optionally, I would use
enable_language(CXX):
https://cmake.org/cmake/help/latest/command/enable_language.html

Otherwise, if the project will always need C++ support from now on,
amend the project() statement. In this case it doesn't matter whether
you add CXX or remove C, it is up to you aesthetically.

On Thu, Mar 31, 2016 at 2:38 PM, Fedja Jeleskovic  wrote:
> Hi there!
>
> I am adding few components to the existing cmake driven C project, but new
> components need C++ compiler instead. Top level CMakeLists.text starts with:
> project (appName C)
>
> The question is whether I need to change to top level settings and just
> include CXX (or just remove C part since they are both defaulted anyway)
> where my new components are, or the top level needs to be changed as well to
> reflects what will be used below.
>
> Thanks!
>
> --
>
> 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
-- 

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] Mixing up project language settings?

2016-03-31 Thread Fedja Jeleskovic

Hi there!

I am adding few components to the existing cmake driven C project, but new
components need C++ compiler instead. Top level CMakeLists.text starts with:
project (appName C)

The question is whether I need to change to top level settings and just
include CXX (or just remove C part since they are both defaulted anyway)
where my new components are, or the top level needs to be changed as well
to reflects what will be used below.

Thanks!
-- 

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 0016043]: Support natvis source file type in the MSVC Project Generator

2016-03-31 Thread Mantis Bug Tracker


The following issue has been SUBMITTED. 
== 
https://cmake.org/Bug/view.php?id=16043 
== 
Reported By:Zachary Turner
Assigned To:
== 
Project:CMake
Issue ID:   16043
Category:   CMake
Reproducibility:N/A
Severity:   feature
Priority:   normal
Status: new
== 
Date Submitted: 2016-03-31 15:12 EDT
Last Modified:  2016-03-31 15:12 EDT
== 
Summary:Support natvis source file type in the MSVC Project
Generator
Description: 
Starting with Visual Studio 14 2015, vcxproj files can contain references to
natvis files which enable custom debug visualizers for project specific types.

You specify these in the vcxproj file by including them in a  tag. 
Currently the MSVC project generator has no support for these.  Through some
hackery, it is still possible to get these files to appear in the vcxproj file
with a  tag, and testing shows that it will work as long as the file has a
.natvis extension, but a) this is undocumented / unsupported reliance on an
implementation detail, b) it doesn't work if your file does not have a .natvis
extension, and c) there could be some issues with doing this which we are
unaware of.

It would be nice if you could write some CMake code like this:

`set_source_files_properties(foo.natvis LANGUAGE natvis)`

and this would cause the vcxproj generator to use a  tag instead of a
 or  tag, and this seems to fit well within CMake's language /
generation model anyway.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2016-03-31 15:12 Zachary Turner New Issue
==

-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.5.1-755-g58a4efc

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  58a4efca93fa9255a920a0bfa0890d3858acf656 (commit)
   via  fae80ee2c347b87a65b80a3c8caa598c40680cc0 (commit)
  from  020831c09ae516560894f217dbef0719e9483870 (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=58a4efca93fa9255a920a0bfa0890d3858acf656
commit 58a4efca93fa9255a920a0bfa0890d3858acf656
Merge: 020831c fae80ee
Author: Brad King 
AuthorDate: Thu Mar 31 14:09:25 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 14:09:25 2016 -0400

Merge topic 'check-compiler-flag-clang-cl' into next

fae80ee2 Check*CompilerFlag: Add another pattern for Clang (#16038)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fae80ee2c347b87a65b80a3c8caa598c40680cc0
commit fae80ee2c347b87a65b80a3c8caa598c40680cc0
Author: Brad King 
AuthorDate: Thu Mar 31 08:50:48 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 14:09:07 2016 -0400

Check*CompilerFlag: Add another pattern for Clang (#16038)

Match a warning pattern produced by `clang-cl`.

Suggested-by: Reid Kleckner 

diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake 
b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index 07d8b1e..a350a84 100644
--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -24,6 +24,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
  FAIL_REGEX "[Uu]nrecogni[sz]ed .*option"   # GNU, NAG
  FAIL_REGEX "unknown .*option"  # Clang
  FAIL_REGEX "optimization flag .* not supported"# Clang
+ FAIL_REGEX "unknown argument ignored"  # Clang (cl)
  FAIL_REGEX "ignoring unknown option"   # MSVC, Intel
  FAIL_REGEX "warning D9002" # MSVC, any lang
  FAIL_REGEX "option.*not supported" # Intel

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-753-g020831c

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  020831c09ae516560894f217dbef0719e9483870 (commit)
   via  9cde37974b8fe09ddb77cedca90dd636f2ffe2db (commit)
  from  a9dac6c38a28da1012a0bc8f50ae9721726a37be (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=020831c09ae516560894f217dbef0719e9483870
commit 020831c09ae516560894f217dbef0719e9483870
Merge: a9dac6c 9cde379
Author: Brad King 
AuthorDate: Thu Mar 31 14:08:54 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 14:08:54 2016 -0400

Merge topic 'check-compiler-flag-clang-cl' into next

9cde3797 fixup! Check*CompilerFlag: Add another pattern for Clang (#16038)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cde37974b8fe09ddb77cedca90dd636f2ffe2db
commit 9cde37974b8fe09ddb77cedca90dd636f2ffe2db
Author: Brad King 
AuthorDate: Thu Mar 31 14:08:37 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 14:08:37 2016 -0400

fixup! Check*CompilerFlag: Add another pattern for Clang (#16038)

diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake 
b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index 6d3d839..a350a84 100644
--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -24,7 +24,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
  FAIL_REGEX "[Uu]nrecogni[sz]ed .*option"   # GNU, NAG
  FAIL_REGEX "unknown .*option"  # Clang
  FAIL_REGEX "optimization flag .* not supported"# Clang
- FAIL_REGEX "unknown argument ignored in clang-cl"  # Clang (cl)
+ FAIL_REGEX "unknown argument ignored"  # Clang (cl)
  FAIL_REGEX "ignoring unknown option"   # MSVC, Intel
  FAIL_REGEX "warning D9002" # MSVC, any lang
  FAIL_REGEX "option.*not supported" # Intel

---

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


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

[Cmake-commits] CMake branch, master, updated. v3.5.1-357-g600b309

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  600b3095771016a925dab8f1a4b47748508b9320 (commit)
   via  8f8a0bfbf5a0029430c98feeadc25ab973ff5e38 (commit)
   via  8fdb2c5a5da52bf74ccb33cbc7149cb33cb88a81 (commit)
  from  9c1da538d78d5e749996eec5582734b07ccc47af (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.5.1-4-g8f8a0bf

2016-03-31 Thread Brad King

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

The branch, release has been updated
   via  8f8a0bfbf5a0029430c98feeadc25ab973ff5e38 (commit)
   via  677c091b8140a0655f512b8283c5b120fbd0f99c (commit)
   via  8fdb2c5a5da52bf74ccb33cbc7149cb33cb88a81 (commit)
   via  a364d2513a3fac76cf12cf3db21b7e9600ac51a4 (commit)
  from  64130a7e793483e24c1d68bdd234f81d5edb2d51 (commit)

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

- Log -
---

Summary of changes:
 Modules/CMakeASM-ATTInformation.cmake   |2 +-
 Modules/CMakeASM_NASMInformation.cmake  |2 +-
 Modules/Compiler/ARMCC-ASM.cmake|2 +-
 Modules/FindXCTest.cmake|4 
 Modules/Platform/Generic-ADSP-ASM.cmake |2 +-
 Modules/Platform/gas.cmake  |2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-751-ga9dac6c

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  a9dac6c38a28da1012a0bc8f50ae9721726a37be (commit)
   via  600b3095771016a925dab8f1a4b47748508b9320 (commit)
   via  8f8a0bfbf5a0029430c98feeadc25ab973ff5e38 (commit)
   via  8fdb2c5a5da52bf74ccb33cbc7149cb33cb88a81 (commit)
  from  ffdc31df631d3d6abf535dacfc1e0ea516c67ad9 (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=a9dac6c38a28da1012a0bc8f50ae9721726a37be
commit a9dac6c38a28da1012a0bc8f50ae9721726a37be
Merge: ffdc31d 600b309
Author: Brad King 
AuthorDate: Thu Mar 31 13:25:25 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 13:25:25 2016 -0400

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, next, updated. v3.5.1-747-gffdc31d

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  ffdc31df631d3d6abf535dacfc1e0ea516c67ad9 (commit)
   via  9c1da538d78d5e749996eec5582734b07ccc47af (commit)
  from  464f1234387d038fcb34dcb04f44709170d9d013 (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=ffdc31df631d3d6abf535dacfc1e0ea516c67ad9
commit ffdc31df631d3d6abf535dacfc1e0ea516c67ad9
Merge: 464f123 9c1da53
Author: Brad King 
AuthorDate: Thu Mar 31 13:24:20 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 13:24:20 2016 -0400

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.5.1-354-g9c1da53

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  9c1da538d78d5e749996eec5582734b07ccc47af (commit)
   via  677c091b8140a0655f512b8283c5b120fbd0f99c (commit)
  from  0aa736e62545cee8e3ed6c39667705d31ce66b8c (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=9c1da538d78d5e749996eec5582734b07ccc47af
commit 9c1da538d78d5e749996eec5582734b07ccc47af
Merge: 0aa736e 677c091
Author: Brad King 
AuthorDate: Thu Mar 31 13:23:27 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 13:23:27 2016 -0400

Merge topic 'backport-asm-includes'

677c091b ASM: Add missing  placeholder for "compile" rules


---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-745-g464f123

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  464f1234387d038fcb34dcb04f44709170d9d013 (commit)
   via  677c091b8140a0655f512b8283c5b120fbd0f99c (commit)
  from  9301b3955a35f6e49eab20ff90b6a09d14b40306 (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=464f1234387d038fcb34dcb04f44709170d9d013
commit 464f1234387d038fcb34dcb04f44709170d9d013
Merge: 9301b39 677c091
Author: Brad King 
AuthorDate: Thu Mar 31 13:23:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 13:23:04 2016 -0400

Merge topic 'backport-asm-includes' into next

677c091b ASM: Add missing  placeholder for "compile" rules


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=677c091b8140a0655f512b8283c5b120fbd0f99c
commit 677c091b8140a0655f512b8283c5b120fbd0f99c
Author: Gregor Jasny 
AuthorDate: Fri Mar 25 23:18:07 2016 +0100
Commit: Brad King 
CommitDate: Thu Mar 31 13:22:46 2016 -0400

ASM: Add missing  placeholder for "compile" rules

This placeholder was added to the compilation rules for other languages
by commit v3.4.0-rc1~342^2 (Factor an  placeholder out of
 in rule variables, 2015-07-13) but ASM was incorrectly left out.

Signed-off-by: Gregor Jasny 

diff --git a/Modules/CMakeASM-ATTInformation.cmake 
b/Modules/CMakeASM-ATTInformation.cmake
index 675c13b..07a2d38 100644
--- a/Modules/CMakeASM-ATTInformation.cmake
+++ b/Modules/CMakeASM-ATTInformation.cmake
@@ -19,7 +19,7 @@ set(ASM_DIALECT "-ATT")
 # assembler but should be processed by gcc
 set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS s;asm)
 
-set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
 -o  ")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
  -o  ")
 
 include(CMakeASMInformation)
 set(ASM_DIALECT)
diff --git a/Modules/CMakeASM_NASMInformation.cmake 
b/Modules/CMakeASM_NASMInformation.cmake
index 7058fc7..146f412 100644
--- a/Modules/CMakeASM_NASMInformation.cmake
+++ b/Modules/CMakeASM_NASMInformation.cmake
@@ -38,7 +38,7 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
   endif()
 endif()
 
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "  -f 
${CMAKE_ASM_NASM_OBJECT_FORMAT} -o  ")
+set(CMAKE_ASM_NASM_COMPILE_OBJECT "  
 -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o  ")
 
 # Load the generic ASMInformation file:
 set(ASM_DIALECT "_NASM")
diff --git a/Modules/Compiler/ARMCC-ASM.cmake b/Modules/Compiler/ARMCC-ASM.cmake
index 8e3cfc5..539d525 100644
--- a/Modules/Compiler/ARMCC-ASM.cmake
+++ b/Modules/Compiler/ARMCC-ASM.cmake
@@ -3,5 +3,5 @@ include(Compiler/ARMCC)
 set(CMAKE_ASM_OUTPUT_EXTENSION ".o")
 set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
 
-set(CMAKE_ASM_COMPILE_OBJECT   "  -o  
")
+set(CMAKE_ASM_COMPILE_OBJECT   "   -o 
 ")
 set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
diff --git a/Modules/Platform/Generic-ADSP-ASM.cmake 
b/Modules/Platform/Generic-ADSP-ASM.cmake
index 63a1388..e718bec 100644
--- a/Modules/Platform/Generic-ADSP-ASM.cmake
+++ b/Modules/Platform/Generic-ADSP-ASM.cmake
@@ -3,5 +3,5 @@ include(Platform/Generic-ADSP-Common)
 set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm)
 set(CMAKE_ASM_OUTPUT_EXTENSION ".doj" )
 set(CMAKE_ASM_COMPILE_OBJECT
-"  -proc ${ADSP_PROCESSOR} -si-revision 
${ADSP_PROCESSOR_SILICIUM_REVISION} -o  ")
+"   -proc ${ADSP_PROCESSOR} 
-si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o  ")
 
diff --git a/Modules/Platform/gas.cmake b/Modules/Platform/gas.cmake
index 7d2bc84..7c659f2 100644
--- a/Modules/Platform/gas.cmake
+++ b/Modules/Platform/gas.cmake
@@ -4,7 +4,7 @@ else()
   set(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .obj)
 endif()
 
-set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
 -o  ")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " 
  -o  ")
 
 set(CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY
   " cr"

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-743-g9301b39

2016-03-31 Thread Jean-Christophe Fillion-Robin

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

The branch, next has been updated
   via  9301b3955a35f6e49eab20ff90b6a09d14b40306 (commit)
   via  fad5d59cf42ad876aa5553fe34beaf6a8f5a6cd1 (commit)
   via  72a862a55bdf16f4ff41239d400bd6b1aacfc7c2 (commit)
   via  a3468b78f21d6f3520a351fde6db6dd9153df948 (commit)
   via  85b2bb6cb48a431c3f941227302b42bd7588edfb (commit)
  from  b7c930d97a689cb5da1463d48672175ef5eda428 (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=9301b3955a35f6e49eab20ff90b6a09d14b40306
commit 9301b3955a35f6e49eab20ff90b6a09d14b40306
Merge: b7c930d fad5d59
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Thu Mar 31 13:19:33 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 13:19:33 2016 -0400

Merge topic 'add-CMAKE_EXTRA_INCLUDE_FILES-to-CMakePushCheckState' into next

fad5d59c PushCheckStateTest: Update test to check CMAKE_EXTRA_INCLUDE_FILES
72a862a5 CMakePushCheckState: Add support for CMAKE_EXTRA_INCLUDE_FILES
a3468b78 PushCheckStateTest: Test all variables managed by the module
85b2bb6c PushCheckStateTest: Fix syntax warning


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fad5d59cf42ad876aa5553fe34beaf6a8f5a6cd1
commit fad5d59cf42ad876aa5553fe34beaf6a8f5a6cd1
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Thu Mar 31 11:11:32 2016 -0400
Commit: Jean-Christophe Fillion-Robin 
CommitDate: Thu Mar 31 11:11:32 2016 -0400

PushCheckStateTest: Update test to check CMAKE_EXTRA_INCLUDE_FILES

diff --git a/Tests/CMakeTests/PushCheckStateTest.cmake.in 
b/Tests/CMakeTests/PushCheckStateTest.cmake.in
index 195881c..b4c48f4 100644
--- a/Tests/CMakeTests/PushCheckStateTest.cmake.in
+++ b/Tests/CMakeTests/PushCheckStateTest.cmake.in
@@ -1,5 +1,6 @@
 include(CMakePushCheckState)
 
+set(CMAKE_EXTRA_INCLUDE_FILES file1)
 set(CMAKE_REQUIRED_INCLUDES dir1)
 set(CMAKE_REQUIRED_DEFINITIONS defs1 )
 set(CMAKE_REQUIRED_LIBRARIES lib1)
@@ -8,6 +9,7 @@ set(CMAKE_REQUIRED_QUIET 1)
 
 cmake_push_check_state()
 
+set(CMAKE_EXTRA_INCLUDE_FILES file2)
 set(CMAKE_REQUIRED_INCLUDES dir2)
 set(CMAKE_REQUIRED_DEFINITIONS defs2)
 set(CMAKE_REQUIRED_LIBRARIES lib2)
@@ -16,6 +18,7 @@ set(CMAKE_REQUIRED_QUIET 2)
 
 cmake_push_check_state()
 
+set(CMAKE_EXTRA_INCLUDE_FILES file3)
 set(CMAKE_REQUIRED_DEFINITIONS defs3)
 set(CMAKE_REQUIRED_INCLUDES dir3)
 set(CMAKE_REQUIRED_DEFINITIONS defs3)
@@ -26,6 +29,7 @@ set(CMAKE_REQUIRED_QUIET 3)
 cmake_pop_check_state()
 
 foreach(pair IN ITEMS
+  EXTRA_INCLUDE_FILES|file2
   REQUIRED_INCLUDES|dir2
   REQUIRED_DEFINITIONS|defs2
   REQUIRED_LIBRARIES|lib2
@@ -44,6 +48,7 @@ endforeach()
 cmake_pop_check_state()
 
 foreach(pair IN ITEMS
+  EXTRA_INCLUDE_FILES|file1
   REQUIRED_INCLUDES|dir1
   REQUIRED_DEFINITIONS|defs1
   REQUIRED_LIBRARIES|lib1

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72a862a55bdf16f4ff41239d400bd6b1aacfc7c2
commit 72a862a55bdf16f4ff41239d400bd6b1aacfc7c2
Author: Jean-Christophe Fillion-Robin 
AuthorDate: Thu Mar 31 11:11:02 2016 -0400
Commit: Jean-Christophe Fillion-Robin 
CommitDate: Thu Mar 31 11:11:02 2016 -0400

CMakePushCheckState: Add support for CMAKE_EXTRA_INCLUDE_FILES

This commit teaches the module to push/pop/reset state of variable
CMAKE_EXTRA_INCLUDE_FILES used in CheckTypeSize module.

diff --git a/Help/release/dev/CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILES.rst 
b/Help/release/dev/CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILES.rst
new file mode 100644
index 000..a4e9a14
--- /dev/null
+++ b/Help/release/dev/CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILES.rst
@@ -0,0 +1,5 @@
+CMakePushCheckState-CMAKE_EXTRA_INCLUDE_FILE
+
+
+* The :module:`CMakePushCheckState` module now pushes/pops/resets the variable
+  ``CMAKE_EXTRA_INCLUDE_FILE`` used in :module:`CheckTypeSize`.
diff --git a/Modules/CMakePushCheckState.cmake 
b/Modules/CMakePushCheckState.cmake
index bf4ec0e..6958da1 100644
--- a/Modules/CMakePushCheckState.cmake
+++ b/Modules/CMakePushCheckState.cmake
@@ -8,8 +8,8 @@
 # CMAKE_POP_CHECK_STATE() and CMAKE_RESET_CHECK_STATE() These macros can
 # be used to save, restore and reset (i.e., clear contents) the state of
 # the variables CMAKE_REQUIRED_FLAGS, CMAKE_REQUIRED_DEFINITIONS,
-# CMAKE_REQUIRED_LIBRARIES and CMAKE_REQUIRED_INCLUDES used by the
-# various Check-files coming with CMake, like e.g.
+# CMAKE_REQUIRED_LIBRARIES, CMAKE_REQUIRED_INCLUDES and

[Cmake-commits] CMake branch, next, updated. v3.5.1-738-gb7c930d

2016-03-31 Thread Ben Boeckel

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  b7c930d97a689cb5da1463d48672175ef5eda428 (commit)
   via  053b38ba96efb89e48d3236869a309a9eab9f292 (commit)
  from  9f46f7bd489b1c74084c2062c15a9de2e8770cdd (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=b7c930d97a689cb5da1463d48672175ef5eda428
commit b7c930d97a689cb5da1463d48672175ef5eda428
Merge: 9f46f7b 053b38b
Author: Ben Boeckel 
AuthorDate: Thu Mar 31 13:16:12 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 13:16:12 2016 -0400

Merge topic 'ctest-run-submodule-sync' into next

053b38ba fixup! cmCTestGIT: add an option to initialize submodules on update


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=053b38ba96efb89e48d3236869a309a9eab9f292
commit 053b38ba96efb89e48d3236869a309a9eab9f292
Author: Ben Boeckel 
AuthorDate: Thu Mar 31 13:15:46 2016 -0400
Commit: Ben Boeckel 
CommitDate: Thu Mar 31 13:15:46 2016 -0400

fixup! cmCTestGIT: add an option to initialize submodules on update

diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 14ac5dd..3f73b32 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -408,7 +408,7 @@ Variables for CTest
/variable/CTEST_EXTRA_COVERAGE_GLOB
/variable/CTEST_GIT_COMMAND
/variable/CTEST_GIT_INIT_SUBMODULES
-   /variable/CTEST_GIT_UPDATE_OPTIONS
+   /variable/CTEST_GIT_UPDATE_CUSTOM
/variable/CTEST_GIT_UPDATE_OPTIONS
/variable/CTEST_HG_COMMAND
/variable/CTEST_HG_UPDATE_OPTIONS

---

Summary of changes:
 Help/manual/cmake-variables.7.rst |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] Making shared xcscheme files for Xcode from Cmake

2016-03-31 Thread Gregor Jasny via cmake-developers

Hello,

On 31/03/16 16:30, Harry Mallon wrote:
> This became an annoyance in our Cmake build system so here is a barebones 
> xcscheme creator.
> https://github.com/hm1992/CMake/commit/5345881861a4b510d3a3283825584ec90f8d2061
> 
> Current situation:
> * It seems to work for the executable targets we use in the office.
> * It only supports command line args and whether to run as root or not (but 
> this was all we needed for now).
> 
> If you have any use for it, feel free to use it. If it could be useful as a 
> basis for a more integrated module then that would also be fine.

Thank you for working on this. Schema creation is a longstanding user
request? Could you modify your generator so that one can combine
multiple targets to into one schema? Or will that require knowledge of
the target UUID from the xcodeproj file?

Some time ago I looked into adding a schema generator purely implemented
as a CMake module but came to the conclusion that it is not a viable
approach without CMake modifications. Especially the unstable UUIDs
across project re-generation gave me some headaches. So I decided that a
schema generator would best fit best within the Xcode generator.

Now there's the first task defining requirements and creating an useful
and extensible CMake language API for schema generation.

Thanks,
Gregor
-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] CMake API for warnings

2016-03-31 Thread Ruslan Baratov via cmake-developers


On 31-Mar-16 20:37, Brad King wrote:

On 03/29/2016 11:24 AM, Ruslan Baratov wrote:

OTOH many such switches are
so specific that they should not be abstracted and can instead be
added to COMPILE_OPTIONS with a $ genex guard.

What about generating nothing for such cases?

Yes, that makes sense.  I was just discussing alternatives.  Simon's
post contains an example of a granular flag that makes sense to try
to abstract.


I think these warning properties should perhaps be done as usage
requirements with propagation through INTERFACE_* properties.  I'd
need to see some example use cases spelled out though.

But not if target is installed. It will be quite inconvenient if 3rd
party package add some flags to local targets. Is it possible to support
it from the box?

Yes, let's skip propagation until a valid use case is raised in the
future, if any.  Likely the directory properties can be used to specify
project-wide warning configurations without propagating across targets.


Great.


What about this:

  compile_warnings # modify directory properties
  target_compile_warnings # modify target properties
  sources_compile_warnings # modify source properties

Let's start by getting the directory/target/source properties worked
out.  First we need to figure out how to make the properties work with
language-specific warning flags and such.  We can add command porcelain
for them later.


Same API for all:

 *_compile_warnings( DISABLE 
ENABLE  TREAT_AS_ERROR ) # may be plus 'APPEND'
for extending instead of overwriting (?)

Somehow this needs to be encoded in a COMPILE_WARNINGS property or
group of properties.  They should support generator expressions for
per-configuration warnings.


What about 3 properties containing list of 's (groups 
unexpanded):


* COMPILE_WARNINGS_DISABLE # e.g. "shift-sign-overflow;unused"
* COMPILE_WARNINGS_ENABLE # e.g. "ALL"
* COMPILE_WARNINGS_TREAT_AS_ERROR # e.g. group + specific: "inline;undef"

I don't know how it will happen in CMake's internals but I think at the 
point of generating the real flags we know the language of the 
source/target and can exclude language specific warnings. I.e. if 
'switch-enum' is set for C++ target we can generate '-Wswitch-enum' but 
if target is pure C we will add no flags.


I'm not sure about mixing more languages. I think it will be similar to 
COMPILE_OPTIONS (?), see no language specification in 
`add_compile_options` command.



General warning-id's:

* ALL
* DEFAULT
* LEVEL

And `NONE`.


Ok




Group warnings-id's:

Yes, but either the warning names or the property names will need to
allow for language-specific warnings.  We need to be able to control
warnings for C, C++, Fortran, etc. separately.  OTOH it would also
be nice to be able to set C and C++ warnings together since many of
them are common.

Ideas?


See above.

Ruslo
--

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.5.1-734-g0d43a91

2016-03-31 Thread Ben Boeckel

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  0d43a919fd720c76808fc9bcd617363ba97b41c5 (commit)
   via  8b38bf19a03a09896cb5f7e74d14c250acb8e802 (commit)
   via  d737a1a41c67a6034ed215f123af641d95308c1c (commit)
   via  b6a8e686ba1f709fc85a6d9790027a6d93fcb41f (commit)
   via  c8faf5b06ec39fedcb24e8880819ed91b48c2a62 (commit)
   via  779086283cea69d25076149c4f0bab0855978865 (commit)
  from  35bc416eff0a51f23c6cea368fb2f70d49969b64 (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=0d43a919fd720c76808fc9bcd617363ba97b41c5
commit 0d43a919fd720c76808fc9bcd617363ba97b41c5
Merge: 35bc416 8b38bf1
Author: Ben Boeckel 
AuthorDate: Thu Mar 31 12:35:59 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 12:35:59 2016 -0400

Merge topic 'ctest-run-submodule-sync' into next

8b38bf19 Help: add release notes for the branch
d737a1a4 cmCTestGIT: run `git submodule sync` before updating submodules
b6a8e686 cmCTestGIT: add an option to initialize submodules on update
c8faf5b0 cmCTestGIT: fix git version references
77908628 revert: revert back to the merge base


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b38bf19a03a09896cb5f7e74d14c250acb8e802
commit 8b38bf19a03a09896cb5f7e74d14c250acb8e802
Author: Ben Boeckel 
AuthorDate: Thu Mar 31 12:31:56 2016 -0400
Commit: Ben Boeckel 
CommitDate: Thu Mar 31 12:35:26 2016 -0400

Help: add release notes for the branch

diff --git a/Help/release/dev/ctest-run-submodule-sync.rst 
b/Help/release/dev/ctest-run-submodule-sync.rst
new file mode 100644
index 000..c41cc2f
--- /dev/null
+++ b/Help/release/dev/ctest-run-submodule-sync.rst
@@ -0,0 +1,9 @@
+ctest-run-submodule-sync
+
+
+* The :command:`ctest_update` command now looks at the
+  :variable:`CTEST_GIT_INIT_SUBMODULES` variable to determine whether
+  submodules should be updated or not before updating.
+* The :command:`ctest_update` command will now synchronize submodules on an
+  update. Updates which add submodules or change a submodule's URL will now be
+  pulled properly.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d737a1a41c67a6034ed215f123af641d95308c1c
commit d737a1a41c67a6034ed215f123af641d95308c1c
Author: Ben Boeckel 
AuthorDate: Thu Mar 31 12:30:42 2016 -0400
Commit: Ben Boeckel 
CommitDate: Thu Mar 31 12:35:25 2016 -0400

cmCTestGIT: run `git submodule sync` before updating submodules

If the URL of a submodule changes upstream, the commits referenced at
the old URL may not be available and will cause an update failure.

diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index c8e1394..38eadad 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -273,6 +273,7 @@ bool cmCTestGIT::UpdateImpl()
   std::string top_dir = this->FindTopDir();
   const char* git = this->CommandLineTool.c_str();
   const char* recursive = "--recursive";
+  const char* sync_recursive = "--recursive";
 
   // Git < 1.6.5 did not support submodule --recursive
   if(this->GetGitVersion() < cmCTestGITVersion(1,6,5,0))
@@ -285,6 +286,17 @@ bool cmCTestGIT::UpdateImpl()
   }
 }
 
+  // Git < 1.8.1 did not support sync --recursive
+  if(this->GetGitVersion() < cmCTestGITVersion(1,8,1,0))
+{
+sync_recursive = 0;
+// No need to require >= 1.8.1 if there are no submodules.
+if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
+  {
+  this->Log << "Git < 1.8.1 cannot synchronize submodules recursively\n";
+  }
+}
+
   OutputLogger submodule_out(this->Log, "submodule-out> ");
   OutputLogger submodule_err(this->Log, "submodule-err> ");
 
@@ -304,6 +316,16 @@ bool cmCTestGIT::UpdateImpl()
   }
 }
 
+  char const* git_submodule_sync[] = {git, "submodule", "sync",
+  sync_recursive, 0};
+  ret = this->RunChild(git_submodule_sync, _out, _err,
+   top_dir.c_str());
+
+  if (!ret)
+{
+return false;
+}
+
   char const* git_submodule[] = {git, "submodule", "update", recursive, 0};
   return this->RunChild(git_submodule, _out, _err,
 top_dir.c_str());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6a8e686ba1f709fc85a6d9790027a6d93fcb41f
commit b6a8e686ba1f709fc85a6d9790027a6d93fcb41f
Author: Ben Boeckel 
AuthorDate: Thu Mar 31 12:28:46 2016 -0400

Re: [CMake] Issues using CPack for making a debian package

2016-03-31 Thread Wagner, David


On 23/03/2016 16:15, Domen Vrankar wrote:

I'm considering working my problem around by shipping a patched copy of
CPackDeb.cmake, using this `-l` option. Has anyone another solution?


Other than disabling use of dpkg-shlibdeps with
CPACK_DEBIAN_PACKAGE_SHLIBDEPS nothing comes to mind.

Would you be willing to provide the patch with `-l` option for
inclusion into CPack and a minimal test CMakeLists.txt showing its
usage?


It just so happens that the presence of the DEBIAN directory also fixes my 
use-case (withouth any RPATH): now, dpkg-shlibdeps finds my private libraries. 
However, I notice a strange behaviour from dpkg-shlibdeps:



$ ls
debian DEBIAN usr
$ dpkg-shlibdeps --ignore-missing-info -O ./usr/lib/libparameter.so
shlibs:Depends=libc6 (>= 2.14), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.6), libxml2 
(>= 2.7.4)
$ dpkg-shlibdeps --ignore-missing-info -O usr/lib/libparameter.so
dpkg-shlibdeps: warning: binaries to analyze should already be installed in 
their package's directory
dpkg-shlibdeps: warning: symbol 
_ZN31BackgroundRemoteProcessorServerC1EtOSt10unique_ptrI21IRemoteCommandHandlerSt14default_deleteIS1_EE
 used by usr/lib/libparameter.so found in none of the libraries
shlibs:Depends=libc6 (>= 2.14), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.6), libxml2 
(>= 2.7.4)


Note how it works ok when the path to the binary starts with ./ but fails 
otherwise. I narrowed it down to the `relative_to_pkg_root` function in 
Dpkg/Path.pm but I don't understand Perl enoough to go further. Fortunately, the 
way CPackDeb.cmake calls dpkg-shlibdeps has these leading './'.


Bottom line: it works but I don't know how robust it is.

BR
David

--
David Wagner

complex != complicated
-
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris, 
92196 Meudon Cedex, France

Registration Number:  302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.5.1-728-g35bc416

2016-03-31 Thread Domen Vrankar

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  35bc416eff0a51f23c6cea368fb2f70d49969b64 (commit)
   via  5e5d0abdf2c4b09a5674bd37a8608dbf27707a47 (commit)
  from  782205d95d50934d6b493201996459614f2193be (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=35bc416eff0a51f23c6cea368fb2f70d49969b64
commit 35bc416eff0a51f23c6cea368fb2f70d49969b64
Merge: 782205d 5e5d0ab
Author: Domen Vrankar 
AuthorDate: Thu Mar 31 11:25:53 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 11:25:53 2016 -0400

Merge topic 'cpack-rpm-external-symlink-handling' into next

5e5d0abd CPack/RPM external symlink handling


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e5d0abdf2c4b09a5674bd37a8608dbf27707a47
commit 5e5d0abdf2c4b09a5674bd37a8608dbf27707a47
Author: Domen Vrankar 
AuthorDate: Thu Mar 31 07:48:38 2016 +0200
Commit: Domen Vrankar 
CommitDate: Thu Mar 31 17:23:13 2016 +0200

CPack/RPM external symlink handling

Symbolic links that point to external
location no longer cause cmake to fail
with string out of bounds error but
are instead packaged as non relocatable
symlinks and print out a warning message.

diff --git a/Help/release/dev/cpack-rpm-external-symlink-handling.rst 
b/Help/release/dev/cpack-rpm-external-symlink-handling.rst
new file mode 100644
index 000..d9a3d8c
--- /dev/null
+++ b/Help/release/dev/cpack-rpm-external-symlink-handling.rst
@@ -0,0 +1,5 @@
+cpack-rpm-external-symlink-handling
+
+
+* The "CPackRPM" module learned how to correctly handle symlinks
+  that are pointing outside generated packages.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index ae51dc1..713b938 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -599,9 +599,10 @@
 # while determining if symlink should be either created or present in a
 # post install script - depending on relocation paths.
 #
-# Currenty there are a few limitations though:
+# Symbolic links that point to locations outside packaging path produce a
+# warning and are treated as non relocatable permanent symbolic links.
 #
-# * Only symbolic links with relative path can be packaged.
+# Currenty there are a few limitations though:
 #
 # * For component based packaging component interdependency is not checked
 #   when processing symbolic links. Symbolic links pointing to content of
@@ -1068,13 +1069,28 @@ function(cpack_rpm_prepare_install_files 
INSTALL_FILES_LIST WDIR PACKAGE_PREFIXE
   get_filename_component(SYMLINK_POINT_ 
"${SYMLINK_LOCATION_}/${SYMLINK_POINT_}" ABSOLUTE)
 endif()
 
-string(SUBSTRING "${SYMLINK_POINT_}" ${WDR_LEN_} -1 SYMLINK_POINT_WD_)
+# recalculate path length after conversion to canonical form
+string(LENGTH "${SYMLINK_POINT_}" SYMLINK_POINT_LENGTH_)
 
-cpack_rpm_symlink_get_relocation_prefixes("${F}" "${PACKAGE_PREFIXES}" 
"SYMLINK_RELOCATIONS")
-cpack_rpm_symlink_get_relocation_prefixes("${SYMLINK_POINT_WD_}" 
"${PACKAGE_PREFIXES}" "POINT_RELOCATIONS")
+if(SYMLINK_POINT_ MATCHES "${WDIR}/.*")
+  # only symlinks that are pointing inside the packaging structure 
should be checked for relocation
+  string(SUBSTRING "${SYMLINK_POINT_}" ${WDR_LEN_} -1 
SYMLINK_POINT_WD_)
+  cpack_rpm_symlink_get_relocation_prefixes("${F}" 
"${PACKAGE_PREFIXES}" "SYMLINK_RELOCATIONS")
+  cpack_rpm_symlink_get_relocation_prefixes("${SYMLINK_POINT_WD_}" 
"${PACKAGE_PREFIXES}" "POINT_RELOCATIONS")
 
-list(LENGTH SYMLINK_RELOCATIONS SYMLINK_RELOCATIONS_COUNT)
-list(LENGTH POINT_RELOCATIONS POINT_RELOCATIONS_COUNT)
+  list(LENGTH SYMLINK_RELOCATIONS SYMLINK_RELOCATIONS_COUNT)
+  list(LENGTH POINT_RELOCATIONS POINT_RELOCATIONS_COUNT)
+else()
+  # location pointed to is ouside WDR so it should be treated as a 
permanent symlink
+  set(SYMLINK_POINT_WD_ "${SYMLINK_POINT_}")
+
+  unset(SYMLINK_RELOCATIONS)
+  unset(POINT_RELOCATIONS)
+  unset(SYMLINK_RELOCATIONS_COUNT)
+  unset(POINT_RELOCATIONS_COUNT)
+
+  message(AUTHOR_WARNING "CPackRPM:Warning: Symbolic link '${F}' 
points to location that is outside packaging path! Link will possibly not be 
relocatable.")
+endif()
 
 if(SYMLINK_RELOCATIONS_COUNT AND POINT_RELOCATIONS_COUNT)
   # find matching
diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt

[Cmake-commits] CMake branch, next, updated. v3.5.1-726-g782205d

2016-03-31 Thread Domen Vrankar

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  782205d95d50934d6b493201996459614f2193be (commit)
   via  d0b28e32628df9191289608f114244042c63a0df (commit)
  from  079f8c06e92872f0e59c97733408319504e95326 (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=782205d95d50934d6b493201996459614f2193be
commit 782205d95d50934d6b493201996459614f2193be
Merge: 079f8c0 d0b28e3
Author: Domen Vrankar 
AuthorDate: Thu Mar 31 11:22:06 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 11:22:06 2016 -0400

Merge topic 'cpack-rpm-external-symlink-handling' into next

d0b28e32 fixup: cpack-rpm-external-symlink-handling


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0b28e32628df9191289608f114244042c63a0df
commit d0b28e32628df9191289608f114244042c63a0df
Author: Domen Vrankar 
AuthorDate: Thu Mar 31 17:21:30 2016 +0200
Commit: Domen Vrankar 
CommitDate: Thu Mar 31 17:21:30 2016 +0200

fixup: cpack-rpm-external-symlink-handling

logging consistency fix

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 5c51fac..713b938 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1089,7 +1089,7 @@ function(cpack_rpm_prepare_install_files 
INSTALL_FILES_LIST WDIR PACKAGE_PREFIXE
   unset(SYMLINK_RELOCATIONS_COUNT)
   unset(POINT_RELOCATIONS_COUNT)
 
-  message(WARNING "Symbolic link '${F}' points to location that is 
outside packaging path! Link will not be relocatable.")
+  message(AUTHOR_WARNING "CPackRPM:Warning: Symbolic link '${F}' 
points to location that is outside packaging path! Link will possibly not be 
relocatable.")
 endif()
 
 if(SYMLINK_RELOCATIONS_COUNT AND POINT_RELOCATIONS_COUNT)

---

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


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

[cmake-developers] Making shared xcscheme files for Xcode from Cmake

2016-03-31 Thread Harry Mallon

Hello all,

This became an annoyance in our Cmake build system so here is a barebones 
xcscheme creator.
https://github.com/hm1992/CMake/commit/5345881861a4b510d3a3283825584ec90f8d2061

Current situation:
* It seems to work for the executable targets we use in the office.
* It only supports command line args and whether to run as root or not (but 
this was all we needed for now).

If you have any use for it, feel free to use it. If it could be useful as a 
basis for a more integrated module then that would also be fine.

Future ideas:
I'm not using Cmake on Windows at the moment but it would be great if it could 
make VS configs too.

Harry

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=83095F5A-2233-47F5-9598-19228D7E37AE]
-- 

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] Fix for [CMake 0015701] Eclipse Generator does accept / as seperator in SOURCE_GROUP instead of \\

2016-03-31 Thread Brad King

On 03/31/2016 05:12 AM, Patrik Lehmann wrote:
> Please recognize attached patch.

Thanks!  Applied and merged to 'next' for testing with some
formatting tweaks:

 Eclipse: Implement traversal of nested source groups (#15701)
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4828a78c

-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] add_custom_command() OUTPUT does not accept generator expressions, why?

2016-03-31 Thread Brad King

On 03/31/2016 07:26 AM, Yves Frederix wrote:
>> If anyone is interested in trying to implement generator expressions
>> for custom command outputs, I can provide more details to get started.
> 
> I am interested in having a go at this. I recently ran into this issue
> at work as well and actually tried some things already. However, I
> realized it was not that straightforward (not even talking about doing
> it 'right' here ;)). Any pointers are welcome!

Thanks!

The main challenge is shown in the cmTargetTraceDependencies::FollowName
method where it calls cmMakefile::GetSourceFileWithOutput.  This logic
is done without knowledge of the current configuration.  Therefore we
cannot expand generator expressions of the available outputs because
they may contain $.  Some table of pre-expanded per-config
outputs mapping back to their cmSourceFile instances may need to be
built.  Achieving this may even require adding a generate-time
companion of cmSourceFile that knows its configuration.  It will need
to be investigated further.

cmTargetTraceDependencies::CheckCustomCommand currently has a loop
over all configurations to generate the union of dependencies.  This
is used to allow generator expressions in the DEPENDS option.
The cmTargetTraceDependencies logic may need to be refactored to move
the loop over the configurations out to a higher level.  We may need
to trace dependencies separately for each configuration (for multi-
config generators).

Also see cmCustomCommandGenerator.  The generators will need to
be adapted to use this to get the custom command outputs with
generator expressions expanded.  They already do for the commands
and dependencies.

-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] Fix for FindPythonLibs with multiple configurations

2016-03-31 Thread Brad King

Hi Richard,

> The attached patch fixes this nesting issue.

Thanks for working on this.  Please look at revising this to avoid
exposing the _ANYCONFIG variable.  Use a "_Python_..." internal
variable that is unset, or find another way to do it without the
variable, such as `(PYTHON_RELEASE_LIBRARY OR PYTHON_DEBUG_LIBRARY)`.

> idiom for dealing with pre-specified multi-configuration libraries

I don't think our find modules ever consider the possibility of
pre-specified multi-config libraries.  Each cache entry is meant
to hold a single find_library result and the module puts them
together.  The leaking across multiple calls was not intentional.
Therefore this is not a concern for me.

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.5.1-724-g079f8c0

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  079f8c06e92872f0e59c97733408319504e95326 (commit)
   via  4828a78c1080d36935904a9620911a6f3743d792 (commit)
  from  6d4e1832e9a3b7a0d32975810319f9b2a155eb08 (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=079f8c06e92872f0e59c97733408319504e95326
commit 079f8c06e92872f0e59c97733408319504e95326
Merge: 6d4e183 4828a78
Author: Brad King 
AuthorDate: Thu Mar 31 09:37:01 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 09:37:01 2016 -0400

Merge topic 'eclipse-source-groups' into next

4828a78c Eclipse: Implement traversal of nested source groups (#15701)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4828a78c1080d36935904a9620911a6f3743d792
commit 4828a78c1080d36935904a9620911a6f3743d792
Author: Patrik Lehmann 
AuthorDate: Thu Mar 31 10:52:43 2016 +0200
Commit: Brad King 
CommitDate: Thu Mar 31 09:34:14 2016 -0400

Eclipse: Implement traversal of nested source groups (#15701)

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index f0227b0..9e67301 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -467,6 +467,49 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   xml.EndElement(); // projectDescription
 }
 
+void cmExtraEclipseCDT4Generator::WriteGroups(
+  std::vector const& sourceGroups,
+  std::string& linkName, cmXMLWriter& xml)
+{
+  for(std::vector::const_iterator sgIt = sourceGroups.begin();
+  sgIt != sourceGroups.end(); ++sgIt)
+{
+std::string linkName3 = linkName;
+linkName3 += "/";
+linkName3 += sgIt->GetFullName();
+
+size_t pos = 0;
+while ((pos = linkName3.find("\\", pos)) != std::string::npos)
+  {
+  linkName3.replace(pos, 1, "/");
+  pos++;
+  }
+
+this->AppendLinkedResource(xml, linkName3, "virtual:/virtual",
+   VirtualFolder);
+std::vector const& children = sgIt->GetGroupChildren();
+if (!children.empty())
+  {
+  this->WriteGroups(children, linkName, xml);
+  }
+std::vector sFiles = sgIt->GetSourceFiles();
+for(std::vector::const_iterator
+fileIt = sFiles.begin(); fileIt != sFiles.end(); ++fileIt)
+  {
+  std::string fullPath = (*fileIt)->GetFullPath();
+
+  if (!cmSystemTools::FileIsDirectory(fullPath))
+{
+std::string linkName4 = linkName3;
+linkName4 += "/";
+linkName4 += cmSystemTools::GetFilenameName(fullPath);
+this->AppendLinkedResource(xml, linkName4,
+   this->GetEclipsePath(fullPath),
+   LinkToFile);
+}
+  }
+}
+}
 
 //
 void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml)
@@ -523,34 +566,7 @@ void 
cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml)
 sourceGroup->AssignSource(*sfIt);
 }
 
-  for(std::vector::iterator sgIt = sourceGroups.begin();
-  sgIt != sourceGroups.end();
-  ++sgIt)
-{
-std::string linkName3 = linkName2;
-linkName3 += "/";
-linkName3 += sgIt->GetFullName();
-this->AppendLinkedResource(xml, linkName3, "virtual:/virtual",
-   VirtualFolder);
-
-std::vector sFiles = sgIt->GetSourceFiles();
-for(std::vector::const_iterator fileIt =
-sFiles.begin();
-fileIt != sFiles.end();
-++fileIt)
-  {
-  std::string fullPath = (*fileIt)->GetFullPath();
-  if (!cmSystemTools::FileIsDirectory(fullPath))
-{
-std::string linkName4 = linkName3;
-linkName4 += "/";
-linkName4 += cmSystemTools::GetFilenameName(fullPath);
-this->AppendLinkedResource(xml, linkName4,
-   this->GetEclipsePath(fullPath),
-   LinkToFile);
-}
-  }
-}
+  this->WriteGroups(sourceGroups, linkName2, xml);
   }
   break;
 // ignore all others:
diff --git a/Source/cmExtraEclipseCDT4Generator.h

[Cmake-commits] CMake branch, next, updated. v3.5.1-722-g6d4e183

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  6d4e1832e9a3b7a0d32975810319f9b2a155eb08 (commit)
   via  17c4863c351e05f4f491e8d2f1834bc4b61e4ed5 (commit)
  from  588c2d55c679e75cd1250b21e6d3129e84e040b1 (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=6d4e1832e9a3b7a0d32975810319f9b2a155eb08
commit 6d4e1832e9a3b7a0d32975810319f9b2a155eb08
Merge: 588c2d5 17c4863
Author: Brad King 
AuthorDate: Thu Mar 31 08:56:10 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:56:10 2016 -0400

Merge topic 'check-compiler-flag-clang-cl' into next

17c4863c Check*CompilerFlag: Add another pattern for Clang (#16038)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17c4863c351e05f4f491e8d2f1834bc4b61e4ed5
commit 17c4863c351e05f4f491e8d2f1834bc4b61e4ed5
Author: Brad King 
AuthorDate: Thu Mar 31 08:50:48 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 08:50:48 2016 -0400

Check*CompilerFlag: Add another pattern for Clang (#16038)

Match a warning pattern specific to `clang-cl`.

Suggested-by: Reid Kleckner 

diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake 
b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index 07d8b1e..6d3d839 100644
--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -24,6 +24,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
  FAIL_REGEX "[Uu]nrecogni[sz]ed .*option"   # GNU, NAG
  FAIL_REGEX "unknown .*option"  # Clang
  FAIL_REGEX "optimization flag .* not supported"# Clang
+ FAIL_REGEX "unknown argument ignored in clang-cl"  # Clang (cl)
  FAIL_REGEX "ignoring unknown option"   # MSVC, Intel
  FAIL_REGEX "warning D9002" # MSVC, any lang
  FAIL_REGEX "option.*not supported" # Intel

---

Summary of changes:
 Modules/CMakeCheckCompilerFlagCommonPatterns.cmake |1 +
 1 file changed, 1 insertion(+)


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-720-g588c2d5

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  588c2d55c679e75cd1250b21e6d3129e84e040b1 (commit)
   via  168e44e2028d905272323e0a66e3735c30460f5a (commit)
   via  731ad1724f08fb4255664fe8e09c581ad9c062fb (commit)
  from  dd1cf308e9cf28d494d65170048f1e8a112318c4 (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=588c2d55c679e75cd1250b21e6d3129e84e040b1
commit 588c2d55c679e75cd1250b21e6d3129e84e040b1
Merge: dd1cf30 168e44e
Author: Brad King 
AuthorDate: Thu Mar 31 08:47:08 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:47:08 2016 -0400

Merge topic 'update-kwsys' into next

168e44e2 Merge branch 'upstream-KWSys' into update-kwsys
731ad172 KWSys 2016-03-31 (3392da1d)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=168e44e2028d905272323e0a66e3735c30460f5a
commit 168e44e2028d905272323e0a66e3735c30460f5a
Merge: 0aa736e 731ad17
Author: Brad King 
AuthorDate: Thu Mar 31 08:46:50 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 08:46:50 2016 -0400

Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-03-31 (3392da1d)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=731ad1724f08fb4255664fe8e09c581ad9c062fb
commit 731ad1724f08fb4255664fe8e09c581ad9c062fb
Author: KWSys Upstream 
AuthorDate: Thu Mar 31 08:29:28 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 08:46:49 2016 -0400

KWSys 2016-03-31 (3392da1d)

Code extracted from:

http://public.kitware.com/KWSys.git

at commit 3392da1df3c363d6d1a80fa3f0e49fbd45c9dcf7 (master).

Upstream Shortlog
-

Ben Boeckel (2):
  f6867bb7 SystemTools: flip junction deletion around
  3392da1d SystemTools: add buffer around preproc conditions

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 0c7f419..c6e668d 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2855,6 +2855,7 @@ static bool DeleteJunction(const std::wstring& source)
   return false;
 #endif
 }
+
 #endif
 
 bool SystemTools::RemoveFile(const std::string& source)
@@ -2884,9 +2885,9 @@ bool SystemTools::RemoveFile(const std::string& source)
 SetLastError(err);
 return false;
 }
-  if (IsJunction(ws) && !DeleteJunction(ws))
+  if (IsJunction(ws) && DeleteJunction(ws))
 {
-return false;
+return true;
 }
   if (DeleteFileW(ws.c_str()) ||
   GetLastError() == ERROR_FILE_NOT_FOUND ||

---

Summary of changes:
 Source/kwsys/SystemTools.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-717-gdd1cf30

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  dd1cf308e9cf28d494d65170048f1e8a112318c4 (commit)
   via  0aa736e62545cee8e3ed6c39667705d31ce66b8c (commit)
   via  dea0b6b7187e3cb565c6653b991fe0e9f00191d2 (commit)
   via  189b54586bd5be3c2d0e4634832b4de8ec2b416f (commit)
   via  e2465c19c6ceb96c77886791e88804ccf85970d8 (commit)
   via  91d91d9d5da237d498549c7c0b6df0f4868e619a (commit)
   via  e0917f29a42626d9351df3de7ddabfb4acc73c78 (commit)
  from  d28f403a8c9b3ab5231aa0dfaab006a8f1f116d1 (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=dd1cf308e9cf28d494d65170048f1e8a112318c4
commit dd1cf308e9cf28d494d65170048f1e8a112318c4
Merge: d28f403 0aa736e
Author: Brad King 
AuthorDate: Thu Mar 31 08:46:16 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 08:46:16 2016 -0400

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.5.1-343-g91d91d9

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  91d91d9d5da237d498549c7c0b6df0f4868e619a (commit)
   via  2379b3ae3171db7277fd3cf126b5b0c298231b83 (commit)
   via  02fce523a13c8e4cda0c95334b480bb87336ed1c (commit)
  from  e0917f29a42626d9351df3de7ddabfb4acc73c78 (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=91d91d9d5da237d498549c7c0b6df0f4868e619a
commit 91d91d9d5da237d498549c7c0b6df0f4868e619a
Merge: e0917f2 2379b3a
Author: Brad King 
AuthorDate: Thu Mar 31 08:45:54 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:45:54 2016 -0400

Merge topic 'simplify-condition-context'

2379b3ae cmConditionEvaluator: Remove GetConditionContext method
02fce523 cmConditionEvaluator: Drop unnecessary path conversion


---

Summary of changes:
 Source/cmConditionEvaluator.cxx |   19 ---
 Source/cmConditionEvaluator.h   |3 ---
 Source/cmIfCommand.cxx  |8 
 Source/cmWhileCommand.cxx   |4 ++--
 4 files changed, 6 insertions(+), 28 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.5.1-340-ge0917f2

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  e0917f29a42626d9351df3de7ddabfb4acc73c78 (commit)
   via  729f5f01b4a1798ad8e11d3dc4eae664af96bd23 (commit)
  from  b290ddf925aee7dca25396035b1b53223d37e9e5 (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=e0917f29a42626d9351df3de7ddabfb4acc73c78
commit e0917f29a42626d9351df3de7ddabfb4acc73c78
Merge: b290ddf 729f5f0
Author: Brad King 
AuthorDate: Thu Mar 31 08:45:51 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:45:51 2016 -0400

Merge topic 'vs-fortran-MP'

729f5f01 VS: Map Intel Fortran `/MP` flag for multi-processor compilation 
(#15990)


---

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |5 +
 1 file changed, 5 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, master, updated. v3.5.1-347-g189b545

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  189b54586bd5be3c2d0e4634832b4de8ec2b416f (commit)
   via  1ba9b535478a2a73100a6b0e9bf01983b4774cb8 (commit)
  from  e2465c19c6ceb96c77886791e88804ccf85970d8 (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=189b54586bd5be3c2d0e4634832b4de8ec2b416f
commit 189b54586bd5be3c2d0e4634832b4de8ec2b416f
Merge: e2465c1 1ba9b53
Author: Brad King 
AuthorDate: Thu Mar 31 08:45:58 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:45:58 2016 -0400

Merge topic 'external-project-no-extract'

1ba9b535 ExternalProject: add support for just downloading a file


---

Summary of changes:
 Help/release/dev/external-project-no-extract.rst |6 
 Modules/ExternalProject.cmake|   32 ++
 2 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 Help/release/dev/external-project-no-extract.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.5.1-345-ge2465c1

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  e2465c19c6ceb96c77886791e88804ccf85970d8 (commit)
   via  5c324294ce8488537c68085b187c9fe2a51664c4 (commit)
  from  91d91d9d5da237d498549c7c0b6df0f4868e619a (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=e2465c19c6ceb96c77886791e88804ccf85970d8
commit e2465c19c6ceb96c77886791e88804ccf85970d8
Merge: 91d91d9 5c32429
Author: Brad King 
AuthorDate: Thu Mar 31 08:45:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:45:56 2016 -0400

Merge topic 'preallocate-condition-keywords'

5c324294 cmConditionEvaluator: Pre-allocate keyword strings


---

Summary of changes:
 Source/cmConditionEvaluator.cxx |   89 +--
 1 file changed, 58 insertions(+), 31 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.5.1-352-g0aa736e

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  0aa736e62545cee8e3ed6c39667705d31ce66b8c (commit)
   via  49e82c15d57db01a95f740f511715064a3887615 (commit)
  from  dea0b6b7187e3cb565c6653b991fe0e9f00191d2 (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=0aa736e62545cee8e3ed6c39667705d31ce66b8c
commit 0aa736e62545cee8e3ed6c39667705d31ce66b8c
Merge: dea0b6b 49e82c1
Author: Brad King 
AuthorDate: Thu Mar 31 08:46:03 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:46:03 2016 -0400

Merge topic 'fix-spelling-typos'

49e82c15 Fix spelling typos in comments and documentation (#16037)


---

Summary of changes:
 Help/command/add_executable.rst   |2 +-
 Help/command/add_library.rst  |2 +-
 Help/manual/cmake-buildsystem.7.rst   |2 +-
 Help/manual/cmake-generator-expressions.7.rst |2 +-
 Help/manual/cmake-packages.7.rst  |2 +-
 Help/manual/cpack.1.rst   |2 +-
 Help/prop_dir/INCLUDE_DIRECTORIES.rst |2 +-
 Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst|2 +-
 Help/prop_tgt/COMPILE_OPTIONS.rst |2 +-
 Help/prop_tgt/JOB_POOL_LINK.rst   |2 +-
 Help/release/dev/cpack-rpm-upper-cased-components.rst |2 +-
 Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst  |2 +-
 Help/variable/CTEST_COVERAGE_COMMAND.rst  |2 +-
 Modules/CMakeVerifyManifest.cmake |8 
 Modules/CPackRPM.cmake|2 +-
 Modules/ExternalProject.cmake |6 +++---
 Modules/FindCUDA.cmake|4 ++--
 Modules/FindJava.cmake|2 +-
 Modules/FindMatlab.cmake  |2 +-
 Modules/FindPNG.cmake |4 ++--
 Modules/FindSDL_image.cmake   |4 ++--
 Modules/FindSDL_mixer.cmake   |4 ++--
 Modules/FindSDL_net.cmake |4 ++--
 Modules/FindSDL_ttf.cmake |4 ++--
 Modules/FindSubversion.cmake  |2 +-
 Modules/FindThreads.cmake |2 +-
 Modules/Platform/GHS-MULTI-Initialize.cmake   |2 +-
 Modules/Platform/Windows-MSVC.cmake   |2 +-
 Modules/UseJava.cmake |2 +-
 Source/CTest/cmCTestBZR.cxx   |2 +-
 Source/CursesDialog/cmCursesStringWidget.cxx  |2 +-
 Source/CursesDialog/form/fld_def.c|4 ++--
 Source/CursesDialog/form/fld_ftlink.c |2 +-
 Source/CursesDialog/form/fld_newftyp.c|2 +-
 Source/CursesDialog/form/form.priv.h  |2 +-
 Source/CursesDialog/form/frm_def.c|4 ++--
 Source/CursesDialog/form/frm_driver.c |4 ++--
 Source/cmFileCommand.cxx  |2 +-
 Source/cmFortranLexer.cxx |2 +-
 Source/cmFortranLexer.in.l|2 +-
 Source/cmListFileCache.cxx|2 +-
 Source/cmQtAutoGenerators.cxx |6 +++---
 Source/cmStringCommand.cxx|2 +-
 Source/cmSystemTools.h|2 +-
 Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake   |2 +-
 Utilities/cmcurl/lib/curl_sasl_gssapi.c   |2 +-
 Utilities/cmcurl/lib/curl_sasl_sspi.c |2 +-
 Utilities/cmcurl/lib/ftp.c|2 +-
 Utilities/cmlibarchive/CMakeLists.txt |2 +-
 Utilities/cmlibarchive/libarchive/archive_read_disk_windows.c |2 +-
 Utilities/cmlibarchive/libarchive/xxhash.c|2 +-
 51 files changed, 67 insertions(+), 67 deletions(-)

[Cmake-commits] CMake branch, master, updated. v3.5.1-350-gdea0b6b

2016-03-31 Thread Brad King

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

The branch, master has been updated
   via  dea0b6b7187e3cb565c6653b991fe0e9f00191d2 (commit)
   via  dc333a7115a43e4e97a2ff3ba269a39526598f88 (commit)
   via  735c41ddb021a5ca0e8957591447acdb28a0f41b (commit)
  from  189b54586bd5be3c2d0e4634832b4de8ec2b416f (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=dea0b6b7187e3cb565c6653b991fe0e9f00191d2
commit dea0b6b7187e3cb565c6653b991fe0e9f00191d2
Merge: 189b545 dc333a7
Author: Brad King 
AuthorDate: Thu Mar 31 08:46:01 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:46:01 2016 -0400

Merge topic 'update-kwsys'

dc333a71 Merge branch 'upstream-KWSys' into update-kwsys
735c41dd KWSys 2016-03-29 (b51abb30)


---

Summary of changes:
 Source/kwsys/RegularExpression.cxx|2 +-
 Source/kwsys/RegularExpression.hxx.in |4 ++--
 Source/kwsys/SystemInformation.cxx|8 
 Source/kwsys/testEncoding.cxx |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-710-gd28f403

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  d28f403a8c9b3ab5231aa0dfaab006a8f1f116d1 (commit)
   via  df48b7c86d899dee9c5345b782d69f3d4699556f (commit)
  from  5d5a90d31233a2751f47f73e9205cdd594da1d95 (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=d28f403a8c9b3ab5231aa0dfaab006a8f1f116d1
commit d28f403a8c9b3ab5231aa0dfaab006a8f1f116d1
Merge: 5d5a90d df48b7c
Author: Brad King 
AuthorDate: Thu Mar 31 08:44:25 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:44:25 2016 -0400

Merge topic 'ctest-run-submodule-sync' into next

df48b7c8 cmCTestGIT: run git submodule {init,sync} to update


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df48b7c86d899dee9c5345b782d69f3d4699556f
commit df48b7c86d899dee9c5345b782d69f3d4699556f
Author: Ben Boeckel 
AuthorDate: Tue Mar 29 11:05:15 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 08:38:14 2016 -0400

cmCTestGIT: run git submodule {init,sync} to update

Repositories which add submodules or change their URLs are not fixed by
CTest when updating a git repository.

diff --git a/Help/release/dev/ctest-run-submodule-sync.rst 
b/Help/release/dev/ctest-run-submodule-sync.rst
new file mode 100644
index 000..55e87c0
--- /dev/null
+++ b/Help/release/dev/ctest-run-submodule-sync.rst
@@ -0,0 +1,6 @@
+ctest-run-submodule-sync
+
+
+* The :command:`ctest_update` command will now initialize and synchronize
+  submodules on an update. Updates which add submodules or change a
+  submodule's URL will now be pulled properly.
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index bbb3b9d..ee462f8 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -273,21 +273,53 @@ bool cmCTestGIT::UpdateImpl()
   std::string top_dir = this->FindTopDir();
   const char* git = this->CommandLineTool.c_str();
   const char* recursive = "--recursive";
+  const char* sync_recursive = "--recursive";
 
-  // Git < 1.6.5.0 did not support --recursive
+  // Git < 1.6.5 did not support submodule --recursive
   if(this->GetGitVersion() < cmCTestGITVersion(1,6,5,0))
 {
 recursive = 0;
-// No need to require >= 1.6.5.0 if there are no submodules.
+// No need to require >= 1.6.5 if there are no submodules.
 if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
   {
-  this->Log << "Git < 1.6.5.0 cannot update submodules recursively\n";
+  this->Log << "Git < 1.6.5 cannot update submodules recursively\n";
+  }
+}
+
+  // Git < 1.8.1 did not support sync --recursive
+  if(this->GetGitVersion() < cmCTestGITVersion(1,8,1,0))
+{
+sync_recursive = 0;
+// No need to require >= 1.8.1 if there are no submodules.
+if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
+  {
+  this->Log << "Git < 1.8.1 cannot synchronize submodules recursively\n";
   }
 }
 
-  char const* git_submodule[] = {git, "submodule", "update", recursive, 0};
   OutputLogger submodule_out(this->Log, "submodule-out> ");
   OutputLogger submodule_err(this->Log, "submodule-err> ");
+
+  char const* git_submodule_init[] = {git, "submodule", "init", 0};
+  bool ret = this->RunChild(git_submodule_init, _out, _err,
+top_dir.c_str());
+
+  if (!ret)
+{
+return false;
+}
+
+  char const* git_submodule_sync[] = {git, "submodule", "sync",
+  sync_recursive, 0};
+  ret = this->RunChild(git_submodule_sync, _out, _err,
+   top_dir.c_str());
+
+  if (!ret)
+{
+return false;
+}
+
+  char const* git_submodule[] = {git, "submodule", "update", recursive, 0};
   return this->RunChild(git_submodule, _out, _err,
 top_dir.c_str());
 }

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-708-g5d5a90d

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  5d5a90d31233a2751f47f73e9205cdd594da1d95 (commit)
   via  1ba9b535478a2a73100a6b0e9bf01983b4774cb8 (commit)
  from  ccc2b0992e8aa085e12e240c9df6ebb4891a53db (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=5d5a90d31233a2751f47f73e9205cdd594da1d95
commit 5d5a90d31233a2751f47f73e9205cdd594da1d95
Merge: ccc2b09 1ba9b53
Author: Brad King 
AuthorDate: Thu Mar 31 08:37:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:37:56 2016 -0400

Merge topic 'external-project-no-extract' into next

1ba9b535 ExternalProject: add support for just downloading a file


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ba9b535478a2a73100a6b0e9bf01983b4774cb8
commit 1ba9b535478a2a73100a6b0e9bf01983b4774cb8
Author: Ben Boeckel 
AuthorDate: Tue Mar 29 10:25:01 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 08:37:12 2016 -0400

ExternalProject: add support for just downloading a file

Some projects only ship self-extracting installers rather than
compressed archives. Add a flag so that these files may be used in
ExternalProject.

diff --git a/Help/release/dev/external-project-no-extract.rst 
b/Help/release/dev/external-project-no-extract.rst
new file mode 100644
index 000..b3293cd
--- /dev/null
+++ b/Help/release/dev/external-project-no-extract.rst
@@ -0,0 +1,6 @@
+external-project-no-extract
+---
+
+* The :module:`ExternalProject` module leared the ``DOWNLOAD_NO_EXTRACT 1``
+  argument to skip extracting the file that is downloaded (e.g., for
+  self-extracting shell installers or ``.msi`` files).
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 249658d..0c4d9d8 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -77,6 +77,9 @@ Create custom targets to build projects in external trees
 Path to a certificate authority file
   ``TIMEOUT ``
 Time allowed for file download operations
+  ``DOWNLOAD_NO_EXTRACT 1``
+Just download the file and do not extract it; the full path to the
+downloaded file is available as .
 
   Update/Patch step options are:
 
@@ -1107,7 +1110,7 @@ macro(_ep_replace_location_tags target_name)
   set(vars ${ARGN})
   foreach(var ${vars})
 if(${var})
-  foreach(dir SOURCE_DIR BINARY_DIR INSTALL_DIR TMP_DIR)
+  foreach(dir SOURCE_DIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOADED_FILE)
 get_property(val TARGET ${target_name} PROPERTY _EP_${dir})
 string(REPLACE "<${dir}>" "${val}" ${var} "${${var}}")
   endforeach()
@@ -1875,6 +1878,7 @@ function(_ep_add_download_command name)
   set(cmd   ${CMAKE_COMMAND} -E remove_directory ${source_dir}
 COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir})
 else()
+  get_property(no_extract TARGET "${name}" PROPERTY 
_EP_DOWNLOAD_NO_EXTRACT SET)
   if("${url}" MATCHES "^[a-z]+://")
 # TODO: Should download and extraction be different steps?
 if("x${fname}" STREQUAL "x")
@@ -1884,7 +1888,9 @@ function(_ep_add_download_command name)
   string(REGEX MATCH 
"([^/\\?]+(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip))/.*$" 
match_result "${url}")
   set(fname "${CMAKE_MATCH_1}")
 endif()
-if(NOT "${fname}" MATCHES 
"(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
+if (no_extract)
+  get_filename_component(fname "${url}" NAME)
+elseif(NOT "${fname}" MATCHES 
"(\\.|=)(7z|tar|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
   message(FATAL_ERROR "Could not extract tarball filename from url:\n  
${url}")
 endif()
 string(REPLACE ";" "-" fname "${fname}")
@@ -1898,16 +1904,30 @@ function(_ep_add_download_command name)
 set(cmd ${CMAKE_COMMAND} -P "${download_script}"
   COMMAND)
 set(retries 3)
-set(comment "Performing download step (download, verify and extract) 
for '${name}'")
+if (no_extract)
+  set(steps "download and verify")
+else ()
+  set(steps "download, verify and extract")
+endif ()
+set(comment "Performing download step (${steps}) for '${name}'")
   else()
 set(file "${url}")
-set(comment "Performing download step (verify and extract) for 
'${name}'")
+if (no_extract)
+  set(steps "verify")
+else ()
+  set(steps "verify and extract")

[Cmake-commits] CMake branch, next, updated. v3.5.1-706-gccc2b09

2016-03-31 Thread Brad King

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

The branch, next has been updated
   via  ccc2b0992e8aa085e12e240c9df6ebb4891a53db (commit)
   via  c36702535e36a7ec0eb4e084ec58ec05ca5b3a6b (commit)
  from  77220f1ad6bf349e51f83d251c2a3a738b2c772a (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=ccc2b0992e8aa085e12e240c9df6ebb4891a53db
commit ccc2b0992e8aa085e12e240c9df6ebb4891a53db
Merge: 77220f1 c367025
Author: Brad King 
AuthorDate: Thu Mar 31 08:37:07 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 31 08:37:07 2016 -0400

Merge topic 'external-project-no-extract' into next

c3670253 fixup! ExternalProject: add support for just downloading a file


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c36702535e36a7ec0eb4e084ec58ec05ca5b3a6b
commit c36702535e36a7ec0eb4e084ec58ec05ca5b3a6b
Author: Brad King 
AuthorDate: Thu Mar 31 08:34:25 2016 -0400
Commit: Brad King 
CommitDate: Thu Mar 31 08:34:25 2016 -0400

fixup! ExternalProject: add support for just downloading a file

diff --git a/Help/release/dev/external-project-no-extract.rst 
b/Help/release/dev/external-project-no-extract.rst
index af5d717..b3293cd 100644
--- a/Help/release/dev/external-project-no-extract.rst
+++ b/Help/release/dev/external-project-no-extract.rst
@@ -1,6 +1,6 @@
 external-project-no-extract
 ---
 
-* The :module:`ExternalProject` module leared the ``NO_EXTRACT 1`` argument to
-  skip extracting the file that is downloaded (e.g., for self-extracting shell
-  installers or MSI files).
+* The :module:`ExternalProject` module leared the ``DOWNLOAD_NO_EXTRACT 1``
+  argument to skip extracting the file that is downloaded (e.g., for
+  self-extracting shell installers or ``.msi`` files).

---

Summary of changes:
 Help/release/dev/external-project-no-extract.rst |6 +++---
 1 file changed, 3 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] add_custom_command() OUTPUT does not accept generator expressions, why?

2016-03-31 Thread Yves Frederix

Hi Brad,

>
> If anyone is interested in trying to implement generator expressions
> for custom command outputs, I can provide more details to get started.

I am interested in having a go at this. I recently ran into this issue
at work as well and actually tried some things already. However, I
realized it was not that straightforward (not even talking about doing
it 'right' here ;)). Any pointers are welcome!

Regards,
Yves
-- 

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] [CMake] add_custom_command() OUTPUT does not accept generator expressions, why?

2016-03-31 Thread Dan Liew

Hi,

On 28 March 2016 at 15:05, Brad King  wrote:
> On 03/27/2016 06:11 AM, Dan Liew wrote:
>> OUTPUT does not accept generator expressions, why?
>
> It hasn't been implemented.  At least at one time it would have been
> very hard to implement.  I'm not sure now because there has been a lot
> of refactoring since I last looked at it.
>
> There is some discussion here:
>
>  https://cmake.org/Bug/view.php?id=13840
>  https://cmake.org/Bug/view.php?id=12877#c28315
>
>> If I can't use generator expressions with ``OUTPUT``, how am I
>> supposed to output a file into the build directory of a target?
>
> Unfortunately it is not possible to do cleanly without fixing the
> above.  Approximations include:
>
> * Use a POST_BUILD command on the target instead.
>
> * Make the OUTPUT a timestamp file and generate the real output
>   as a side effect.
>
> If anyone is interested in trying to implement generator expressions
> for custom command outputs, I can provide more details to get started.

Thanks for the info Brad. I wish I had time to look into this but I
don't so for now I'll just work around it.

Dan.
-- 

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] add_custom_command() OUTPUT does not accept generator expressions, why?

2016-03-31 Thread Dan Liew

Hi,

On 28 March 2016 at 15:05, Brad King  wrote:
> On 03/27/2016 06:11 AM, Dan Liew wrote:
>> OUTPUT does not accept generator expressions, why?
>
> It hasn't been implemented.  At least at one time it would have been
> very hard to implement.  I'm not sure now because there has been a lot
> of refactoring since I last looked at it.
>
> There is some discussion here:
>
>  https://cmake.org/Bug/view.php?id=13840
>  https://cmake.org/Bug/view.php?id=12877#c28315
>
>> If I can't use generator expressions with ``OUTPUT``, how am I
>> supposed to output a file into the build directory of a target?
>
> Unfortunately it is not possible to do cleanly without fixing the
> above.  Approximations include:
>
> * Use a POST_BUILD command on the target instead.
>
> * Make the OUTPUT a timestamp file and generate the real output
>   as a side effect.
>
> If anyone is interested in trying to implement generator expressions
> for custom command outputs, I can provide more details to get started.

Thanks for the info Brad. I wish I had time to look into this but I
don't so for now I'll just work around it.

Dan.
-- 

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] Review request: FindTBB module

2016-03-31 Thread Andreas Schuh

Hi all,

I also came across these FindTBB modules while in need for one. As the more 
recent one from the OGRE project did not support MSVS 2015 yet, and also does 
not create import targets for a more convenient and “modern” CMake use of the 
TBB library targets, I wrote my own module.

Features:
- Makes use of COMPONENTS argument of find_package to look for the different 
TBB libraries.
- Adds IMPORTED library targets with IMPORTED_* and INTERFACE_* properties set 
appropriately.
- Considers TBB_ROOT as user hint and bases library search on root derived from 
TBB_INCLUDE_DIR otherwise.
- Uses PATH_SUFFIXES instead of full search paths as done by OGRE FindTBB 
module to take advantage of CMake’s default search paths.
- Checks TBB_VERSION against VERSION argument of find_package using 
find_package_handle_standard_args.

This module is part of my CMake BASIS project which, among other things, 
consists of custom CMake functions and modules which attempt to standardise and 
reduce the CMake code needed by most projects (in research). These CMake BASIS 
Modules can be found on GitHub: 
https://github.com/schuhschuh/cmake-basis-modules.

Would be great if someone could review the FindTBB module at


https://github.com/schuhschuh/cmake-basis-modules/blob/develop/FindTBB.cmake

and provide some feedback about what needs to be modified before it can be 
added to the official CMake Modules.

Best,
Andreas

> On 12 Mar 2015, at 00:04, Klaim - Joël Lamotte  wrote:
> 
> 
> Hi,
> 
> did you manage to improve over the DaxToolkit FindTBB module?
> 
> Thanks for your time.
> -- 
> 
> 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

-- 

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] Fix for [CMake 0015701] Eclipse Generator does accept / as seperator in SOURCE_GROUP instead of \\

2016-03-31 Thread Patrik Lehmann

Hi.

I fixed the bug [CMake 0015701] in the Eclipse Generator. The handling of 
Source Groups was not correct.

Please recognize attached patch.

Kind Regards,

Patrik Lehmann

0001-CMake-0015701-Fixed-handling-of-sourceGroups-trees.patch~
Description: application/trash
-- 

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 0016041]: Add support for $ in add_custom_command()

2016-03-31 Thread Mantis Bug Tracker


The following issue has been SUBMITTED. 
== 
https://public.kitware.com/Bug/view.php?id=16041 
== 
Reported By:keksa
Assigned To:
== 
Project:CMake
Issue ID:   16041
Category:   CMake
Reproducibility:N/A
Severity:   feature
Priority:   normal
Status: new
== 
Date Submitted: 2016-03-31 03:23 EDT
Last Modified:  2016-03-31 03:23 EDT
== 
Summary:Add support for $ in
add_custom_command()
Description: 
It would be useful to support the TARGET_OBJECTS generator expression also in 
the add_custom_command() context (COMMAND and DEPENDS options).

It is useful for building list of objects and than process them by custom 
command (e.g. linker, archiver etc.).
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2016-03-31 03:23 keksa  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

Re: [CMake] using cmake to link header files: file could be found, is included, but build error when using nmake.

2016-03-31 Thread Petr Kmoch

Hi Karel,

I've noticed a few points where you could start looking for a solution:

* You're mentioning that CMake warns about some linking stuff, but the
compiler error is one about including a header file. Libraries and headers
are fundamentally different objects: header files are used by the compiler,
libraries are used by the linker.

* Regarding the linking thing:

AVRO_LIBRARY- The Avro C++ libraries

Yet you seem to be setting this to a directory:

set(AVRO_LIBRARY
D:/kuleuven/thesis/kaa/kaaBuild/avro_1.8.0/lang/c++/build.win)

when you're supposed to set it to a library (.lib file).

* As for the header issue, you're setting:

set(AVRO_INCLUDE_DIR
D:/kuleuven/thesis/kaa/kaaBuild/avro_1.8.0/lang/c++/avro)

but then using:

include_directories (
 ${AVRO_INCLUDE_DIRS}
 )

Note the difference in the trailing 'S'.

* Additionally, variables like AVRO_INCLUDE_DIR and AVRO_LIBRARY look like
something the find package should be setting *for* you. It doesn't seem
like a package shipped with CMake, so consult its docs to check you're
using it as intended.

Petr

On Wed, Mar 30, 2016 at 5:15 PM, Karel Geiregat 
wrote:

> Dear users at Cmake
>
>
> It could be that I don't have understood the linking process when building
> the project by cmake. The project has three dependencies: (1) Boost, (2)
> (Apache) Avro and (3) Botan.
> After issuing the following command to be able to use the nmake command
> from Visual Studio:
>
> D:\...\build>cmake -G "NMake Makefiles" -DKAA_INSTALL_PATH="D:\kaa\kaaSDK"
>> -DKAA_DEBUG_ENABLED=1 ..
>>
>
> It ran without problems, except minor warnings like
>
> WARNING: Target "kaacpp" requests linking to directory
>> "D:/kaa/kaaBuild/avro_1.8.0/lang/c++/build.win".  Targets may link only to
>> libraries.  CMake is dropping the item.
>>
> => note: full log is at the bottom of this mail (appendix 1).
>
> but when i call nmake after, it immediately throws up error:
>
> D:\...\build>nmake
>>
>> Microsoft (R) Program Maintenance Utility Version 14.00.23506.0
>> Copyright (C) Microsoft Corporation.  All rights reserved.
>>
>> Scanning dependencies of target kaacpp_o
>> [  1%] Building CXX object
>> CMakeFiles/kaacpp_o.dir/impl/event/registration/EndpointRegistrationManager.cpp.obj
>> EndpointRegistrationManager.cpp
>> D:\kaa\kaa-cpp-ep-sdk-aXrMkhHEE2BrPBehV_Vbxym2MfU\kaa/gen/EndpointGen.hpp(26):
>> fatal error C1083: Cannot open include file: 'avro/Specific.hh': No such
>> file or directory
>> NMAKE : fatal error U1077: 'C:\PROGRA~2\VISUAL~1.0\VC\bin\cl.exe' :
>> return code '0x2'
>> Stop.
>> NMAKE : fatal error U1077: '"C:\Program Files (x86)\Visual Studio
>> 14.0\VC\BIN\nmake.exe"' : return code '0x2'
>> Stop.
>>
>
> I have checked the file, and there is the following includes
>
> #include 
>> #include "boost/any.hpp"
>> #include "avro/Specific.hh" < error line
>> #include "avro/Encoder.hh"
>> #include "avro/Decoder.hh"
>>
>
> My idea is that the linking of the avro library is not set up correctly
> since the error got thrown after including a Boost file.
> Here is a fragment of my cmakelists.txt file where Avro got added and how
> the packages got found/added
>
> #  AVRO_ROOT_DIR   - Set this variable to the root installation
>> of  Avro C++ if the module has problems finding the proper installation
>> path.
>> #  AVRO_LIBRARY- The Avro C++ libraries
>> #  AVRO_INCLUDE_DIR- The location of Avro C++ headers
>> set(AVRO_ROOT_DIR D:/kuleuven/thesis/kaa/kaaBuild/avro_1.8.0/lang/c++)
>> set(AVRO_LIBRARY
>> D:/kuleuven/thesis/kaa/kaaBuild/avro_1.8.0/lang/c++/build.win)
>> set(AVRO_INCLUDE_DIR
>> D:/kuleuven/thesis/kaa/kaaBuild/avro_1.8.0/lang/c++/avro)
>>
>
>>
> some contents omitte
>>
>
>>
> #
>> # Find third-party dependencies
>> #
>> find_package (Boost 1.54 REQUIRED COMPONENTS log system thread)
>> find_package (Avro REQUIRED)
>> find_package (Botan REQUIRED)
>>
> => note: full cmakelist.txt file is added as appendix2
>
>
> After that, i have issued the following messaging
>
> message("--- AVRO: Found? " ${AVRO_FOUND}) <- displays "--- AVRO:
>> Found? TRUE"
>> message(${AVRO_LIBRARIES}) <- displays "
>> D:/kaa/kaaBuild/avro_1.8.0/lang/c++/build.win"
>
>
>
> So, the library can be found. However, it surprises me that the specific
> file, Specific.hh could not be found while it is in the include directory,
> AVRO_INCLUDE_DIR (according to the findavrocpp.cmake
> 
> it's used for headers).
> I have issued the following PowerShell command to show that the file is in
> the given directory
>
> PS D:\kaa\kaaBuild\avro_1.8.0\lang\c++\avro> Get-childitem Specific.hh
>>
>> Directory: D:\kaa\kaaBuild\avro_1.8.0\lang\c++\avro
>>
>> ModeLastWriteTime Length Name
>> - -- 
>> -a 2/9/2012   7:11 PM   7428

46 matches

Mail list logo