Re: [cmake-developers] CMake for 64Win7

[Konstantin Podsvirov]

Good day!

You can try the experimental installer (based on IFW generator) from my website:

http://ifw.podsvirov.pro/cmake/files/v3.5/cmake-3.5.0-rc3-win64-x64.exe

You can also try the online version, which is based on code from branch 
"master":

http://ifw.podsvirov.pro/cmake/cmake-master-win64-online.exe

Online installer supports online update.

Good luck :-)

08.03.2016, 03:32, "LI, NING" :
> Dear Sirs,
>
> There are only 32Win version of CMake( cmake-3.5.0-rc3-win32-x86.msi or 
> cmake-3.5.0-rc3-win32-x86.zip ) on your web page( https://cmake.org/download/ 
> ). When will the version for 64Win available?
>
> Thank you for the help!
>
> Ning.
> ==
> LI, Ning. Ph.D.
> --
> E-mail Address: l...@cec.sc.edu
> ===The University of South Carolina===

--
Regards,
Konstantin Podsvirov
-- 

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] Compile shared library and call it's functions

[Andreas Pakulat]

Hi,

On Mon, Mar 7, 2016 at 9:29 PM, Ivan  wrote:

> Hello!
>
> Here is my CMakeLists.txt:
>
> cmake_minimum_required(VERSION 3.3)
> project(untitled19)
>
> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
>
> set(LIBRARY_SRC library.cpp)
>
> add_library(libra SHARED ${LIBRARY_SRC})
>
> set(SOURCE_FILES main.cpp)
> add_executable(untitled19 ${SOURCE_FILES})
> target_link_libraries(untitled19 libra)
>
>
> This works and both library and executable are compiled. Unfortunately 
> library seems to be linked into the executable: ‘nm’ command shows that the 
> executable itself exports needed functions!
>
>
I do not think your interpreting the nm output correctly, but its hard to
say without seeing it ;)

Note that nm will show the functions exported by the library in the output
for the executable, because the executable uses those functions. It will
also indicate however that these functions are not defined inside the
executable in the corresponding column with an upper-case U. When you run
nm on the library itself you will notice that the same symbols have a
different type in the corresponding column. In addition you can verify that
the executable actually links against the library using the otool
commandline tool: otool -L executable.

Andreas
-- 

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] Fwd: Create main and sub-projects; be able to compile them together and individually.

[Muhammad Osama]

Hi, I am new to cmake and really hope am doing this correctly. I asked
stackoverflow but didn't get a good enough answer for my specific problem
here;

If I want root/sub-directories/ as separate sub-projects that can be
compiled using the individualCMakeLists.txts in their folders I find myself
literally copy pasting almost the entire root file CMakeLists.txt per
sub-directory.

I was wondering if there is a better way to have a main project and then
sub-projects that get the shared dependencies from main project and can be
compiled without cmake-ing the root CMakeLists.txt. My directory structure
is;

CMakeLists.txt (root project)
| __ sub_dir-1
| __ | __ CMakeLists.txt (sub-project)
| __ sub_dir-2
| __ | __ CMakeLists.txt (sub-project)
| __ sub_dir-3
| __ | __ CMakeLists.txt (sub-project)
...

Essentially, I want to be able to:

1.
​ ​
cmake root/CMakeLists.txt, which creates an entire project that includes
the sub-projects (I already have this implemented using individual
CMakeLists.txts inside sub-directories.

2.
​ ​
cmake root/sub-dir/CMakeLists.txt and only compile the sub-project, which
essentially also finds the necessary dependencies and includes them from
maybe .cmake includes or root/CMakeLists.txt. What is the best way to
approach this structure;

while retaining the first bullet point of having the ability to compile it
as an entire project.
And also not crowding the sub-dir/CMakeLists.txt too much with redundant
code?

Appreciate any suggestions! Thank you.


--
Muhammad Osama
-- 

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] Best way to show/include CMake files in IDE

[Eric Wing]

On 3/7/16, Eric Wing  wrote:
> On 3/7/16, David Cole  wrote:
>> If you include those files in the source list for a library, executable,
>> or
>> custom target, they should show up in IDE projects, and they should be
>> ignored by Makefile type projects. Have you tried that?
>>
>>
>> David
>>
>
> I haven't tried it yet since I was wondering what the best approach was :)
> Since some of my files are somewhat project oriented instead of target
> oriented, I wasn't sure if putting them the library/executable targets
> was best. But if it is, I'll try that.
>
> Thanks,
> Eric
>

Well, I gave it a try. So far, it looks good.

Thanks,
Eric
-- 

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] Best way to show/include CMake files in IDE

[Eric Wing]

On 3/7/16, David Cole  wrote:
> If you include those files in the source list for a library, executable, or
> custom target, they should show up in IDE projects, and they should be
> ignored by Makefile type projects. Have you tried that?
>
>
> David
>

I haven't tried it yet since I was wondering what the best approach was :)
Since some of my files are somewhat project oriented instead of target
oriented, I wasn't sure if putting them the library/executable targets
was best. But if it is, I'll try that.

Thanks,
Eric
-- 

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 for 64Win7

[LI, NING]

Dear Sirs,

There are only 32Win version of CMake( cmake-3.5.0-rc3-win32-x86.msi or 
cmake-3.5.0-rc3-win32-x86.zip ) on your web page( https://cmake.org/download/ 
). When will the version for 64Win available?

Thank you for the help!

Ning.
==
LI, Ning. Ph.D.
--
E-mail Address: l...@cec.sc.edu
===The University of South Carolina===

-- 

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] Best way to show/include CMake files in IDE

[David Cole via CMake]

If you include those files in the source list for a library, executable, or 
custom target, they should show up in IDE projects, and they should be ignored 
by Makefile type projects. Have you tried that?


David

> On Mar 7, 2016, at 6:34 PM, Eric Wing  wrote:
> 
> I have a bunch of .cmake support files in my project that I have split
> off from CMakeLists.txt (using INCLUDE to combine them) to separate
> concerns. (Source files, application assets, script files, platform
> settings, codesigning, etc.)
> 
> This works, but they don't show up in IDEs (Visual Studio, Xcode,
> etc). I realized it would be nice to see these files in the IDE and be
> able to edit them there. (I assume the CMake bootstrap will still just
> work.)
> 
> What is the best way to include/show these files in the IDE (and won't
> break the Makefile or other non-IDE generators)?
> 
> Thanks,
> Eric
> -- 
> 
> 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

Re: [cmake-developers] C# support ready for review

[David Cole via cmake-developers]

Seems to me like C# support should work just fine with other generators: ninja, 
nmake, and UNIX Makefiles included. Especially with mono on Linux/Mac.


David

> On Mar 7, 2016, at 2:12 PM, Brad King  wrote:
> 
>> On 02/25/2016 05:51 AM, Stuermer, Michael  SP/HZA-ZSEP wrote:
>> The part that probably needs most additional work is all the
>> C# detection and configuration part in the module scripts.
> 
> In your branch Modules/CMakeDetermineCSharpCompiler.cmake currently
> has a lot of logic and environment checks for this.  It shouldn't
> need to be that complicated.  Anything requiring deep introspection
> of the system (especially the registry) should be something done
> in the C++ generator implementation and provided to CMake platform
> files as a variable.
> 
> For example, the VS generators always provide msbuild:
> 
> https://cmake.org/cmake/help/v3.5/variable/CMAKE_VS_MSBUILD_COMMAND.html
> 
> For the path to the compiler tool, take a look at
> 
> Modules/CompilerId/VS-10.vcxproj.in
> 
> and use of it by Modules/CMakeDetermineCompilerId.cmake.  That all
> runs while detecting the compiler id using a small test project.
> It has a custom command that searches the PATH in the IDE project
> build environment to print out the path to the compiler.  You should
> create one like this for CSharp too.
> 
> We'll also need to define behavior when CSharp is enabled by projects
> under a non-VS generator.  Other generators should reject any such
> attempt with an error message.
> 
> 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
-- 

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] Best way to show/include CMake files in IDE

[Eric Wing]

I have a bunch of .cmake support files in my project that I have split
off from CMakeLists.txt (using INCLUDE to combine them) to separate
concerns. (Source files, application assets, script files, platform
settings, codesigning, etc.)

This works, but they don't show up in IDEs (Visual Studio, Xcode,
etc). I realized it would be nice to see these files in the IDE and be
able to edit them there. (I assume the CMake bootstrap will still just
work.)

What is the best way to include/show these files in the IDE (and won't
break the Makefile or other non-IDE generators)?

Thanks,
Eric
-- 

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] patch for module GetPrerequisites

[Benjamin Ballet]

We have to call :
fixup_bundle("${CMAKE_INSTALL_PREFIX}/../test"...
to fix an optional test folder installed near the app.

verify_app will later compare a path like C:/program/app/../test to
C:/program/test and state they are inequal while they point to the same
file.
That's why I have to call get_filename_component(path "${path}" REALPATH)
just to force the convertion from C:/program/app/../test to C:/program/test

Thanks, hope I clearified

2016-03-07 19:07 GMT+01:00 Brad King :

> On 03/04/2016 12:17 PM, Benjamin Ballet wrote:
> > The fail occurs during verify_app in the function gp_resolved_file_type
> > from module GetPrerequisites. This function test if two paths are equal
> > without translating them to there canonical form before.
> [snip]
> >get_filename_component(original_path "${original_lower}" PATH)
> >get_filename_component(path "${lower}" PATH)
> > +  get_filename_component(original_path "${original_path}" REALPATH)
> > +  get_filename_component(path "${path}" REALPATH)
>
> This is operating on a string(TOLOWER)-converted path already.
> On case-sensitive filesystems it does not make sense to call
> REALPATH for these.  The code is doing string manipulation of
> the paths at this point.
>
> Please explain the case you're hitting in more detail.  How
> does one end up with a non-canonical path in the first place?
>
> Thanks,
> -Brad
>
>


-- 
*Benjamin BALLET*
Ingénieur R

*ACTIVISU*
19, rue Klock - 92110 Clichy
*> Standard Tél* :  01 44 69 37 37
*>* www.activisu.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] Support OpenBLAS in FindBLAS module

[Xavier Besseron]

Hi all,

Is there any update on this issue?
I believe this addition would be really useful.

Best regards,

Xavier



On Sat, Nov 29, 2014 at 4:12 AM, Rob Zumwalt  wrote:

> Apologies for the new thread, I just subscribed in order to comment on
> this, and didnt know how to reply in the existing thread.
>
> I am grateful to Xianyi for his addition of OpenBlasConfig.cmake, and I
> do recognize that this is the direction that projects should go when
> wanting to build CMake support for their users. The issue, as cgorac points
> out, is that other projects (LAPACK in this case) use FindBLAS.cmake inside
> their FindLAPACK.cmake files. So, in order to get FindLAPACK.cmake to work
> with OpenBLAS, it would require that the developers that maintain
> FindLAPACK.cmake change that file. The same would have to happen for any
> other projects that use FindBLAS.cmake.
>
> In short, CMake already has a “blessed” set of BLAS implementations (MKL,
> Intel, Goto, etc.), and it would be easier for users of LAPACK (and users
> of projects that use BLAS), if OpenBLAS were included in this set of CMake
> “blessed” BLAS implementations. Of course, OpenBLAS would still be happy to
> provide OpenBlasConfig.cmake (I am guessing) for users of OpenBLAS directly.
>
> Best Regards,
> Rob
>



-- 
Dr Xavier BESSERON
Research associate
FSTC, University of Luxembourg
Campus Kirchberg, Office E-007
Phone: +352 46 66 44 5418
http://luxdem.uni.lu/
-- 

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] how to keep rpath from build to install

[Xavier Besseron]

Hi Srinath,

I guess you will find what you need here:
https://cmake.org/Wiki/CMake_RPATH_handling

Best regards,

Xavier


On Mon, Mar 7, 2016 at 4:35 PM, Srinath Vadlamani <
srinath.vadlam...@gmail.com> wrote:

> Hello All,
>   How do I keep the rpath used during the build of an executable the same
> when I install that executable using INSTALL(TARGETS )?
>
> I do set :
>
> SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
>
> =
> Srinath Vadlamani
> =
>



-- 
Dr Xavier BESSERON
Research associate
FSTC, University of Luxembourg
Campus Kirchberg, Office E-007
Phone: +352 46 66 44 5418
http://luxdem.uni.lu/
-- 

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] Compile shared library and call it's functions

[Ivan]

Hello!
I hope someone could finally help me. I spent about two days to find solution 
for my problem, but with no luck.

Here is my problem:

I want to create a shared library (dll on Windows, .so on Linux, .dylib on OS 
X) that contains some functions. This library should export only these 
functions and nothing else. I guarantee that these function are pure C 
functions, so no C++ STL is needed to call them.

Then I want to create an application that call functions from the shared 
library mentioned above. I mean that the application should not have these 
functions inside. I want OS linker to link the application with the library at 
runtime, when it initializes the application. I know, how to do this on Windows 
with Visual Studio: create DLL project, write functions and compile, then there 
will be two files: .dll and .lib, link the .lib file with the application and 
at runtime Windows will find the .dll. But how can I do so with CMake?

Here is my CMakeLists.txt:

cmake_minimum_required(VERSION 3.3)
project(untitled19)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

set(LIBRARY_SRC library.cpp)

add_library(libra SHARED ${LIBRARY_SRC})

set(SOURCE_FILES main.cpp)
add_executable(untitled19 ${SOURCE_FILES})
target_link_libraries(untitled19 libra)

This works and both library and executable are compiled. Unfortunately library 
seems to be linked into the executable: ‘nm’ command shows that the executable 
itself exports needed functions!
I think there should be a solution for this, but I cannot find it. Can anyone 
help me?
For more clarification: I’m using OS X El Capitan.
——
Best regards, Ivan.


-- 

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] Proposed patch for 0014140: Ninja generator doesn't set version in dylib

[Bruce Stephens]

On Mon, Mar 7, 2016 at 8:06 PM, Brad King  wrote:
> On 03/07/2016 02:49 PM, Bruce Stephens wrote:
>> Moving the method into there worked cleanly.
>
> Thanks.  I split that into a separate commit:

Thanks. I wondered whether or not to do that separately.
-- 

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] Proposed patch for 0014140: Ninja generator doesn't set version in dylib

[Brad King]

On 03/07/2016 02:49 PM, Bruce Stephens wrote:
> Moving the method into there worked cleanly.

Thanks.  I split that into a separate commit:

 cmCommonTargetGenerator: Adopt AppendOSXVerFlag method
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f2b39c6

Then I applied the main change:

 Ninja: Add OS X dylib versioning (#14140)
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e165a64

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.0-rc3-346-g575399a

[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  575399afd14cace26a01e1aed65af8ca6bb9f15d (commit)
   via  9e165a64addbf997d5af58caccd2c93ec2c77a95 (commit)
   via  1f2b39c6ce390570ab3918b5e1169619394bb669 (commit)
  from  b6b5792286f9618cb4051585f534feb48f8a1b3f (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=575399afd14cace26a01e1aed65af8ca6bb9f15d
commit 575399afd14cace26a01e1aed65af8ca6bb9f15d
Merge: b6b5792 9e165a6
Author: Brad King 
AuthorDate: Mon Mar 7 15:04:56 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 15:04:56 2016 -0500

Merge topic 'ninja-osx-versions' into next

9e165a64 Ninja: Add OS X dylib versioning (#14140)
1f2b39c6 cmCommonTargetGenerator: Adopt AppendOSXVerFlag method


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e165a64addbf997d5af58caccd2c93ec2c77a95
commit 9e165a64addbf997d5af58caccd2c93ec2c77a95
Author: Bruce Stephens 
AuthorDate: Sat Feb 20 19:35:18 2016 +
Commit: Brad King 
CommitDate: Mon Mar 7 15:03:21 2016 -0500

Ninja: Add OS X dylib versioning (#14140)

Teach the Ninja generator to add the `-current_version` and the
`-compatibility_version` flags based on the VERSION and SOVERSION target
properties just as the Makefile generators do.

Signed-off-by: Bruce Stephens 

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx 
b/Source/cmNinjaNormalTargetGenerator.cxx
index 17561b5..c34df3c 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -504,6 +504,16 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   }
 }
 
+  // Add OS X version flags, if any.
+  if(this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+ this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
+{
+this->AppendOSXVerFlag(vars["LINK_FLAGS"], this->TargetLinkLanguage,
+   "COMPATIBILITY", true);
+this->AppendOSXVerFlag(vars["LINK_FLAGS"], this->TargetLinkLanguage,
+   "CURRENT", false);
+}
+
   this->addPoolNinjaVariable("JOB_POOL_LINK", , vars);
 
   this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f2b39c6ce390570ab3918b5e1169619394bb669
commit 1f2b39c6ce390570ab3918b5e1169619394bb669
Author: Bruce Stephens 
AuthorDate: Sat Feb 20 19:35:18 2016 +
Commit: Brad King 
CommitDate: Mon Mar 7 14:57:26 2016 -0500

cmCommonTargetGenerator: Adopt AppendOSXVerFlag method

Move this method from cmMakefileLibraryTargetGenerator so it can be
re-used for the Ninja generator too.

Signed-off-by: Bruce Stephens 

diff --git a/Source/cmCommonTargetGenerator.cxx 
b/Source/cmCommonTargetGenerator.cxx
index 76ed038..b5688a8 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -426,3 +426,35 @@ std::string cmCommonTargetGenerator::GetManifests()
 
   return cmJoin(manifests, " ");
 }
+
+void cmCommonTargetGenerator
+::AppendOSXVerFlag(std::string& flags, const std::string& lang,
+   const char* name, bool so)
+{
+  // Lookup the flag to specify the version.
+  std::string fvar = "CMAKE_";
+  fvar += lang;
+  fvar += "_OSX_";
+  fvar += name;
+  fvar += "_VERSION_FLAG";
+  const char* flag = this->Makefile->GetDefinition(fvar);
+
+  // Skip if no such flag.
+  if(!flag)
+{
+return;
+}
+
+  // Lookup the target version information.
+  int major;
+  int minor;
+  int patch;
+  this->GeneratorTarget->GetTargetVersion(so, major, minor, patch);
+  if(major > 0 || minor > 0 || patch > 0)
+{
+// Append the flag since a non-zero version is specified.
+std::ostringstream vflag;
+vflag << flag << major << "." << minor << "." << patch;
+this->LocalGenerator->AppendFlags(flags, vflag.str());
+}
+}
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index 0c17500..bfb6b79 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -79,6 +79,9 @@ protected:
   virtual void AddIncludeFlags(std::string& flags,
std::string const& lang) = 0;
 
+  void AppendOSXVerFlag(std::string& flags, const std::string& lang,
+const char* name, bool so);
+
   typedef std::map ByLanguageMap;
   std::string 

Re: [cmake-developers] Proposed patch for 0014140: Ninja generator doesn't set version in dylib

[Bruce Stephens]

On Mon, Mar 7, 2016 at 6:06 PM, Brad King  wrote:
> On 03/01/2016 04:58 PM, Bruce Stephens wrote:
>> I just copied the relevant code from the Makefiles generator.
>
> Thanks.  Instead of copying, please look at moving the relevant
> methods up to cmCommonTargetGenerator so it can be shared between
> the two generators instead.

Ah, thanks for the class name. I did look for a suitable one but for some reason
didn't spot that one (though the comment makes it obvious that it's suitable).

Moving the method into there worked cleanly.


0001-Add-OS-X-dylib-versioning-to-Ninja-generator.patch
Description: Binary data
-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] C# support ready for review

[Brad King]

On 02/25/2016 05:51 AM, Stuermer, Michael  SP/HZA-ZSEP wrote:
> The part that probably needs most additional work is all the
> C# detection and configuration part in the module scripts.

In your branch Modules/CMakeDetermineCSharpCompiler.cmake currently
has a lot of logic and environment checks for this.  It shouldn't
need to be that complicated.  Anything requiring deep introspection
of the system (especially the registry) should be something done
in the C++ generator implementation and provided to CMake platform
files as a variable.

For example, the VS generators always provide msbuild:

 https://cmake.org/cmake/help/v3.5/variable/CMAKE_VS_MSBUILD_COMMAND.html

For the path to the compiler tool, take a look at

 Modules/CompilerId/VS-10.vcxproj.in

and use of it by Modules/CMakeDetermineCompilerId.cmake.  That all
runs while detecting the compiler id using a small test project.
It has a custom command that searches the PATH in the IDE project
build environment to print out the path to the compiler.  You should
create one like this for CSharp too.

We'll also need to define behavior when CSharp is enabled by projects
under a non-VS generator.  Other generators should reject any such
attempt with an error message.

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.0-rc3-343-gb6b5792

[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  b6b5792286f9618cb4051585f534feb48f8a1b3f (commit)
   via  72e0dc58d3caf63a57975e97ce13c5dc4b38cf9b (commit)
  from  f10ee09337753fb072f7be49c8be76e702cd90fb (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=b6b5792286f9618cb4051585f534feb48f8a1b3f
commit b6b5792286f9618cb4051585f534feb48f8a1b3f
Merge: f10ee09 72e0dc5
Author: Brad King 
AuthorDate: Mon Mar 7 14:08:07 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 14:08:07 2016 -0500

Merge topic 'toolchain-file-project' into next

72e0dc58 Diagnose recursive project/enable_language without crashing 
(#15999)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72e0dc58d3caf63a57975e97ce13c5dc4b38cf9b
commit 72e0dc58d3caf63a57975e97ce13c5dc4b38cf9b
Author: Brad King 
AuthorDate: Mon Mar 7 13:31:25 2016 -0500
Commit: Brad King 
CommitDate: Mon Mar 7 13:52:38 2016 -0500

Diagnose recursive project/enable_language without crashing (#15999)

Calling `project()` or `enable_language()` from a toolchain file will
infinitely recurse since those commands load the toolchain file.
Diagnose and reject this case with an error message instead of crashing
when the stack eventually overflows.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 848028f..c628406 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -398,6 +398,21 @@ 
cmGlobalGenerator::EnableLanguage(std::vectorconst& languages,
 return;
 }
 
+  std::set cur_languages(languages.begin(), languages.end());
+  for (std::set::iterator li = cur_languages.begin();
+   li != cur_languages.end(); ++li)
+{
+if (!this->LanguagesInProgress.insert(*li).second)
+  {
+  std::ostringstream e;
+  e << "Language '" << *li << "' is currently being enabled.  "
+"Recursive call not allowed.";
+  mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+  cmSystemTools::SetFatalErrorOccured();
+  return;
+  }
+}
+
   if(this->TryCompileOuterMakefile)
 {
 // In a try-compile we can only enable languages provided by caller.
@@ -823,6 +838,12 @@ 
cmGlobalGenerator::EnableLanguage(std::vectorconst& languages,
 {
 cmSystemTools::SetFatalErrorOccured();
 }
+
+  for (std::set::iterator li = cur_languages.begin();
+   li != cur_languages.end(); ++li)
+{
+this->LanguagesInProgress.erase(*li);
+}
 }
 
 //
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 48fa704..6e819d3 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -457,6 +457,7 @@ private:
   // in EnableLanguagesFromGenerator
   std::map IgnoreExtensions;
   std::set LanguagesReady; // Ready for try_compile
+  std::set LanguagesInProgress;
   std::map OutputExtensions;
   std::map LanguageToOutputExtension;
   std::map ExtensionToLanguage;
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 5bef629..23b9b42 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -152,6 +152,7 @@ add_RunCMake_test(ObjectLibrary)
 add_RunCMake_test(Swift)
 add_RunCMake_test(TargetObjects)
 add_RunCMake_test(TargetSources)
+add_RunCMake_test(ToolchainFile)
 add_RunCMake_test(find_dependency)
 add_RunCMake_test(CompileDefinitions)
 add_RunCMake_test(CompileFeatures)
diff --git a/Tests/RunCMake/ToolchainFile/CMakeLists.txt 
b/Tests/RunCMake/ToolchainFile/CMakeLists.txt
new file mode 100644
index 000..93ee9df
--- /dev/null
+++ b/Tests/RunCMake/ToolchainFile/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.5)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ToolchainFile/CallEnableLanguage-result.txt 
b/Tests/RunCMake/ToolchainFile/CallEnableLanguage-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/ToolchainFile/CallEnableLanguage-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/ToolchainFile/CallEnableLanguage-stderr.txt 
b/Tests/RunCMake/ToolchainFile/CallEnableLanguage-stderr.txt
new file mode 100644
index 000..0de51c6
--- /dev/null
+++ b/Tests/RunCMake/ToolchainFile/CallEnableLanguage-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Error at CallEnableLanguage-toolchain.cmake:[0-9]+ 

Re: [cmake-developers] Proposed patch for 0014140: Ninja generator doesn't set version in dylib

[Brad King]

On 03/01/2016 04:58 PM, Bruce Stephens wrote:
> I just copied the relevant code from the Makefiles generator.

Thanks.  Instead of copying, please look at moving the relevant
methods up to cmCommonTargetGenerator so it can be shared between
the two generators instead.

Thanks,
-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [PATCH] Enable CMAKE_EXPORT_COMPILE_COMMANDS by default

[Brad King]

On 03/02/2016 04:36 AM, Richard Wiedenhöft wrote:
> The way I see it there is no downside to this and it spares me (and 
> hopefully others) from polluting my CMakeLists.txt with 
> "set(CMAKE_EXPORT_COMPILE_COMMANDS ON)" making them more readable.

The down side is it takes longer to generate and not everyone wants
the rules, especially in very large projects with lots of compilations.

There is ongoing discussion in other threads about improved IDE
and tooling integration.  In the long run that work will eliminate
the need for this option altogether.

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [PATCH] FindProtobuf: variable case matches module name

[Brad King]

On 03/01/2016 03:15 AM, Antonio Perez Barrero wrote:
> Use recommended case for variable names. i.e. matching name of the
> module as passed to `find_package`.
> 
> For backwards compatibility, the upper case versions of both input and
> output variables are used and defined when appropriate.

Thanks.  Applied with minor adjustments:

 FindProtobuf: Rename variables to match case of module name
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7b09e7f

-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] patch for module GetPrerequisites

[Brad King]

On 03/04/2016 12:17 PM, Benjamin Ballet wrote:
> The fail occurs during verify_app in the function gp_resolved_file_type
> from module GetPrerequisites. This function test if two paths are equal
> without translating them to there canonical form before.
[snip]
>get_filename_component(original_path "${original_lower}" PATH)
>get_filename_component(path "${lower}" PATH)
> +  get_filename_component(original_path "${original_path}" REALPATH)
> +  get_filename_component(path "${path}" REALPATH)

This is operating on a string(TOLOWER)-converted path already.
On case-sensitive filesystems it does not make sense to call
REALPATH for these.  The code is doing string manipulation of
the paths at this point.

Please explain the case you're hitting in more detail.  How
does one end up with a non-canonical path in the first place?

Thanks,
-Brad

-- 

Powered by www.kitware.com

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

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

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

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

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

Re: [cmake-developers] [PATCH v3] Add FindLTTngUST module to find LTTng-UST library

[Brad King]

On 02/29/2016 12:35 PM, Philippe Proulx wrote:
> This patch adds the FindLTTngUST module which can be used to find
> the LTTng-UST library. It sets result variables and creates an
> imported target, LTTng::UST.

Thanks, applied:

 Add FindLTTngUST module to find LTTng-UST library
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4194deb

-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.0-rc3-341-gf10ee09

[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  f10ee09337753fb072f7be49c8be76e702cd90fb (commit)
   via  a7b09e7f43fda0a459145053653a614330bf1fe1 (commit)
  from  3b0b7f74286d06da68578a1ec2d64c705eacb3b1 (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=f10ee09337753fb072f7be49c8be76e702cd90fb
commit f10ee09337753fb072f7be49c8be76e702cd90fb
Merge: 3b0b7f7 a7b09e7
Author: Brad King 
AuthorDate: Mon Mar 7 12:57:20 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 12:57:20 2016 -0500

Merge topic 'FindProtobuf-variable-case' into next

a7b09e7f FindProtobuf: Rename variables to match case of module name


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7b09e7f43fda0a459145053653a614330bf1fe1
commit a7b09e7f43fda0a459145053653a614330bf1fe1
Author: Antonio Perez Barrero 
AuthorDate: Tue Mar 1 09:15:19 2016 +0100
Commit: Brad King 
CommitDate: Mon Mar 7 12:56:25 2016 -0500

FindProtobuf: Rename variables to match case of module name

Use recommended case for variable names. i.e. matching name of the
module as passed to `find_package`.

For backwards compatibility, the upper case versions of both input and
output variables are used and defined when appropriate.  Skip this for
the _FOUND variable because FPHSA already does it.  Skip this for the
_VERSION variable because that was recently added and never available
with the old name in a release of CMake.

diff --git a/Help/release/dev/FindProtobuf-variable-case.rst 
b/Help/release/dev/FindProtobuf-variable-case.rst
new file mode 100644
index 000..0df00e7
--- /dev/null
+++ b/Help/release/dev/FindProtobuf-variable-case.rst
@@ -0,0 +1,7 @@
+FindProtobuf-variable-case
+--
+
+* The :module:`FindProtobuf` module input and output variables were all renamed
+  from ``PROTOBUF_`` to ``Protobuf_`` for consistency with other find modules.
+  Input variables of the old case will be honored if provided, and output
+  variables of the old case are always provided.
diff --git a/Help/release/dev/FindProtobuf-version.rst 
b/Help/release/dev/FindProtobuf-version.rst
index 2bfd9f4..40c2ff5 100644
--- a/Help/release/dev/FindProtobuf-version.rst
+++ b/Help/release/dev/FindProtobuf-version.rst
@@ -1,6 +1,6 @@
 FindProtobuf-version
 
 
-* The :module:`FindProtobuf` module learned to provide a ``PROTOBUF_VERSION``
+* The :module:`FindProtobuf` module learned to provide a ``Protobuf_VERSION``
   variable and check the version number requested in a :command:`find_package`
   call.
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 95e3b1e..8042073 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -6,51 +6,51 @@
 #
 # The following variables can be set and are optional:
 #
-# ``PROTOBUF_SRC_ROOT_FOLDER``
+# ``Protobuf_SRC_ROOT_FOLDER``
 #   When compiling with MSVC, if this cache variable is set
 #   the protobuf-default VS project build locations
 #   (vsprojects/Debug and vsprojects/Release
 #   or vsprojects/x64/Debug and vsprojects/x64/Release)
 #   will be searched for libraries and binaries.
-# ``PROTOBUF_IMPORT_DIRS``
+# ``Protobuf_IMPORT_DIRS``
 #   List of additional directories to be searched for
 #   imported .proto files.
-# ``PROTOBUF_DEBUG``
+# ``Protobuf_DEBUG``
 #   Show debug messages.
 #
 # Defines the following variables:
 #
-# ``PROTOBUF_FOUND``
+# ``Protobuf_FOUND``
 #   Found the Google Protocol Buffers library
 #   (libprotobuf & header files)
-# ``PROTOBUF_VERSION``
+# ``Protobuf_VERSION``
 #   Version of package found.
-# ``PROTOBUF_INCLUDE_DIRS``
+# ``Protobuf_INCLUDE_DIRS``
 #   Include directories for Google Protocol Buffers
-# ``PROTOBUF_LIBRARIES``
+# ``Protobuf_LIBRARIES``
 #   The protobuf libraries
-# ``PROTOBUF_PROTOC_LIBRARIES``
+# ``Protobuf_PROTOC_LIBRARIES``
 #   The protoc libraries
-# ``PROTOBUF_LITE_LIBRARIES``
+# ``Protobuf_LITE_LIBRARIES``
 #   The protobuf-lite libraries
 #
 # The following cache variables are also available to set or use:
 #
-# ``PROTOBUF_LIBRARY``
+# ``Protobuf_LIBRARY``
 #   The protobuf library
-# ``PROTOBUF_PROTOC_LIBRARY``
+# ``Protobuf_PROTOC_LIBRARY``
 #   The protoc library
-# ``PROTOBUF_INCLUDE_DIR``
+# ``Protobuf_INCLUDE_DIR``
 #   The include directory for protocol buffers
-# ``PROTOBUF_PROTOC_EXECUTABLE``
+# ``Protobuf_PROTOC_EXECUTABLE``
 #   The protoc compiler
-# ``PROTOBUF_LIBRARY_DEBUG``
+# ``Protobuf_LIBRARY_DEBUG``
 #   The protobuf library 

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-339-g3b0b7f7

[Zack Galbreath]

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  3b0b7f74286d06da68578a1ec2d64c705eacb3b1 (commit)
   via  2445d306211462d823bd906eddab3660b5703310 (commit)
  from  f6b21eb251c00c116827fa5824254d64caf6a21e (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=3b0b7f74286d06da68578a1ec2d64c705eacb3b1
commit 3b0b7f74286d06da68578a1ec2d64c705eacb3b1
Merge: f6b21eb 2445d30
Author: Zack Galbreath 
AuthorDate: Mon Mar 7 12:55:13 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 12:55:13 2016 -0500

Merge topic 'timeout_after_match' into next

2445d306 New test property: TIMEOUT_AFTER_MATCH


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2445d306211462d823bd906eddab3660b5703310
commit 2445d306211462d823bd906eddab3660b5703310
Author: Zack Galbreath 
AuthorDate: Thu Feb 18 13:59:18 2016 -0500
Commit: Zack Galbreath 
CommitDate: Mon Mar 7 11:47:56 2016 -0500

New test property: TIMEOUT_AFTER_MATCH

This allows us to change a test's timeout duration after we detect
a matching line in its output.

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index a41d484..eb489a2 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -302,6 +302,7 @@ Properties on Tests
/prop_test/RUN_SERIAL
/prop_test/SKIP_RETURN_CODE
/prop_test/TIMEOUT
+   /prop_test/TIMEOUT_AFTER_MATCH
/prop_test/WILL_FAIL
/prop_test/WORKING_DIRECTORY
 
diff --git a/Help/prop_test/TIMEOUT_AFTER_MATCH.rst 
b/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
new file mode 100644
index 000..c8883e3
--- /dev/null
+++ b/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
@@ -0,0 +1,33 @@
+TIMEOUT_AFTER_MATCH
+---
+
+Change a test's timeout duration after a matching line is encountered
+in its output.
+
+Usage
+^
+
+.. code-block:: cmake
+
+ add_test(mytest ...)
+ set_property(TEST mytest PROPERTY TIMEOUT_AFTER_MATCH "${seconds}" "${regex}")
+
+Description
+^^^
+
+The test's timeout duration is changed to ``seconds`` after it outputs
+a line that matches ``regex``.  Prior to this, the timeout duration is
+determined by the :prop_test:`TIMEOUT` property or the
+:variable:`CTEST_TEST_TIMEOUT` variable if either of these are set.
+
+:prop_test:`TIMEOUT_AFTER_MATCH` is useful for avoiding spurious
+timeouts when your test must wait for some system resource to become
+available before it can execute.  Set :prop_test:`TIMEOUT` to a longer
+duration that accounts for resource acquisition and use
+:prop_test:`TIMEOUT_AFTER_MATCH` to control how long the actual test
+is allowed to run.
+
+If the required resource can be controlled by CTest you should use
+:prop_test:`RESOURCE_LOCK` instead of :prop_test:`TIMEOUT_AFTER_MATCH`.
+This property should be used when only the test itself can determine
+when its required resources are available.
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index d108592..c1984cf 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -64,6 +64,27 @@ bool cmCTestRunTest::CheckOutput()
  this->GetIndex() << ": " << line << std::endl);
   this->ProcessOutput += line;
   this->ProcessOutput += "\n";
+
+  // Check for TIMEOUT_AFTER_MATCH property.
+  if (!this->TestProperties->TimeoutRegularExpressions.empty())
+{
+std::vector >::iterator regIt;
+for ( regIt = this->TestProperties->TimeoutRegularExpressions.begin();
+  regIt != this->TestProperties->TimeoutRegularExpressions.end();
+  ++ regIt )
+  {
+  if ( regIt->first.find(this->ProcessOutput.c_str()) )
+{
+cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+   "Test timeout changed to " <<
+   this->TestProperties->AlternateTimeout << std::endl);
+this->TestProcess->ChangeTimeout(
+  this->TestProperties->AlternateTimeout);
+break;
+}
+  }
+}
   }
 else // if(p == cmsysProcess_Pipe_Timeout)
   {
diff --git a/Source/CTest/cmCTestTestHandler.cxx 
b/Source/CTest/cmCTestTestHandler.cxx
index b6a4819..59ed98e 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -2254,6 +2254,31 @@ bool cmCTestTestHandler::SetTestsProperties(
 {
 

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-337-gf6b21eb

[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  f6b21eb251c00c116827fa5824254d64caf6a21e (commit)
   via  a4194debea02e723d21f6db83a4528254d885f13 (commit)
  from  c8d860b991a73dd5206125b747ccda87aa68c0d2 (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=f6b21eb251c00c116827fa5824254d64caf6a21e
commit f6b21eb251c00c116827fa5824254d64caf6a21e
Merge: c8d860b a4194de
Author: Brad King 
AuthorDate: Mon Mar 7 11:50:12 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 11:50:12 2016 -0500

Merge topic 'add-FindLTTngUST' into next

a4194deb Add FindLTTngUST module to find LTTng-UST library


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4194debea02e723d21f6db83a4528254d885f13
commit a4194debea02e723d21f6db83a4528254d885f13
Author: Philippe Proulx 
AuthorDate: Mon Feb 29 12:35:27 2016 -0500
Commit: Brad King 
CommitDate: Mon Mar 7 11:46:49 2016 -0500

Add FindLTTngUST module to find LTTng-UST library

Also detect the library version number.  Provide results as variables
and as an imported target, LTTng::UST.

Signed-off-by: Philippe Proulx 

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 10f05df..62910cf 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -135,6 +135,7 @@ All Modules
/module/FindLibLZMA
/module/FindLibXml2
/module/FindLibXslt
+   /module/FindLTTngUST
/module/FindLua50
/module/FindLua51
/module/FindLua
diff --git a/Help/module/FindLTTngUST.rst b/Help/module/FindLTTngUST.rst
new file mode 100644
index 000..a775462
--- /dev/null
+++ b/Help/module/FindLTTngUST.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/FindLTTngUST.cmake
diff --git a/Help/release/dev/add-FindLTTngUST.rst 
b/Help/release/dev/add-FindLTTngUST.rst
new file mode 100644
index 000..a156cc8
--- /dev/null
+++ b/Help/release/dev/add-FindLTTngUST.rst
@@ -0,0 +1,5 @@
+add-FindLTTngUST
+
+
+* The :module:`FindLTTngUST` module was introduced to find the LTTng-UST
+  library.
diff --git a/Modules/FindLTTngUST.cmake b/Modules/FindLTTngUST.cmake
new file mode 100644
index 000..e3220ac
--- /dev/null
+++ b/Modules/FindLTTngUST.cmake
@@ -0,0 +1,111 @@
+#.rst:
+# FindLTTngUST
+# 
+#
+# This module finds the `LTTng-UST `__ library.
+#
+# Imported target
+# ^^^
+#
+# This module defines the following :prop_tgt:`IMPORTED` target:
+#
+# ``LTTng::UST``
+#   The LTTng-UST library, if found
+#
+# Result variables
+# 
+#
+# This module sets the following
+#
+# ``LTTNGUST_FOUND``
+#   ``TRUE`` if system has LTTng-UST
+# ``LTTNGUST_INCLUDE_DIRS``
+#   The LTTng-UST include directories
+# ``LTTNGUST_LIBRARIES``
+#   The libraries needed to use LTTng-UST
+# ``LTTNGUST_VERSION_STRING``
+#   The LTTng-UST version
+# ``LTTNGUST_HAS_TRACEF``
+#   ``TRUE`` if the ``tracef()`` API is available in the system's LTTng-UST
+# ``LTTNGUST_HAS_TRACELOG``
+#   ``TRUE`` if the ``tracelog()`` API is available in the system's LTTng-UST
+
+#=
+# Copyright 2016 Kitware, Inc.
+# Copyright 2016 Philippe Proulx 
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+find_path(LTTNGUST_INCLUDE_DIRS NAMES lttng/tracepoint.h)
+find_library(LTTNGUST_LIBRARIES NAMES lttng-ust)
+
+if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_LIBRARIES)
+  # find tracef() and tracelog() support
+  set(LTTNGUST_HAS_TRACEF 0)
+  set(LTTNGUST_HAS_TRACELOG 0)
+
+  if(EXISTS "${LTTNGUST_INCLUDE_DIRS}/lttng/tracef.h")
+set(LTTNGUST_HAS_TRACEF TRUE)
+  endif()
+
+  if(EXISTS "${LTTNGUST_INCLUDE_DIRS}/lttng/tracelog.h")
+set(LTTNGUST_HAS_TRACELOG TRUE)
+  endif()
+
+  # get version
+  set(lttngust_version_file "${LTTNGUST_INCLUDE_DIRS}/lttng/ust-version.h")
+
+  if(EXISTS "${lttngust_version_file}")
+file(STRINGS "${lttngust_version_file}" lttngust_version_major_string
+ REGEX "^[\t 

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-335-gc8d860b

[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  c8d860b991a73dd5206125b747ccda87aa68c0d2 (commit)
   via  743f2a803143e8947df007048bdd3780722ead58 (commit)
  from  365fb19ffc683351fff43b06d19f3834e8468b35 (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=c8d860b991a73dd5206125b747ccda87aa68c0d2
commit c8d860b991a73dd5206125b747ccda87aa68c0d2
Merge: 365fb19 743f2a8
Author: Brad King 
AuthorDate: Mon Mar 7 11:01:39 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 11:01:39 2016 -0500

Merge topic 'doc-find-python-call-order' into next

743f2a80 FindPython{Interp,Libs}: Clarify recommended call order


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=743f2a803143e8947df007048bdd3780722ead58
commit 743f2a803143e8947df007048bdd3780722ead58
Author: Brad King 
AuthorDate: Mon Mar 7 10:56:31 2016 -0500
Commit: Brad King 
CommitDate: Mon Mar 7 10:56:31 2016 -0500

FindPython{Interp,Libs}: Clarify recommended call order

Improve wording in our advice about how to call both of these modules.

diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 879192e..e194185 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -28,9 +28,10 @@
 # for Python.  You need to set this variable before calling
 # find_package(PythonInterp).
 #
-# If also calling find_package(PythonLibs), call find_package(PythonInterp)
-# first to get the currently active Python version by default with a consistent
-# version of PYTHON_LIBRARIES.
+# If calling both ``find_package(PythonInterp)`` and
+# ``find_package(PythonLibs)``, call ``find_package(PythonInterp)`` first to
+# get the currently active Python version by default with a consistent version
+# of PYTHON_LIBRARIES.
 
 #=
 # Copyright 2005-2010 Kitware, Inc.
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 68e1228..ab92f86 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -32,9 +32,10 @@
 #   PYTHON_LIBRARY - path to the python library
 #   PYTHON_INCLUDE_DIR - path to where Python.h is found
 #
-# If also calling find_package(PythonInterp), call find_package(PythonInterp)
-# first to get the currently active Python version by default with a consistent
-# version of PYTHON_LIBRARIES.
+# If calling both ``find_package(PythonInterp)`` and
+# ``find_package(PythonLibs)``, call ``find_package(PythonInterp)`` first to
+# get the currently active Python version by default with a consistent version
+# of PYTHON_LIBRARIES.
 
 #=
 # Copyright 2001-2009 Kitware, Inc.

---

Summary of changes:
 Modules/FindPythonInterp.cmake |7 ---
 Modules/FindPythonLibs.cmake   |7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)


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

[CMake] how to keep rpath from build to install

[Srinath Vadlamani]

Hello All,
  How do I keep the rpath used during the build of an executable the same
when I install that executable using INSTALL(TARGETS )?

I do set :

SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

=
Srinath Vadlamani
=
-- 

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-163-ge0751c4

[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  e0751c4d25bba7364a361a55fe31d1567b64e51f (commit)
   via  190a5fdffd8104ad613854bdd563a0a11dd88f63 (commit)
  from  4debd8beb11eaeb6968813f318a9fe0fc04324e6 (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=e0751c4d25bba7364a361a55fe31d1567b64e51f
commit e0751c4d25bba7364a361a55fe31d1567b64e51f
Merge: 4debd8b 190a5fd
Author: Brad King 
AuthorDate: Mon Mar 7 10:02:37 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 10:02:37 2016 -0500

Merge topic 'enable-ssl-automatically'

190a5fdf Automatically use OpenSSL by default on Linux and FreeBSD if 
available


---

Summary of changes:
 CMakeLists.txt|   10 +-
 Help/release/dev/enable-ssl-automatically.rst |8 
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/enable-ssl-automatically.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.0-rc3-171-g8256d02

[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  8256d021c8324779c7269658a094848ebeafb82e (commit)
   via  3906ca5af4ade1c8f57e4067b07fb03a305dd39d (commit)
  from  7fc8e4d36d7f198ead73fda577f73bdf650b0c99 (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=8256d021c8324779c7269658a094848ebeafb82e
commit 8256d021c8324779c7269658a094848ebeafb82e
Merge: 7fc8e4d 3906ca5
Author: Brad King 
AuthorDate: Mon Mar 7 10:02:47 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 10:02:47 2016 -0500

Merge topic 'BundleUtilities-dylib-in-framework'

3906ca5a BundleUtilities: Fix regression handling frameworks


---

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


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

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-331-gb5652bf

[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  b5652bfe6e4443fd380b6883a058f9852ff6b1ad (commit)
   via  8256d021c8324779c7269658a094848ebeafb82e (commit)
   via  7fc8e4d36d7f198ead73fda577f73bdf650b0c99 (commit)
   via  cfb4d7736e030c08d047153da635b61ca97e3135 (commit)
   via  9fcc8ff455a81379b0eec58b4f763d7699916171 (commit)
   via  e0751c4d25bba7364a361a55fe31d1567b64e51f (commit)
   via  4debd8beb11eaeb6968813f318a9fe0fc04324e6 (commit)
   via  7cc8262823ec592dd1dc4691d77cf5fd8ea4e449 (commit)
   via  1bf42fa9b93d86fd62803fd934d3a946eddf3188 (commit)
   via  831801671c247a219a5c2bf785d7c62b6cdf3e61 (commit)
   via  f37f422a7fa062c3d744d0e82752839ab7f89b06 (commit)
   via  8913ccca435b2da47f79a219a10e69e45a492e14 (commit)
  from  38a68b755cb47d6eb75b9717de7003394139c28f (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=b5652bfe6e4443fd380b6883a058f9852ff6b1ad
commit b5652bfe6e4443fd380b6883a058f9852ff6b1ad
Merge: 38a68b7 8256d02
Author: Brad King 
AuthorDate: Mon Mar 7 10:03:03 2016 -0500
Commit: Brad King 
CommitDate: Mon Mar 7 10:03:03 2016 -0500

Merge branch 'master' into next


---

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


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

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-333-g365fb19

[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  365fb19ffc683351fff43b06d19f3834e8468b35 (commit)
   via  3f15665a4554efde8d80d6fac689dca187f520bc (commit)
  from  b5652bfe6e4443fd380b6883a058f9852ff6b1ad (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=365fb19ffc683351fff43b06d19f3834e8468b35
commit 365fb19ffc683351fff43b06d19f3834e8468b35
Merge: b5652bf 3f15665
Author: Brad King 
AuthorDate: Mon Mar 7 10:08:59 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 10:08:59 2016 -0500

Merge topic 'vs14-debug-enum-older-toolsets' into next

3f15665a VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f15665a4554efde8d80d6fac689dca187f520bc
commit 3f15665a4554efde8d80d6fac689dca187f520bc
Author: Brad King 
AuthorDate: Mon Mar 7 10:07:39 2016 -0500
Commit: Brad King 
CommitDate: Mon Mar 7 10:07:39 2016 -0500

VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index 769edac..c9c09fd 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2670,7 +2670,8 @@ 
cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   static_cast(this->GlobalGenerator);
 const char* toolset = gg->GetPlatformToolset();
 if (toolset &&
-(cmHasLiteralPrefix(toolset, "v110") ||
+(cmHasLiteralPrefix(toolset, "v100") ||
+ cmHasLiteralPrefix(toolset, "v110") ||
  cmHasLiteralPrefix(toolset, "v120")))
   {
   if (const char* debug = linkOptions.GetFlag("GenerateDebugInformation"))

---

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-169-g7fc8e4d

[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  7fc8e4d36d7f198ead73fda577f73bdf650b0c99 (commit)
   via  d4482dd9c9a5bb7e817ffe38941760d0492ad0d9 (commit)
  from  cfb4d7736e030c08d047153da635b61ca97e3135 (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=7fc8e4d36d7f198ead73fda577f73bdf650b0c99
commit 7fc8e4d36d7f198ead73fda577f73bdf650b0c99
Merge: cfb4d77 d4482dd
Author: Brad King 
AuthorDate: Mon Mar 7 10:02:45 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 10:02:45 2016 -0500

Merge topic 'wix-module-fixes'

d4482dd9 CPackWIX: Support binary-only WiX installations


---

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

[Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-167-gcfb4d77

[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  cfb4d7736e030c08d047153da635b61ca97e3135 (commit)
   via  b682debd65f07fb219a6a9c6b5fa5f42b468a845 (commit)
  from  9fcc8ff455a81379b0eec58b4f763d7699916171 (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=cfb4d7736e030c08d047153da635b61ca97e3135
commit cfb4d7736e030c08d047153da635b61ca97e3135
Merge: 9fcc8ff b682deb
Author: Brad King 
AuthorDate: Mon Mar 7 10:02:42 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 10:02:42 2016 -0500

Merge topic 'update-osx-release'

b682debd Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary


---

Summary of changes:
 Tests/CMakeLists.txt   |2 +-
 ...macmini5_release.cmake => bigmac_release.cmake} |   21 
 Utilities/Release/create-cmake-release.cmake   |2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)
 rename Utilities/Release/{dashmacmini5_release.cmake => bigmac_release.cmake} 
(55%)


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.0-rc3-165-g9fcc8ff

[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  9fcc8ff455a81379b0eec58b4f763d7699916171 (commit)
   via  6122909c33bea1256867a40a09e0eafa569e8c8b (commit)
  from  e0751c4d25bba7364a361a55fe31d1567b64e51f (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=9fcc8ff455a81379b0eec58b4f763d7699916171
commit 9fcc8ff455a81379b0eec58b4f763d7699916171
Merge: e0751c4 6122909
Author: Brad King 
AuthorDate: Mon Mar 7 10:02:40 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 10:02:40 2016 -0500

Merge topic 'vs-vcxproj-ConfigurationType'

6122909c VS: Add option to set `ConfigurationType` of a .vcxproj file


---

Summary of changes:
 Help/manual/cmake-properties.7.rst |1 +
 Help/prop_tgt/VS_CONFIGURATION_TYPE.rst|   10 +++
 Help/release/dev/vs-vcxproj-ConfigurationType.rst  |6 ++
 Source/cmVisualStudio10TargetGenerator.cxx |   78 +++-
 Tests/RunCMake/CMakeLists.txt  |4 +
 .../{AutoExportDll => VS10Project}/CMakeLists.txt  |2 +-
 Tests/RunCMake/VS10Project/RunCMakeTest.cmake  |2 +
 .../VS10Project/VsConfigurationType-check.cmake|   24 ++
 .../RunCMake/VS10Project/VsConfigurationType.cmake |3 +
 .../RunCMake/{XcodeProject => VS10Project}/foo.cpp |0
 10 files changed, 94 insertions(+), 36 deletions(-)
 create mode 100644 Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
 create mode 100644 Help/release/dev/vs-vcxproj-ConfigurationType.rst
 copy Tests/RunCMake/{AutoExportDll => VS10Project}/CMakeLists.txt (62%)
 create mode 100644 Tests/RunCMake/VS10Project/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/VS10Project/VsConfigurationType-check.cmake
 create mode 100644 Tests/RunCMake/VS10Project/VsConfigurationType.cmake
 copy Tests/RunCMake/{XcodeProject => VS10Project}/foo.cpp (100%)


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.0-rc3-319-g38a68b7

[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  38a68b755cb47d6eb75b9717de7003394139c28f (commit)
   via  3906ca5af4ade1c8f57e4067b07fb03a305dd39d (commit)
  from  c3f20a8861467bdf85322b184cf060c822d3b2c8 (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=38a68b755cb47d6eb75b9717de7003394139c28f
commit 38a68b755cb47d6eb75b9717de7003394139c28f
Merge: c3f20a8 3906ca5
Author: Brad King 
AuthorDate: Mon Mar 7 09:31:11 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Mar 7 09:31:11 2016 -0500

Merge topic 'BundleUtilities-dylib-in-framework' into next

3906ca5a BundleUtilities: Fix regression handling frameworks


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3906ca5af4ade1c8f57e4067b07fb03a305dd39d
commit 3906ca5af4ade1c8f57e4067b07fb03a305dd39d
Author: Clinton Stimpson 
AuthorDate: Tue Mar 1 15:48:14 2016 -0700
Commit: Brad King 
CommitDate: Mon Mar 7 09:30:18 2016 -0500

BundleUtilities: Fix regression handling frameworks

Fix logic error introduced in commit e422f738 (BundleUtilities: Fix
treatment of .dylib inside .framework folders, 2016-02-11).

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 73ff0af..4b52afa 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -479,7 +479,7 @@ function(set_bundle_key_values keys_var context item 
exepath dirs copyflag)
 
 get_item_rpaths("${resolved_item}" item_rpaths)
 
-if((item NOT MATCHES "\\.dylib$") AND (item MATCHES "[^/]+\\.framework/"))
+if((NOT item MATCHES "\\.dylib$") AND (item MATCHES "[^/]+\\.framework/"))
   # For frameworks, construct the name under the embedded path from the
   # opening "${item_name}.framework/" to the closing "/${item_name}":
   #

---

Summary of changes:


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

[CMake] install to CMAKE_BINARY_DIR fails if CC=icc

[ Jan Hegewald]

Dear CMakers,
I encountered a strange problem with my cmake setup:
In my CMakeLists.txt files there is a line

install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_BINARY_DIR})

Some of my projects use add_subdirectory, and with make install I "pull" them 
right to the build directory.
This used to work fine on several machines, even if the target is already built 
into the CMAKE_BINARY_DIR because I choose just to build this single 
CMakeLists.txt
Now this setup fails on a Red Hat Server, cmake 3.4.3 but ONLY if I switch the 
compiler form gcc to icc. In this case the target is removed during make 
install and make complains with

CMake Error at cmake_install.cmake:50 (file):
  file INSTALL cannot find "/foo/bar/installtest".

Is this an error, or is it not a good idea to specify the CMAKE_BINARY_DIR as 
install destination? Please share your thoughts about this.

Cheers,
Jan
-- 

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] Visual Studio + Ninja?

[Nagy-Egri Máté Ferenc via CMake]

Short version: no.

Long version: Visual Studio is heavily built around MSBuild as the back-end of 
execution of various tasks. While theoretically it could be done that MSBuild 
only acts as a relay and calls into Ninja scripts, you would lose the entire 
feature set of Solution Explorer, which is quite a large portion of the IDE. 
(Using CMake does preclude using most of it though.) MS is looking into deeper 
CMake integration into their IDE, but the exec back-end will most likely be 
MSBuild.

Should you really want to achieve this, you would need support from both CMake 
side and VS side. You would need to develop an Add-In with a custom project 
type (CMake+Ninja) and hook up most Solution Explorer entries to generate not 
MSBuild but Ninja script portions. And from CMake you would need a generator 
for this mixed generator type. It could be done, but it’s a lot of effort. 
Given the performance of MSBuild (which is not that bad compared to Ninja), the 
benefits would only be substantial in enourmous projects. MS generally looks 
into increasing build throughput by integrating IncrediBuild into their IDE.



Feladó: Robert Dailey
Elküldve: 2016. március 2., szerda 21:45
Címzett: CMake
Tárgy: [CMake] Visual Studio + Ninja?

Right now I am using a toolchain file to setup cmake to build my C++
code against Android NDK. I also have several custom targets for
running 'ant' commands for the java portions.

I can use the Ninja generator to generate the build scripts to make my
builds work fine. However, I'd love to be able to use Visual Studio on
Windows as my IDE. However, there is no "Visual Studio - Ninja"
generator that I can see. Is there a way to make Visual Studio wrap
the Ninja scripts and simply execute them? that way I can use it to
edit code and invoke builds.

Thanks in advance.
-- 

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