Re: [cmake-developers] [ANNOUNCE] CMake 3.16.0-rc2 is ready for testing

[Gregor Jasny via cmake-developers]

Hello,

On 20.10.19 19:25, Robert Maynard via cmake-developers wrote:

I am proud to announce the second CMake 3.16 release candidate.
   https://cmake.org/download/


CMake 3.16.0-rc2 successfully builds and tests our two large mono-repos.

I'm looking forward to the release!

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:
https://cmake.org/mailman/listinfo/cmake-developers

Re: [CMake] optional parameters in add_custom_target?

[Gregor Jasny via CMake]

Hello,

On 20.05.19 16:01, hex wrote:

What means command1 [args1...]]? Or, should this read

*add_custom_target(Name [ALL] [COMMAND command1 [args1...]]**
**   [COMMAND command2 [args2...] ...]*


I believe this is due to backward compatibility (pre 2.6) reasons so 
that you could still write:


add_custom_target(sometarget /bin/true)

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:
https://cmake.org/mailman/listinfo/cmake

Re: [CMake] Why is the binary md5sum value different?

[Gregor Jasny via CMake]

On 17.05.19 02:53, Gelryun wrote:

I write MakefileList.txt like this.


include_directories(${COMMINC_DIR} ${DBINC_DIR} ./)
link_directories(${DBLIB_DIR} ${COMMLIB_DIR})

set(DBUSERID withdb/ufdb)
PREPROCESS_ORACLE_FILES(ACK_db.pc ${DBUSERID} "${DBINC_DIR};${COMMINC_DIR}")

set(ACK_P_SRCS
 ACK_db.c ACK_p.c)

set(ACK_C_SRCS
 ACK_db.c ACK_c.c)

add_executable(ACK_p ${ACK_P_SRCS})
add_executable(ACK_c ${ACK_C_SRCS})
...
When I install it, the md5sum value of the binaries there is different.

Why is the binary md5sum value different?


This is probably due to rpaths being re-written (see 
https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling).


You could use 
https://manpages.debian.org/testing/diffoscope/diffoscope.1.en.html to 
find out differences between two binaries.


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:
https://cmake.org/mailman/listinfo/cmake

Re: [CMake] Fwd: CMAKE_HOST_SYSTEM_NAME is empty

[Gregor Jasny via CMake]

Hello,

On 25.04.19 09:29, Orban, Laszlo wrote:
Please help me an issue I'm facing with CMAKE_HOST_SYSTEM_NAME on 
FreeBSD 10.3. It gives back empty string, if I read it before the 
'project(...)'.
As far as I understood, CMAKE_SYSTEM_NAME can be used only after the 
'project(...)' call, but CMAKE_HOST_SYSTEM_NAME should simply give back 

>

Additional info:

$ cmake --version
cmake version 3.4.1


In CMake 3.9.0 and later I made CMAKE_HOST_SYSTEM_NAME available in 
scritping context (which should also make it available prior to a 
project() call).


Change:
https://gitlab.kitware.com/cmake/cmake/merge_requests/499

Could you please re-try with latest CMake?

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:
https://cmake.org/mailman/listinfo/cmake

[cmake-developers] How to speed up CMake configuration on macOS

[Gregor Jasny via cmake-developers]

Hello,

in the past when building CMake (itself) I spent long times waiting for 
configuration of the embedded libraries. Mostly libcurl send / receive 
signature detection. Today I had the idea of using system libraries 
installed with Homebrew and the speedups are quite noticeable:


You first need to install all required packages:

brew install curl expat jsoncpp libarchive rhash libuv xz zstd

Then configure with:
  -DCMAKE_USE_SYSTEM_LIBRARIES=ON
  -DLibArchive_ROOT=$(brew --prefix libarchive)

Speeup:

  embeddedsystem
  Ninja   103s   14s
  Xcode   749s   67s

Cheers,
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:
https://cmake.org/mailman/listinfo/cmake-developers

Re: [CMake] CMake Project Generation Speedup

[Gregor Jasny via CMake]

Hello,

On 17.11.16 17:15, Damian wrote:
We are still in the process of switching our large Make-based build to 
CMake. One of the issues we're running into is the time it takes to 
reparse and regenerate the CMake project (whether ninja, VS, or make) 
after touching any CMake file. To give you an idea, we have about 1000 
targets and that takes a good 2 min for CMake to rerun.


Are there any plans to speed this up?


CMake VisualStudio and Xcode generator generates one solution / 
xcodeproj per project() commmand. Due to the shared vcxproj files this 
is not too expensive for Visual Studio. But for Xcode it is. You can 
disable that behavior by specifying


  -DCMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY=ON

on the command line.

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:
https://cmake.org/mailman/listinfo/cmake

[cmake-developers] Specification for CTest XML format

[Gregor Jasny via cmake-developers]

Hello,

I'm wondering if there is a specification for the XML test output file 
produced by CTest?


Some background: For a dashboard we'd like to know in which 
CMakeLists.txt a test was created. For that we use the Path tag. Here 
the baz test was declared in subdir/CMakeLists.txt



baz
./subdir
./subdir/baz

/Users/gjasny/Git/Experimental/PP-970-test-case/_build/main


But if I change the WORKING_DIRECTORY property of a test


add_test(NAME custom_workdir COMMAND main)
set_property(TEST custom_workdir PROPERTY WORKING_DIRECTORY /tmp)


it suddenly affects the Path:


custom_workdir
/tmp
/tmp/custom_workdir

/Users/gjasny/Git/Experimental/PP-970-test-case/_build/main


What is Path and FullName supposed to contain?

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:
https://cmake.org/mailman/listinfo/cmake-developers

Re: [cmake-developers] [ANNOUNCE] CMake 3.14.0-rc3 is ready for testing

[Gregor Jasny via cmake-developers]

Hello,

On 01.03.19 20:28, Robert Maynard via cmake-developers wrote:

I am proud to announce the third CMake 3.14 release candidate.


All problems observed with -rc1 and -rc2 have been solved. The rc3 works 
as expected for our multi-platform mono repository.


Thanks for all your hard work!

-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:
https://cmake.org/mailman/listinfo/cmake-developers

Re: [cmake-developers] Properly Documenting a CMake Module

[Gregor Jasny via cmake-developers]

Hello,

On 14.02.19 04:39, Timothy Wrona wrote:
Okay so I dug a little deeper into this and it definitely looks like 
sphinx is the correct tool to use, but I still have one problem.


I would like sphinx to be able to extract ".rst" formatted comments 
directly out of my cmake source files to produce the documentation but I 
can't seem to figure out how.


The standard modules that ship with cmake all have this ".rst" section 
at the top that seems to magically get extracted and turned into online 
documentation with sphinx, but I just can't figure out how they do it.


The standard modules have a shadow hierarchy at Help/module. For example

https://gitlab.kitware.com/cmake/cmake/blob/master/Help/module/GNUInstallDirs.rst

contains

.. cmake-module:: ../../Modules/GNUInstallDirs.cmake

There's no magic happening.

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:
https://cmake.org/mailman/listinfo/cmake-developers

Re: [CMake] The Xcode generator and ASM_NASM support

[Gregor Jasny via CMake]

Hello,


On 10/3/18 6:08 PM, Tom Finegan via CMake wrote:

I'm trying to get rid of some local CMake scripting for building assembly
with nasm and yasm, but I'm running into a problem with the Xcode generator.

For the make and ninja generators, everything is fine-- nasm and yasm are
both working as expected.

The same is not true for Xcode. When building a target that includes
assembly files Xcode outputs the warnings like the following during its
"Check dependencies" step:

warning: no rule to process file  of type sourcecode for
architecture x86_64


If the Xcode included nasm and the default Xcode flags are good enough 
for you you might get away with:


set_source_files_properties(${yasm_file} PROPERTIES
  XCODE_EXPLICIT_FILE_TYPE "sourcecode.nasm")

Otherwise I had to create a add_custom_command for every file and 
pointed to a shell script that based on all architectures found in ARCHS 
ran yasm and in the end called lipo to create the final fat .o file.


Hope that helps,
-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:
https://cmake.org/mailman/listinfo/cmake

Re: [cmake-developers] RfD: deprecate link_directories() and link_libraries()

[Gregor Jasny via cmake-developers]

Hello,

On 20.08.18 19:10, Brad King wrote:

On 08/15/2018 01:30 PM, Rolf Eike Beer wrote:

My dislike against these functions is probably known, and now I would like to
bring this to a new level: I would like to formally deprecate these functions.
I don't think they serve any useful purpose anymore, given that now even the
pkg-config module can (and does) return absolute paths to the libraries.


What harm does their presence cause?

Please ask on the user list to see if people are using them.

I suspect they may be used by some projects to link to special runtime
libraries when cross-compiling.  We'd need to make sure there is a
better way for all such use cases before deprecating the commands.


We use link_directories() on Windows to give the windows linker the path 
to the boost libraries. Those use '#pragma comment lib' to link required 
libs.


How would one deal with '#pragma comment lib' w/o link_directories()?

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:
https://cmake.org/mailman/listinfo/cmake-developers

Re: [CMake] CMake update for older PPC7

[Gregor Jasny via CMake]

Hello,

On 6/20/18 3:10 AM, A. Sanchez via CMake wrote:
> Hello. I have been trying to get a good version of CMake for my PS3 cluster 
> running linux. But everything I try to compile needs CMake 3.0 or higher? Is 
> there any way to update from CMAKE 2.4. Right now I am running Fedora 9, 
> since PPC is sort of out of date, but I can run Debian Jessie if the system 
> needs to be up to date.

I believe you have two options:
1) Use debian Jessie backports which will give you CMake 3.6:

https://packages.debian.org/search?keywords=cmake=names=all=jessie-backports

2) Compile it yourself. CMake is self-contained so compilation should be
relatively easy. Please note that latest versions depend on a C++11
compatible toolchain. There is a boostrap script to compile CMake
without CMake and break the dependency cycle.

Hope that helps,
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:
https://cmake.org/mailman/listinfo/cmake

Re: [cmake-developers] iOS friendly CMake

[Gregor Jasny via cmake-developers]

Hi,

On 1/16/18 11:19 AM, Gregor Jasny wrote:
> I created a CMake branch where I attempt to provide an easy way to
> configure CMake projects for iOS (and all other Xcode SDKs).

I have a second revision of the patches.

Issue: https://gitlab.kitware.com/cmake/cmake/issues/17870
Branch:
https://gitlab.kitware.com/gjasny/cmake/commits/17870-iphone-friendly-cmake

It would be nice if you could give the branch a try. But please note the
list of open todos within the issue.

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:
https://cmake.org/mailman/listinfo/cmake-developers

[cmake-developers] iOS friendly CMake

[Gregor Jasny via cmake-developers]

Hi,

I created a CMake branch where I attempt to provide an easy way to 
configure CMake projects for iOS (and all other Xcode SDKs).


All you need to build for iOS is:

cmake -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_SYSROOT=iphoneos -GXcode .

In case you build code that must be code signed also add your 
development team: -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ABCDEFG


The merge request is here:
https://gitlab.kitware.com/cmake/cmake/merge_requests/1664

Please give it a try and add any comments you have to the merge 
requests. I only tested it with Xcode 9 on High Sierra so far.


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:
https://cmake.org/mailman/listinfo/cmake-developers

Re: [CMake] How to refer to *.so files in Android NDK?

[Gregor Jasny via CMake]

On 6/22/17 4:01 PM, Robert Dailey wrote:
> In my toolchain file for Android NDK, I specify the following *.so
> paths manually:
> 
> set( ANDROID_PREBUILT_LIBRARIES
> 
> ${CMAKE_ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_shared.so
> ${CMAKE_ANDROID_NDK}/platforms/android-15/arch-x86/usr/lib/libz.so
> )
> 
> However, I'd like a better way to find these files: I already
> configure CMake 3.8 using built-in Android support. It's able to
> configure my toolchain just fine. Can I leverage some built-in
> functionality to get the path to these files? I'm worried with the way
> it is, if I change the other variables that the paths won't be valid
> anymore and I'll have to update them manually again.

I would suggest that you dump all cmake variables and have a look what's
matching your paths:

get_cmake_property(_variableNames VARIABLES)
foreach (_variableName ${_variableNames})
message(STATUS "${_variableName}=${${_variableName}}")
endforeach()

Hope that helps!

Cheers,
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

Re: [CMake] Xcode duplicate filename issue?

[Gregor Jasny via CMake]

Hello,

On 6/26/17 8:12 PM, Watson, Andre wrote:
> We're currently migrating a huge internal system over to CMake, and we're 
> nearing completion, but have run into an issue with the generated Xcode 
> projects.  We build this system on Windows, Linux, and Mac (both makefile and 
> Xcode).  On all systems, we have a third party directory that has a couple of 
> duplicate source names within a single CMakeLists.txt file.  On Windows, 
> Linux, and makefile Mac, our projects all generate, build, and link 
> successfully.  However, on Xcode Mac, our project builds, but fails to link.  
> On further inspection, the duplicate filenames are being generated into the 
> intermediate build directories as filenames such as 
> attributes-78663048C12E97C.o and attributes-FA2B54357D684A6E.o.  The linker, 
> however, is looking for attributes.o.  It appears that the compiling process 
> is recognizing the duplicate naming and adding on the hex string (the non 
> duplicate .o's do not have these strings), but that these new filenames are 
> not being passed to the linker.  Is this is
  an Xcode option that I am missing, or this something occurring within the 
CMake project generation that is causing is mismatch?

could you please try to create a minimal example and file a bug report?
I'll have a look then.

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

[cmake-developers] Help needed: debug a xcodebuild hang

[Gregor Jasny via cmake-developers]

Hello,

In issue #16752 [1] a hanging xcodebuild during try_compile is reported.
Currently I cannot manage to find the spare time it takes to handle all
CMake issues in a timely manner.

Is anyone willing to help debugging this issue and/or filing a rdar://
report? Maybe someone also knows someone working in the Xcode team.

Any help is appreciated!

Thanks,
Gregor

[1] https://gitlab.kitware.com/cmake/cmake/issues/16752
-- 

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] Nighly build of CMake release branch available?

[Gregor Jasny via cmake-developers]

Hello,

I wonder if a nightly (or on-demand) build of the CMake release branch 
is available somewhere as it is for the master branch. That would help 
me testing those snapshots within our companies projects.


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] ZERO_CHECK generation and Xcode

[Gregor Jasny via CMake]

On 3/29/17 10:15 PM, Steven Velez wrote:
> I do have a pretty large project with around 142 targets.
> 
> Another characteristic of note, and which I noticed while investigating
> this is that our project suffers from
> https://gitlab.kitware.com/cmake/cmake/issues/14297, and I think it is
> because we have "project" declarations underneath the top-level... so
> ZERO_CHECK builds concurrently with other targets.

Oh boy. Thanks for pointing this out.

> I did create an xcode scheme that builds a smaller set of targets (6), and
> made sure that they all depended on ZERO_CHECK, and then ZERO_CHECK ran by
> itself, and it appeared that after a single test, it did manage to complete
> updating so that it did not run on subsequent invocations.

I'll have a look.
-- 

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] Email addresses of Mantis bug reporters

[Gregor Jasny via cmake-developers]

Hello,

while walking through old bug reports contacting the reporters by email
would be helpful sometimes. Is there a way for me access this
information in Mantis?

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] ZERO_CHECK generation and Xcode

[Gregor Jasny via CMake]

Hi Steven,

On 3/29/17 5:24 PM, Steven Velez wrote:
> If I understand correctly the purpose of the ZERO_CHECK target is to update
> the generated project files when necessary.
> 
> That's fine, but I have noticed on Xcode (8.2) that when ZERO_CHECK runs
> and updates the project, it causes the xcode build to abort.
> Unfortunately, it seems this build abort happens before the xcode project
> regeneration has a chance to complete and update/touch
> CMakeFiles/cmake.check_cache, so once the target is out of date, it pretty
> much stays that way, and the builds are always (or least frequently)
> subsequently aborted because of an update to generated project files.
> 
> If I go in to the terminal and manually execute "make -f ReRunCMake.make"
> then the process completes and the ZERO_CHECK target is good, and it does
> not run any more.
> 
> Is there any known way to deal with this other than by specifying
> CMAKE_SUPRRESS_REGENERATION:BOOL=YES ?

Could you please file a bug about this? I'll take a look during the 3.9
development cycle. Do you have a rather large or small project?

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

Re: [CMake] Multiple ELSE() clauses

[Gregor Jasny via CMake]

On 3/20/17 12:09 PM, Sergey Zakharchenko wrote:
> Rolf,
> 
> 2017-03-20 14:06 GMT+03:00 Rolf Eike Beer :
>> https://gitlab.kitware.com/cmake/cmake/issues/14335
> 
> Since the issue is marked "easy" and it's over 3 years old, I assume
> nobody cares? OK then.

https://gitlab.kitware.com/cmake/cmake/merge_requests/594


-- 

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] Multiple ELSE() clauses

[Gregor Jasny via CMake]

Hello,

On 20/03/2017 12:09, Sergey Zakharchenko wrote:

Rolf,

2017-03-20 14:06 GMT+03:00 Rolf Eike Beer :

https://gitlab.kitware.com/cmake/cmake/issues/14335


Since the issue is marked "easy" and it's over 3 years old, I assume
nobody cares? OK then.


I can try to fix it. I hope we don't need a new policy for that.

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

Re: [CMake] Missing 'undefined dynamic_lookup' flag

[Gregor Jasny via CMake]

On 3/12/17 6:45 PM, Gregor Jasny wrote:
> On 3/10/17 12:31 AM, Cedric Doucet wrote:
>> Actually, I should not modify CMAKE_CXX_COMPILER_FLAGS. 
>> It seems that the problem comes from the variable 
>> CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS which only contains ' -bundle 
>> -Wl,-headerpad_max_install_names' but not ' -undefined dynamic_lookup'. 
> 
> Please try:
> 
> TARGET_LINK_LIBRARIES(main "-undefined dynamic_lookup")

Meh. main should have been module. You could also try to add it to
CMAKE_SHARED_LINKER_FLAGS.

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

Re: [CMake] Missing 'undefined dynamic_lookup' flag

[Gregor Jasny via CMake]

Hello,

On 3/10/17 12:31 AM, Cedric Doucet wrote:
> Actually, I should not modify CMAKE_CXX_COMPILER_FLAGS. 
> It seems that the problem comes from the variable 
> CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS which only contains ' -bundle 
> -Wl,-headerpad_max_install_names' but not ' -undefined dynamic_lookup'. 

Please try:

TARGET_LINK_LIBRARIES(main "-undefined dynamic_lookup")

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

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-654-g7f38595

[Gregor Jasny via Cmake-commits]

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  7f38595c96edc9059776b1e8fe3b409f1082b45a (commit)
   via  54a48c6781dd02f2ebbdb19a77c9a4fb59e67735 (commit)
   via  f4977d056b2295679ce723c639f16823cfe489d5 (commit)
   via  7202db5db46bfe7499244af315249820e883c8cf (commit)
   via  5995082101a1959f303f9f3d6c0a1e483630749e (commit)
   via  6a54d28e44c3e539a0f6b45a5bdd748df5ef29ca (commit)
  from  0412b809f4d426ad1826c10e7f4b2d172906b0ee (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=7f38595c96edc9059776b1e8fe3b409f1082b45a
commit 7f38595c96edc9059776b1e8fe3b409f1082b45a
Merge: 0412b80 54a48c6
Author: Gregor Jasny 
AuthorDate: Wed Mar 1 05:13:29 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 1 05:13:29 2017 -0500

Merge topic 'xcode-enhance-schemes' into next

54a48c67 Xcode: Use proper buildable name for schema
f4977d05 Xcode: Select executable target for execution in schema
7202db5d Xcode: Fix schema container location calculation
59950821 Xcode: Do not autocreate schemes
6a54d28e Xcode: Use proper indentation for schemes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54a48c6781dd02f2ebbdb19a77c9a4fb59e67735
commit 54a48c6781dd02f2ebbdb19a77c9a4fb59e67735
Author: Gregor Jasny 
AuthorDate: Sat Feb 25 21:26:17 2017 +0100
Commit: Gregor Jasny 
CommitDate: Tue Feb 28 22:38:30 2017 +0100

Xcode: Use proper buildable name for schema

diff --git a/Source/cmXCodeScheme.cxx b/Source/cmXCodeScheme.cxx
index 1596e5c..5c22531 100644
--- a/Source/cmXCodeScheme.cxx
+++ b/Source/cmXCodeScheme.cxx
@@ -15,6 +15,7 @@ cmXCodeScheme::cmXCodeScheme(cmXCodeObject* xcObj,
  unsigned int xcVersion)
   : Target(xcObj)
   , TargetName(xcObj->GetTarget()->GetName())
+  , BuildableName(xcObj->GetTarget()->GetFullName())
   , TargetId(xcObj->GetId())
   , ConfigList(configList)
   , XcodeVersion(xcVersion)
@@ -87,7 +88,7 @@ void cmXCodeScheme::WriteBuildAction(cmXMLWriter& xout,
   xout.BreakAttributes();
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BlueprintIdentifier", this->TargetId);
-  xout.Attribute("BuildableName", this->TargetName);
+  xout.Attribute("BuildableName", this->BuildableName);
   xout.Attribute("BlueprintName", this->TargetName);
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.EndElement();
@@ -149,7 +150,7 @@ void cmXCodeScheme::WriteLaunchAction(cmXMLWriter& xout,
   xout.BreakAttributes();
   xout.Attribute("BuildableIdentifier", "primary");
   xout.Attribute("BlueprintIdentifier", this->TargetId);
-  xout.Attribute("BuildableName", this->TargetName);
+  xout.Attribute("BuildableName", this->BuildableName);
   xout.Attribute("BlueprintName", this->TargetName);
   xout.Attribute("ReferencedContainer", "container:" + container);
   xout.EndElement();
diff --git a/Source/cmXCodeScheme.h b/Source/cmXCodeScheme.h
index 470b5fd..0a8e737 100644
--- a/Source/cmXCodeScheme.h
+++ b/Source/cmXCodeScheme.h
@@ -26,6 +26,7 @@ public:
 private:
   const cmXCodeObject* const Target;
   const std::string& TargetName;
+  const std::string BuildableName;
   const std::string& TargetId;
   const std::vector& ConfigList;
   const unsigned int XcodeVersion;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4977d056b2295679ce723c639f16823cfe489d5
commit f4977d056b2295679ce723c639f16823cfe489d5
Author: Gregor Jasny 
AuthorDate: Fri Feb 24 18:47:58 2017 +0100
Commit: Gregor Jasny 
CommitDate: Tue Feb 28 22:38:29 2017 +0100

Xcode: Select executable target for execution in schema

diff --git a/Source/cmXCodeScheme.cxx b/Source/cmXCodeScheme.cxx
index e5031fd..1596e5c 100644
--- a/Source/cmXCodeScheme.cxx
+++ b/Source/cmXCodeScheme.cxx
@@ -13,7 +13,8 @@
 cmXCodeScheme::cmXCodeScheme(cmXCodeObject* xcObj,
  const std::vector& configList,
  unsigned int xcVersion)
-  : TargetName(xcObj->GetTarget()->GetName())
+  : Target(xcObj)
+  , TargetName(xcObj->GetTarget()->GetName())
   , TargetId(xcObj->GetId())
   , ConfigList(configList)
   , XcodeVersion(xcVersion)
@@ -135,7 +136,14 @@ void cmXCodeScheme::WriteLaunchAction(cmXMLWriter& xout,
   xout.Attribute("debugServiceExtension", "internal");
   xout.Attribute("allowLocationSimulation", "YES");
 
-  xout.StartElement("MacroExpansion");
+  if (IsExecutable(this->Target)) {
+

[cmake-developers] One Xcode project per project() call?

[Gregor Jasny via cmake-developers]

Hello,

I just noticed that the Xcode generator creates one xcode project per
project() call:

> $ find _build_xcode -name "*.xcodeproj" |grep -v CMakeFiles |grep -v Tests
> _build_xcode/CMake.xcodeproj
> _build_xcode/Source/CursesDialog/form/CMAKE_FORM.xcodeproj
> _build_xcode/Source/kwsys/cmsys.xcodeproj
> _build_xcode/Utilities/cmbzip2/bzip2.xcodeproj
> _build_xcode/Utilities/cmcompress/CMCompress.xcodeproj
> _build_xcode/Utilities/cmcurl/CURL.xcodeproj
> _build_xcode/Utilities/cmjsoncpp/JsonCpp.xcodeproj
> _build_xcode/Utilities/cmlibarchive/libarchive.xcodeproj
> _build_xcode/Utilities/cmliblzma/CMLIBLZMA.xcodeproj
> _build_xcode/Utilities/cmlibrhash/librhash.xcodeproj
> _build_xcode/Utilities/cmlibuv/libuv.xcodeproj
> _build_xcode/Utilities/cmzlib/CMZLIB.xcodeproj
> _build_xcode/Utilities/Doxygen/CMakeDeveloperReference.xcodeproj
> _build_xcode/Utilities/Sphinx/CMakeHelp.xcodeproj

Is that intentional?

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

[cmake-developers] Mirror CMake release files on GitHub?

[Gregor Jasny via cmake-developers]

Hello,

I noticed cmake.org is quite slow on serving release files. I seldom get
more than 300KB/s. So I wonder if it would make sense to publish the
CMake release tarballs and binaries not only on cmake.org but also on
github as part of the release process. (From GitHub I currently get 9 MB/s)

There seems to be a quite nice command line utility which supports
uploading files to releases, so that process should not involve too much
effort: https://github.com/aktau/github-release

What do you think?

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] Mac OS. Cmake changes it's behaviout when building framework for iOS simulator

[Gregor Jasny via CMake]

Hello,

On 02/02/2017 16:15, Сергей Бойцов wrote:

Hello.
I'm looking for some help cause i have faced a really strange problem
with building frameworks on Mac OS
So i have:

Mac OS X : el captain
Xcode 8.0
CMake 3.3.2 [1],
CMake 3.4.5 [2],
CMake 3.5-3.6 [3]



CMake [1] produced correct framework
CMake [2] produced incorrect Version folder that points to C but no C
folder is produced
CMake [3] produced no Version folder at all


In contrast to macOS bundles the iOS ones have a more flattened 
structure without Version links:


https://developer.apple.com/library/content/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/1123i-CH101-SW1

See also https://cmake.org/Bug/view.php?id=15833

So the CMake 3.5/3.6 behavior is the desired one. CMake versions before 
were buggy in that regard.


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

Re: [CMake] Using XCODE_PRODUCT_TYPE to make kexts

[Gregor Jasny via CMake]

Hello,

On 16/01/2017 15:43, Harry Mallon wrote:

Sorry look like it is not in the release build yet.


correct, please use a recent nightly:

https://cmake.org/files/dev/?C=M;O=D

Maybe you could report back if the attribute works for you.

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

[CMake] MSVC15 variable available for Visual Studio 2017

[Gregor Jasny via CMake]

Hello,

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



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


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




Thanks,
Gregor
--

Powered by www.kitware.com

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

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

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

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

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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1875-g040e28b

[Gregor Jasny via Cmake-commits]

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  040e28be7c196697a103e19725d1c9ef392d2471 (commit)
   via  fd466d3fd3070b36aadbd7457ddb644b33d40a61 (commit)
   via  2da3ae3bf76def94d3177f963703e3672ee27f1c (commit)
  from  f090b7818791116d3bd273403a91531e9a14d3fc (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=040e28be7c196697a103e19725d1c9ef392d2471
commit 040e28be7c196697a103e19725d1c9ef392d2471
Merge: f090b78 fd466d3
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 17:12:59 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 29 17:12:59 2016 -0500

Merge topic 'read-only-type-target-property' into next

fd466d3f cmTarget: Enforce TYPE being a read-only property
2da3ae3b CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd466d3fd3070b36aadbd7457ddb644b33d40a61
commit fd466d3fd3070b36aadbd7457ddb644b33d40a61
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 23:11:50 2016 +0100
Commit: Gregor Jasny 
CommitDate: Thu Dec 29 23:11:50 2016 +0100

cmTarget: Enforce TYPE being a read-only property

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ee4ff39..9261ca8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -858,6 +858,12 @@ void cmTarget::SetProperty(const std::string& prop, const 
char* value)
 this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
 return;
   }
+  if (prop == "TYPE") {
+std::ostringstream e;
+e << "TYPE property is read-only\n";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
+  }
   if (prop == "EXPORT_NAME" && this->IsImported()) {
 std::ostringstream e;
 e << "EXPORT_NAME property can't be set on imported targets (\""
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake 
b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 37c7124..1ddacee 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,4 +6,5 @@ run_cmake(COMPILE_OPTIONS)
 run_cmake(INCLUDE_DIRECTORIES)
 run_cmake(LINK_LIBRARIES)
 run_cmake(SOURCES)
+run_cmake(TYPE)
 run_cmake(USER_PROP)
diff --git a/Tests/RunCMake/set_property/TYPE-result.txt 
b/Tests/RunCMake/set_property/TYPE-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt 
b/Tests/RunCMake/set_property/TYPE-stderr.txt
new file mode 100644
index 000..6226051
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-stderr.txt
@@ -0,0 +1 @@
+TYPE property is read-only
\ No newline at end of file
diff --git a/Tests/RunCMake/set_property/TYPE.cmake 
b/Tests/RunCMake/set_property/TYPE.cmake
new file mode 100644
index 000..8481266
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE.cmake
@@ -0,0 +1,2 @@
+add_custom_target(CustomTarget)
+set_property(TARGET CustomTarget PROPERTY TYPE foo)

---

Summary of changes:
 Source/CMakeVersion.cmake|2 +-
 Source/cmTarget.cxx  |6 ++
 Tests/RunCMake/set_property/RunCMakeTest.cmake   |1 +
 .../BadSYSROOT-result.txt => set_property/TYPE-result.txt}   |0
 Tests/RunCMake/set_property/TYPE-stderr.txt  |1 +
 Tests/RunCMake/set_property/TYPE.cmake   |2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => 
set_property/TYPE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 create mode 100644 Tests/RunCMake/set_property/TYPE.cmake


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

[cmake-developers] require-tr1 topic

[Gregor Jasny via cmake-developers]

Hello Daniel,

I wonder what's the idea behind the require-tr1 topic? Some still
supported platforms like macOS with Xcode 3.x seem to fail now.

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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1870-g2969f55

[Gregor Jasny via Cmake-commits]

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  2969f55026a2bb77f063c6c119a9c9e3afc35854 (commit)
   via  8263a78cab321419a6d8839e78317673cd2779a2 (commit)
  from  3c5549e5d6d8b3651f7696e5f9daade18ffab621 (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=2969f55026a2bb77f063c6c119a9c9e3afc35854
commit 2969f55026a2bb77f063c6c119a9c9e3afc35854
Merge: 3c5549e 8263a78
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 05:07:28 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 29 05:07:28 2016 -0500

Merge topic '16253-xcode-effective-platform-name' into next

8263a78c fixup! Xcode: Always emit EFFECTIVE_PLATFORM_NAME


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8263a78cab321419a6d8839e78317673cd2779a2
commit 8263a78cab321419a6d8839e78317673cd2779a2
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 10:55:50 2016 +0100
Commit: Gregor Jasny 
CommitDate: Thu Dec 29 10:55:50 2016 +0100

fixup! Xcode: Always emit EFFECTIVE_PLATFORM_NAME

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index aeda728..c2a76e4 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,9 @@ bool cmGeneratorTarget::ComputeOutputDir(const 
std::string& config,
 
   // The generator may add the configuration's subdirectory.
   if (!conf.empty()) {
-bool isXcode = this->Makefile->IsOn("XCODE");
+bool useEPN = this->Makefile->ShouldEmitEffectivePlatformName();
 std::string suffix =
-  usesDefaultOutputDir && isXcode ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+  usesDefaultOutputDir && useEPN ? "${EFFECTIVE_PLATFORM_NAME}" : "";
 this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
   "/", conf, suffix, out);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 828a0ca..c2767f0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
 singleLine.push_back(cmd);
 if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
   std::string cfgArg = "-DBUILD_TYPE=";
-  bool isXcode = mf->IsOn("XCODE");
-  if (isXcode) {
+  bool useEPN = mf->ShouldEmitEffectivePlatformName();
+  if (useEPN) {
 cfgArg += "$(CONFIGURATION)";
 singleLine.push_back(cfgArg);
 cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fccb486..0656b0a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2184,6 +2184,22 @@ bool cmMakefile::PlatformIsAppleIos() const
   return false;
 }
 
+bool cmMakefile::ShouldEmitEffectivePlatformName() const
+{
+  bool isXcode = this->IsOn("XCODE");
+  if (!isXcode) {
+return false;
+  }
+
+  const char* xcodeVersion = this->GetDefinition("XCODE_VERSION");
+  if (!xcodeVersion ||
+  cmSystemTools::VersionCompareGreater("5", xcodeVersion)) {
+return false;
+  }
+
+  return true;
+}
+
 const char* cmMakefile::GetSONameFlag(const std::string& language) const
 {
   std::string name = "CMAKE_SHARED_LIBRARY_SONAME";
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3484e5a..f929951 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -427,6 +427,9 @@ public:
   /** Return whether the target platform is Apple iOS.  */
   bool PlatformIsAppleIos() const;
 
+  /** Return whether the generator should use EFFECTIVE_PLATFORM_NAME.  */
+  bool ShouldEmitEffectivePlatformName() const;
+
   /** Retrieve soname flag for the specified language if supported */
   const char* GetSONameFlag(const std::string& language) const;
 

---

Summary of changes:
 Source/cmGeneratorTarget.cxx |4 ++--
 Source/cmGlobalGenerator.cxx |4 ++--
 Source/cmMakefile.cxx|   16 
 Source/cmMakefile.h  |3 +++
 4 files changed, 23 insertions(+), 4 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1866-g54fd083

[Gregor Jasny via Cmake-commits]

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  54fd0836989e2a4bb8711265499e09e6ffd5c3d8 (commit)
   via  bf5b0b18cb543bd25e43fe27373851fa70befe26 (commit)
  from  3738245c7b170b3d16ac54b53bbfa08d8d321fff (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=54fd0836989e2a4bb8711265499e09e6ffd5c3d8
commit 54fd0836989e2a4bb8711265499e09e6ffd5c3d8
Merge: 3738245 bf5b0b1
Author: Gregor Jasny 
AuthorDate: Wed Dec 28 14:40:27 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Dec 28 14:40:27 2016 -0500

Merge topic '16204-regex-explorer-match-all' into next

bf5b0b18 fixup! cmake-gui: Add MATCHALL option to Regex Explorer


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf5b0b18cb543bd25e43fe27373851fa70befe26
commit bf5b0b18cb543bd25e43fe27373851fa70befe26
Author: Gregor Jasny 
AuthorDate: Wed Dec 28 20:37:18 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Dec 28 20:39:30 2016 +0100

fixup! cmake-gui: Add MATCHALL option to Regex Explorer

diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
index 52b0b84..abed70e 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -119,6 +119,8 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int 
index)
 
 void RegexExplorer::on_matchAll_toggled(bool checked)
 {
+  Q_UNUSED(checked);
+
   on_inputText_textChanged();
 }
 

---

Summary of changes:
 Source/QtDialog/RegexExplorer.cxx |2 ++
 1 file changed, 2 insertions(+)


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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1864-g3738245

[Gregor Jasny via Cmake-commits]

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  3738245c7b170b3d16ac54b53bbfa08d8d321fff (commit)
   via  df364bf8e78f533dc2267ae281cf4a67c040813e (commit)
   via  58a09969f84eadd0f06adee33d3aaba09da26229 (commit)
  from  f96cd09de6efbf13d9662eb99fe5911c36fd0ebb (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=3738245c7b170b3d16ac54b53bbfa08d8d321fff
commit 3738245c7b170b3d16ac54b53bbfa08d8d321fff
Merge: f96cd09 df364bf
Author: Gregor Jasny 
AuthorDate: Wed Dec 28 13:40:44 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Dec 28 13:40:44 2016 -0500

Merge topic '16253-xcode-effective-platform-name' into next

df364bf8 Xcode: Always emit EFFECTIVE_PLATFORM_NAME
58a09969 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df364bf8e78f533dc2267ae281cf4a67c040813e
commit df364bf8e78f533dc2267ae281cf4a67c040813e
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 23:42:14 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Dec 28 19:39:23 2016 +0100

Xcode: Always emit EFFECTIVE_PLATFORM_NAME

Closes: cmake/cmake#16253

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b6db0d6..aeda728 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,9 @@ bool cmGeneratorTarget::ComputeOutputDir(const 
std::string& config,
 
   // The generator may add the configuration's subdirectory.
   if (!conf.empty()) {
-bool iosPlatform = this->Makefile->PlatformIsAppleIos();
+bool isXcode = this->Makefile->IsOn("XCODE");
 std::string suffix =
-  usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+  usesDefaultOutputDir && isXcode ? "${EFFECTIVE_PLATFORM_NAME}" : "";
 this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
   "/", conf, suffix, out);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2808051..828a0ca 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
 singleLine.push_back(cmd);
 if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
   std::string cfgArg = "-DBUILD_TYPE=";
-  bool iosPlatform = mf->PlatformIsAppleIos();
-  if (iosPlatform) {
+  bool isXcode = mf->IsOn("XCODE");
+  if (isXcode) {
 cfgArg += "$(CONFIGURATION)";
 singleLine.push_back(cfgArg);
 cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 60912c2..57766db 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -18,6 +18,27 @@ run_cmake(PerConfigPerSourceFlags)
 # Use a single build tree for a few tests without cleaning.
 
 if(NOT XCODE_VERSION VERSION_LESS 5)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeMultiplatform-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS)
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeMultiplatform)
+
+  run_cmake_command(XcodeMultiplatform-macosx-build ${CMAKE_COMMAND} --build . 
-- -sdk macosx)
+  run_cmake_command(XcodeMultiplatform-iphonesimulator-build ${CMAKE_COMMAND} 
--build . -- -sdk iphonesimulator)
+
+  run_cmake_command(XcodeMultiplatform-macosx-install ${CMAKE_COMMAND} --build 
. --target install -- -sdk macosx 
DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_macosx)
+  run_cmake_command(XcodeMultiplatform-iphonesimulator-install 
${CMAKE_COMMAND} --build . --target install -- -sdk iphonesimulator 
DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_iphonesimulator)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 5)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeInstallIOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OPTIONS 
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install")
diff --git a/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake 
b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
new file mode 100644
index 000..166ce85
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.3)
+enable_language(CXX)
+

[Cmake-commits] CMake branch, next, updated. v3.7.1-1861-gf96cd09

[Gregor Jasny via Cmake-commits]

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  f96cd09de6efbf13d9662eb99fe5911c36fd0ebb (commit)
   via  88f07fb417a25f98662da2abf09a9db03f48eb7f (commit)
  from  4c3b6121f4cd46550db6f2e00359b779ba54735e (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=f96cd09de6efbf13d9662eb99fe5911c36fd0ebb
commit f96cd09de6efbf13d9662eb99fe5911c36fd0ebb
Merge: 4c3b612 88f07fb
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 16:25:18 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 27 16:25:18 2016 -0500

Merge topic '15687-revisit-xcode-system-include' into next

88f07fb4 Xcode: Properly mark SYSTEM includes as such


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88f07fb417a25f98662da2abf09a9db03f48eb7f
commit 88f07fb417a25f98662da2abf09a9db03f48eb7f
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 22:18:30 2016 +0100
Commit: Gregor Jasny 
CommitDate: Tue Dec 27 22:18:30 2016 +0100

Xcode: Properly mark SYSTEM includes as such

We now populate the per-language flags in addition to the header
search paths stored in HEADER_SEARCH_PATHS. This preserves include
paths for GNU assembly files (cmake/cmake#16449) and also provides
SYSTEM include semantics.

Closes: cmake/cmake#15687

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 736aa91..96535eb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1977,6 +1977,22 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 buildSettings->AddAttribute("HEADER_SEARCH_PATHS", dirs.CreateList());
   }
 
+  if (this->XcodeVersion >= 60) {
+// Add those per-language flags in addition to HEADER_SEARCH_PATHS to gain
+// system include directory awareness. We need to also keep on setting
+// HEADER_SEARCH_PATHS to work around a missing compile options flag for
+// GNU assembly files (#16449)
+for (std::set::iterator li = languages.begin();
+ li != languages.end(); ++li) {
+  std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags(
+includes, gtgt, *li, true, false, configName);
+
+  if (!includeFlags.empty()) {
+cflags[*li] += " " + includeFlags;
+  }
+}
+  }
+
   bool same_gflags = true;
   std::map gflags;
   std::string const* last_gflag = 0;
diff --git a/Tests/IncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/CMakeLists.txt
index 4920582..db18462 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -3,7 +3,9 @@ project(IncludeDirectories)
 
 if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION 
VERSION_GREATER 4.4)
 OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL 
AppleClang)
-AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL 
"Ninja"))
+AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles"
+  OR CMAKE_GENERATOR STREQUAL "Ninja"
+  OR (CMAKE_GENERATOR STREQUAL "Xcode" AND NOT XCODE_VERSION VERSION_LESS 
6.0)))
   include(CheckCXXCompilerFlag)
   check_cxx_compiler_flag(-Wunused-variable run_sys_includes_test)
   if(run_sys_includes_test)
diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
index dcee85e..5078f30 100644
--- a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt
@@ -15,10 +15,17 @@ target_include_directories(upstream SYSTEM PUBLIC
 )
 
 add_library(config_specific INTERFACE)
-set(testConfig ${CMAKE_BUILD_TYPE})
-target_include_directories(config_specific SYSTEM INTERFACE
-  "$<$:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>"
-)
+if(CMAKE_GENERATOR STREQUAL "Xcode")
+  # CMAKE_BUILD_TYPE does not work here for multi-config generators
+  target_include_directories(config_specific SYSTEM INTERFACE
+"${CMAKE_CURRENT_SOURCE_DIR}/config_specific"
+  )
+else()
+  set(testConfig ${CMAKE_BUILD_TYPE})
+  target_include_directories(config_specific SYSTEM INTERFACE
+"$<$:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>"
+  )
+endif()
 
 add_library(consumer consumer.cpp)
 target_link_libraries(consumer upstream config_specific)

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx   

[Cmake-commits] CMake branch, next, updated. v3.7.1-1859-g4c3b612

[Gregor Jasny via Cmake-commits]

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  4c3b6121f4cd46550db6f2e00359b779ba54735e (commit)
   via  fb55dc9d5b7a7e70770a783f41ec21c734f1fce7 (commit)
   via  65fb0fa63279b96035a144fd2f6413d1b2def47f (commit)
   via  2b301e11e2402690c43a7535656cba487559bd1f (commit)
   via  8b623e8a4af7451c718f448c8e27ce2b82347f76 (commit)
   via  df00ed13107ecb5e5b61ec07bb4190de0aaeb6b0 (commit)
  from  1890504c1220777f247462f00d9889a6d242e4bd (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=4c3b6121f4cd46550db6f2e00359b779ba54735e
commit 4c3b6121f4cd46550db6f2e00359b779ba54735e
Merge: 1890504 fb55dc9
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 10:43:15 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 27 10:43:15 2016 -0500

Merge topic '16204-regex-explorer-match-all' into next

fb55dc9d cmake-gui: Add MATCHALL option to Regex Explorer
65fb0fa6 CMake Nightly Date Stamp
2b301e11 CMake Nightly Date Stamp
8b623e8a CMake Nightly Date Stamp
df00ed13 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb55dc9d5b7a7e70770a783f41ec21c734f1fce7
commit fb55dc9d5b7a7e70770a783f41ec21c734f1fce7
Author: Gregor Jasny 
AuthorDate: Tue Dec 27 16:38:09 2016 +0100
Commit: Gregor Jasny 
CommitDate: Tue Dec 27 16:38:18 2016 +0100

cmake-gui: Add MATCHALL option to Regex Explorer

Closes: #16204

diff --git a/Source/QtDialog/RegexExplorer.cxx 
b/Source/QtDialog/RegexExplorer.cxx
index 1512166..52b0b84 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -64,10 +64,32 @@ void RegexExplorer::on_inputText_textChanged()
 return;
   }
 
+  std::string matchingText;
+
+  if (matchAll->isChecked()) {
+const char* p = m_text.c_str();
+while (m_regexParser.find(p)) {
+  std::string::size_type l = m_regexParser.start();
+  std::string::size_type r = m_regexParser.end();
+  if (r - l == 0) {
+// matched empty string
+clearMatch();
+return;
+  }
+  if (!matchingText.empty()) {
+matchingText += ";";
+  }
+  matchingText += std::string(p + l, r - l);
+  p += r;
+}
+  } else {
+matchingText = m_regexParser.match(0);
+  }
+
 #ifdef QT_NO_STL
-  QString matchText = m_regexParser.match(0).c_str();
+  QString matchText = matchingText.c_str();
 #else
-  QString matchText = QString::fromStdString(m_regexParser.match(0));
+  QString matchText = QString::fromStdString(matchingText);
 #endif
   match0->setPlainText(matchText);
 
@@ -95,8 +117,14 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int 
index)
   matchN->setPlainText(match);
 }
 
+void RegexExplorer::on_matchAll_toggled(bool checked)
+{
+  on_inputText_textChanged();
+}
+
 void RegexExplorer::clearMatch()
 {
+  m_matched = false;
   match0->clear();
   matchN->clear();
 }
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index f1c1e5f..caef975 100644
--- a/Source/QtDialog/RegexExplorer.h
+++ b/Source/QtDialog/RegexExplorer.h
@@ -22,6 +22,7 @@ private slots:
   void on_regularExpression_textChanged(const QString& text);
   void on_inputText_textChanged();
   void on_matchNumber_currentIndexChanged(int index);
+  void on_matchAll_toggled(bool checked);
 
 private:
   static void setStatusColor(QWidget* widget, bool successful);
diff --git a/Source/QtDialog/RegexExplorer.ui b/Source/QtDialog/RegexExplorer.ui
index 2c2d761..0af6 100644
--- a/Source/QtDialog/RegexExplorer.ui
+++ b/Source/QtDialog/RegexExplorer.ui
@@ -104,11 +104,38 @@
 


-
- 
-  Complete Match
- 
-
+
+ 
+  
+   
+Complete Match
+   
+  
+ 
+ 
+  
+   
+Qt::Horizontal
+   
+   
+QSizePolicy::Fixed
+   
+   
+
+ 40
+ 20
+
+   
+  
+ 
+ 
+  
+   
+Match All
+   
+  
+ 
+


 

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/QtDialog/RegexExplorer.cxx |   32 ++--
 Source/QtDialog/RegexExplorer.h   |1 +
 Source/QtDialog/RegexExplorer.ui  |   37 -
 4 files changed, 64 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list

Re: [cmake-developers] Boost 1.63 support

[Gregor Jasny via cmake-developers]

Hello,

On 27/12/2016 13:20, Roger Leigh wrote:
> I opened the following merge request to add support for the
> newly-released Boost 1.63:
> 
>   https://gitlab.kitware.com/cmake/cmake/merge_requests/361

I wonder what's the reason for stating explicitly all the released
versions? It they are necessary at all, couldn't they be added in
speculative batches of 10 or so?

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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1690-g2e29d71

[Gregor Jasny via Cmake-commits]

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  2e29d71c33f54eb84b1fae5bbb3c362b4f994f29 (commit)
   via  0ae4632119ba5300995ec5ddd5513a44bfd2a198 (commit)
   via  7ecac703cec8bde71f8d11c1a8fa34bfa077edee (commit)
  from  3ab7ed32396004ac7534e466657bbfb7f95b8a76 (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=2e29d71c33f54eb84b1fae5bbb3c362b4f994f29
commit 2e29d71c33f54eb84b1fae5bbb3c362b4f994f29
Merge: 3ab7ed3 0ae4632
Author: Gregor Jasny 
AuthorDate: Sat Dec 10 12:40:27 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Dec 10 12:40:27 2016 -0500

Merge topic 'xcode-message-extension' into next

0ae46321 Xcode: Add target property to override explicitFileType
7ecac703 Xcode: Add target property to override productType


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ae4632119ba5300995ec5ddd5513a44bfd2a198
commit 0ae4632119ba5300995ec5ddd5513a44bfd2a198
Author: Gregor Jasny 
AuthorDate: Sat Dec 3 23:45:55 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Dec 4 00:13:51 2016 +0100

Xcode: Add target property to override explicitFileType

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 292a85b..70bd279 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -294,6 +294,7 @@ Properties on Targets
/prop_tgt/WIN32_EXECUTABLE
/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS
/prop_tgt/XCODE_ATTRIBUTE_an-attribute
+   /prop_tgt/XCODE_EXPLICIT_FILE_TYPE
/prop_tgt/XCODE_PRODUCT_TYPE
/prop_tgt/XCTEST
 
diff --git a/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst 
b/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
new file mode 100644
index 000..dc92902
--- /dev/null
+++ b/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
@@ -0,0 +1,8 @@
+XCODE_EXPLICIT_FILE_TYPE
+
+
+Set the Xcode ``explicitFileType`` attribute on its reference to a
+target.  CMake computes a default based on target type but
+can be told explicitly with this property.
+
+See also :prop_tgt:`XCODE_PRODUCT_TYPE`.
diff --git a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst 
b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
index 1fbf001..f4ef5c0 100644
--- a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
+++ b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
@@ -4,3 +4,5 @@ XCODE_PRODUCT_TYPE
 Set the Xcode ``productType`` attribute on its reference to a
 target.  CMake computes a default based on target type but
 can be told explicitly with this property.
+
+See also :prop_tgt:`XCODE_EXPLICIT_FILE_TYPE`.
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 82ca7a8..736aa91 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2313,6 +2313,10 @@ const char* 
cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
 const char* cmGlobalXCodeGenerator::GetTargetFileType(
   cmGeneratorTarget* target)
 {
+  if (const char* e = target->GetProperty("XCODE_EXPLICIT_FILE_TYPE")) {
+return e;
+  }
+
   switch (target->GetType()) {
 case cmStateEnums::OBJECT_LIBRARY:
 case cmStateEnums::STATIC_LIBRARY:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ecac703cec8bde71f8d11c1a8fa34bfa077edee
commit 7ecac703cec8bde71f8d11c1a8fa34bfa077edee
Author: Gregor Jasny 
AuthorDate: Sat Dec 3 23:46:15 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Dec 4 00:13:08 2016 +0100

Xcode: Add target property to override productType

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index e55524c..292a85b 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -294,6 +294,7 @@ Properties on Targets
/prop_tgt/WIN32_EXECUTABLE
/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS
/prop_tgt/XCODE_ATTRIBUTE_an-attribute
+   /prop_tgt/XCODE_PRODUCT_TYPE
/prop_tgt/XCTEST
 
 .. _`Test Properties`:
diff --git a/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst 
b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
new file mode 100644
index 000..1fbf001
--- /dev/null
+++ b/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
@@ -0,0 +1,6 @@
+XCODE_PRODUCT_TYPE
+--
+
+Set the Xcode ``productType`` attribute on its reference to a
+target.  CMake computes a default based on target type but
+can be told explicitly with this property.
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 50197c9..82ca7a8 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ 

Re: [CMake] A trouble in using cmake for xcode

[Gregor Jasny via CMake]

On 03/12/2016 19:46, Gregor Jasny wrote:
> On 03/12/2016 15:07, wy39666...@163.com wrote:
 I have a trouble in using cmake.I try to find a way to resolve that for a 
 long time, but finally get no results. I attempt to create an ios 
 application imessage extension by cmake but i can't find a suitable 
 command. So i contact you for some suggestion. Look forward for your 
 favourable reply. Thanks very much!
> 
>>> Do you mean something like the "iMessage Application" in the Xcode
>>> project generation wizard?
> 
>> Yes, It is.  Can you give me some suggestion. Thanks for your reply. 
> 
> I need to extend CMake to be able to set an arbitrary product type for
> the bundle. In your case:
> 
> productType = "com.apple.product-type.application.messages";
> productType = "com.apple.product-type.app-extension.messages";

I filed a preliminary merge request:
https://gitlab.kitware.com/cmake/cmake/merge_requests/310


-- 

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] A trouble in using cmake for xcode

[Gregor Jasny via CMake]

On 03/12/2016 15:07, wy39666...@163.com wrote:
>>> I have a trouble in using cmake.I try to find a way to resolve that for a 
>>> long time, but finally get no results. I attempt to create an ios 
>>> application imessage extension by cmake but i can't find a suitable 
>>> command. So i contact you for some suggestion. Look forward for your 
>>> favourable reply. Thanks very much!

>> Do you mean something like the "iMessage Application" in the Xcode
>> project generation wizard?

> Yes, It is.  Can you give me some suggestion. Thanks for your reply. 

I need to extend CMake to be able to set an arbitrary product type for
the bundle. In your case:

productType = "com.apple.product-type.application.messages";
productType = "com.apple.product-type.app-extension.messages";

Please give me some days to implement the behavior. Can you point me to
an already existing extension (maybe on GitHub) and tell me how to test
them in simulator?

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

Re: [CMake] A trouble in using cmake for xcode

[Gregor Jasny via CMake]

Hello,

On 01/12/2016 07:02, wy39666...@163.com wrote:
> I have a trouble in using cmake.I try to find a way to resolve that for a 
> long time, but finally get no results. I attempt to create an ios application 
> imessage extension by cmake but i can't find a suitable command. So i contact 
> you for some suggestion. Look forward for your favourable reply. Thanks very 
> much!


Do you mean something like the "iMessage Application" in the Xcode
project generation wizard?

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

Re: [CMake] v3.7.0 - archive_cryptor_private.h - compile error

[Gregor Jasny via CMake]

On 26/11/2016 10:03, Hendrik Sattler wrote:
> I assume that maybe he tries to build with openssl 1.1

You're right. I assumed that "Debian GNU/Linux 8" does not contain
OpenSSL 1.1 but either the Debian version or OpenSSL version on Nathans
system is wrong.

> Am 26. November 2016 09:29:14 MEZ, schrieb Gregor Jasny via CMake 
> <cmake@cmake.org>:
>> Hello,
>>
>> On 25/11/2016 19:25, Nathan Sizemore wrote:
>>> I receive the following when building:
>>>
>>> [ 40%] Building C object
>>>
>> Utilities/cmlibarchive/libarchive/CMakeFiles/cmlibarchive.dir/archive_cryptor.c.o
>>> In file included from
>>>
>> /home/nathan/development/cmake/Utilities/cmlibarchive/libarchive/archive_cryptor.c:32:0:
>>>
>> /home/nathan/development/cmake/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h:107:17:
>>> error: field ‘ctx’ has incomplete type
>>>   EVP_CIPHER_CTX ctx;
>>
>> You are using the embedded copy of libarchive. I would suggest you
>> install the Debian CMake package build dependencies:
>>
>>  apt-get build-dep cmake
>>
>> so that you use the system libraries instead of the embedded ones.
>> Hopefully this will resolve your issue.

I reproduced the error on my Debian Sid machine, filed a bug against
CMake (https://gitlab.kitware.com/cmake/cmake/issues/16459) only to
discover that Brad King already filed a PR against upstream libarchive.

The following should solve Nathans problem:

apt-get build-dep cmake
apt-get install librhash-dev
cd <>
mkdir _build
cd _build
../bootstrap --system-libs
make

See:
https://anonscm.debian.org/cgit/pkg-cmake/cmake.git/tree/debian/rules#n43

Debians libarchive does not use OpenSSL but nettle instead so the
OpenSSL incompatibility does not show up.

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

Re: [CMake] v3.7.0 - archive_cryptor_private.h - compile error

[Gregor Jasny via CMake]

Hello,

On 25/11/2016 19:25, Nathan Sizemore wrote:
> I receive the following when building:
> 
> [ 40%] Building C object
> Utilities/cmlibarchive/libarchive/CMakeFiles/cmlibarchive.dir/archive_cryptor.c.o
> In file included from
> /home/nathan/development/cmake/Utilities/cmlibarchive/libarchive/archive_cryptor.c:32:0:
> /home/nathan/development/cmake/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h:107:17:
> error: field ‘ctx’ has incomplete type
>   EVP_CIPHER_CTX ctx;

You are using the embedded copy of libarchive. I would suggest you
install the Debian CMake package build dependencies:

  apt-get build-dep cmake

so that you use the system libraries instead of the embedded ones.
Hopefully this will resolve your issue.

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

[Cmake-commits] CMake branch, next, updated. v3.7.0-1322-g86d0d04

[Gregor Jasny via Cmake-commits]

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  86d0d04211c1102be5449a18825aec645c7b6942 (commit)
   via  82564914ff697b04cbc1f4978f9569ba14b33203 (commit)
   via  8288d16126193e86bb6880a7d7b749649ad83e2c (commit)
  from  6e51a624401016e1df34a70e273574ba0ab1bcf5 (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=86d0d04211c1102be5449a18825aec645c7b6942
commit 86d0d04211c1102be5449a18825aec645c7b6942
Merge: 6e51a62 8256491
Author: Gregor Jasny 
AuthorDate: Wed Nov 23 12:38:17 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Nov 23 12:38:17 2016 -0500

Merge topic '16449-revert-xcode-system-includes' into next

82564914 Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
8288d161 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82564914ff697b04cbc1f4978f9569ba14b33203
commit 82564914ff697b04cbc1f4978f9569ba14b33203
Author: Gregor Jasny 
AuthorDate: Wed Nov 23 18:19:54 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Nov 23 18:19:54 2016 +0100

Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"

This reverts commit 93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
and restores include flags handling for GNU assembly files.

Closes: #16449

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 84a8c5e..4a75b4d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1925,40 +1925,24 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 
   BuildObjectListOrString dirs(this, this->XcodeVersion >= 30);
   BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
+  std::vector includes;
+  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
+ configName);
   std::set emitted;
   emitted.insert("/System/Library/Frameworks");
 
-  if (this->XcodeVersion < 60) {
-std::vector includes;
-this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
-   configName);
-for (std::vector::iterator i = includes.begin();
- i != includes.end(); ++i) {
-  if (this->NameResolvesToFramework(*i)) {
-std::string frameworkDir = *i;
-frameworkDir += "/../";
-frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
-if (emitted.insert(frameworkDir).second) {
-  fdirs.Add(this->XCodeEscapePath(frameworkDir));
-}
-  } else {
-std::string incpath = this->XCodeEscapePath(*i);
-dirs.Add(incpath);
-  }
-}
-  } else {
-for (std::set::iterator li = languages.begin();
- li != languages.end(); ++li) {
-  std::vector includes;
-  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, *li,
- configName);
-  std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags(
-includes, gtgt, *li, true, false, configName);
-
-  std::string& flags = cflags[*li];
-  if (!includeFlags.empty()) {
-flags += " " + includeFlags;
+  for (std::vector::iterator i = includes.begin();
+   i != includes.end(); ++i) {
+if (this->NameResolvesToFramework(*i)) {
+  std::string frameworkDir = *i;
+  frameworkDir += "/../";
+  frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
+  if (emitted.insert(frameworkDir).second) {
+fdirs.Add(this->XCodeEscapePath(frameworkDir));
   }
+} else {
+  std::string incpath = this->XCodeEscapePath(*i);
+  dirs.Add(incpath);
 }
   }
   // Add framework search paths needed for linking.
diff --git a/Tests/IncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/CMakeLists.txt
index db18462..4920582 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -3,9 +3,7 @@ project(IncludeDirectories)
 
 if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION 
VERSION_GREATER 4.4)
 OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL 
AppleClang)
-AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles"
-  OR CMAKE_GENERATOR STREQUAL "Ninja"
-  OR (CMAKE_GENERATOR STREQUAL "Xcode" AND NOT XCODE_VERSION VERSION_LESS 
6.0)))
+AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL 
"Ninja"))
   include(CheckCXXCompilerFlag)
   

[cmake-developers] cm(Generator)Target::IsFrameworkOnApple

[Gregor Jasny via cmake-developers]

Hello,

it looks like that during Generator Target refactoring the
cm(Generator)Target::IsFrameworkOnApple and similar got duplicated. Is
there a reason for this or could the GeneratorTarget simply query the
Target?

Do you have by any chance some high level design documentation about the
most important involves classes like the various generators, target,
makefile, etc? I sometimes wonder where to place a new function and
would like to get some more background.

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

[Cmake-commits] CMake branch, next, updated. v3.7.0-1247-ga3fb155

[Gregor Jasny via Cmake-commits]

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  a3fb155f636bbe567353b34b62c766ee19c43dae (commit)
   via  c0e223cd2ad78abc698c517004101a3eb48214c4 (commit)
  from  077c70d310c18d7f93ca926e166316d645d30e7e (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=a3fb155f636bbe567353b34b62c766ee19c43dae
commit a3fb155f636bbe567353b34b62c766ee19c43dae
Merge: 077c70d c0e223c
Author: Gregor Jasny 
AuthorDate: Thu Nov 17 16:40:11 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 16:40:11 2016 -0500

Merge topic 'xcode-add-override-keyword' into next

c0e223cd Xcode: Add override keyword to suppress warnings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0e223cd2ad78abc698c517004101a3eb48214c4
commit c0e223cd2ad78abc698c517004101a3eb48214c4
Author: Gregor Jasny 
AuthorDate: Thu Nov 17 22:39:46 2016 +0100
Commit: Gregor Jasny 
CommitDate: Thu Nov 17 22:39:46 2016 +0100

Xcode: Add override keyword to suppress warnings

diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index ded8073..98625d1 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -23,7 +23,7 @@ public:
   static cmGlobalGeneratorFactory* NewFactory();
 
   ///! Get the name for the generator.
-  virtual std::string GetName() const
+  std::string GetName() const CM_OVERRIDE
   {
 return cmGlobalXCodeGenerator::GetActualName();
   }
@@ -33,51 +33,53 @@ public:
   static void GetDocumentation(cmDocumentationEntry& entry);
 
   ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf);
+  cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) CM_OVERRIDE;
 
   /**
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
-  virtual void EnableLanguage(std::vector const& languages,
-  cmMakefile*, bool optional);
+  void EnableLanguage(std::vector const& languages, cmMakefile*,
+  bool optional) CM_OVERRIDE;
   /**
* Try running cmake and building a file. This is used for dynalically
* loaded commands, not as part of the usual build process.
*/
-  virtual void GenerateBuildCommand(
-std::vector& makeCommand, const std::string& makeProgram,
-const std::string& projectName, const std::string& projectDir,
-const std::string& targetName, const std::string& config, bool fast,
-bool verbose,
-std::vector const& makeOptions = std::vector());
+  void GenerateBuildCommand(std::vector& makeCommand,
+const std::string& makeProgram,
+const std::string& projectName,
+const std::string& projectDir,
+const std::string& targetName,
+const std::string& config, bool fast, bool verbose,
+std::vector const& makeOptions =
+  std::vector()) CM_OVERRIDE;
 
   /** Append the subdirectory for the given configuration.  */
-  virtual void AppendDirectoryForConfig(const std::string& prefix,
-const std::string& config,
-const std::string& suffix,
-std::string& dir);
+  void AppendDirectoryForConfig(const std::string& prefix,
+const std::string& config,
+const std::string& suffix,
+std::string& dir) CM_OVERRIDE;
 
   bool FindMakeProgram(cmMakefile*) CM_OVERRIDE;
 
   ///! What is the configurations directory variable called?
-  virtual const char* GetCMakeCFGIntDir() const;
+  const char* GetCMakeCFGIntDir() const CM_OVERRIDE;
   ///! expand CFGIntDir
-  virtual std::string ExpandCFGIntDir(const std::string& str,
-  const std::string& config) const;
+  std::string ExpandCFGIntDir(const std::string& str,
+  const std::string& config) const CM_OVERRIDE;
 
   void SetCurrentLocalGenerator(cmLocalGenerator*);
 
   /** Return true if the generated build tree may contain multiple builds.
   i.e. "Can I build Debug and Release in the same tree?" */
-  virtual bool IsMultiConfig() const;
+  bool IsMultiConfig() const CM_OVERRIDE;
 
-  virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
+  

Re: [CMake] CMake 3.6 and OSX

[Gregor Jasny via CMake]

Hello,

On 02/11/2016 06:01, Robert Ramey wrote:
> Here is what I'm seeing:
> 
> a) it looks like CMake is looking for boost_filesystem rather than
> libboost as I expect. (same for system).
> 
> b) even if I tweak findBoost to force the system to look for libboost...
> it still fails
> 
> b) If I follow the suggestion and set BOOST_ROOT to the boost root, it
> still doesn't work.  The BOOST_ROOT variable is discarded when I invoke
> "Configure"
> 
> So again, any suggestions you can offer will be appreciated.

It looks like you use a self-compiled boost library. I never did that
but used homebrew instead. If you download the precompiled tarball from
boost, does it work? (I'm asking because I see a 'Debug' in one of your
paths).

The next thing I would do is to run opensnoop and look what files CMake
tries to access() / open() / stat(). Maybe that gives you a hint.

Hope this helps,
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

[cmake-developers] Developer workflow with gitlab

[Gregor Jasny via cmake-developers]

Hello,

I wonder what's the recommended workflow for CMake developers with
commit access to stage? I'd like to use feature branches in gitlab but
wonder how those are best merged into 'next'?

Could you please advise or point me to some documentation?

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] -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ broken in 3.7.0-rc2

[Gregor Jasny via cmake-developers]

On 31/10/2016 00:03, Gregor Jasny wrote:
> On 30/10/2016 18:33, Jack Howarth wrote:
>> Gregor,
>>   Your commit of...
>>
>> https://cmake.org/gitweb?p=cmake.git;a=log;h=540815eec2b83a8b43689580c54e8950d9f5868b
>>
>> has caused a major regression in cmake 3.7.0 as it no longer properly
>> honors the combination...
>>
>> -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/
> 
> I think I revert my change and also completely remove the deployment
> target mismatch because I cannot see a way to query SDK versions for
> Command Line Tools installs.

I put my changes into fix-macos-sysroot topic and merged to next.

See:
https://cmake.org/gitweb?p=stage/cmake.git;a=shortlog;h=refs/heads/fix-macos-sysroot

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

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-828-gd3c45a8

[Gregor Jasny via Cmake-commits]

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  d3c45a83f489137874715c4a7d0c4f6f50a9cc13 (commit)
   via  32737a1de163185236e867e10a276e60334a0836 (commit)
   via  e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff (commit)
   via  098a18c476b5e60b3bacc0e47f23359fc4a3ea2c (commit)
  from  4b4bebc7e19687ff9d1d28374555e647e5b1a634 (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=d3c45a83f489137874715c4a7d0c4f6f50a9cc13
commit d3c45a83f489137874715c4a7d0c4f6f50a9cc13
Merge: 4b4bebc 32737a1
Author: Gregor Jasny 
AuthorDate: Mon Oct 31 07:25:11 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 31 07:25:11 2016 -0400

Merge topic 'fix-macos-sysroot' into next

32737a1d Darwin: Remove deployment target version check
e52e454f Revert "Xcode: Convert maybe unversioned OSX sysroot into 
versioned SDK path"
098a18c4 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32737a1de163185236e867e10a276e60334a0836
commit 32737a1de163185236e867e10a276e60334a0836
Author: Gregor Jasny 
AuthorDate: Mon Oct 31 10:29:44 2016 +0100
Commit: Gregor Jasny 
CommitDate: Mon Oct 31 12:24:20 2016 +0100

Darwin: Remove deployment target version check

Querying the SDK version via

  xcodebuild -sdk  -version Path

gives bogus results for the Command Line Tools installed into /.
Instead of adding another work-around I find it cleaner to remove
the deployment target version check altogether.

Resolves: 
http://public.kitware.com/pipermail/cmake-developers/2016-October/029539.html
Resolves: #16323

diff --git a/Modules/Platform/Darwin-Initialize.cmake 
b/Modules/Platform/Darwin-Initialize.cmake
index 3606144..b539e45 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -113,7 +113,6 @@ set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_DEFAULT}" CACHE 
${_CMAKE_OSX_SYSROOT
   "The product will be built against the headers and libraries located inside 
the indicated SDK.")
 
 # Transform the cached value to something we can use.
-set(_CMAKE_OSX_SYSROOT_ORIG "${CMAKE_OSX_SYSROOT}")
 set(_CMAKE_OSX_SYSROOT_PATH "")
 if(CMAKE_OSX_SYSROOT)
   if("x${CMAKE_OSX_SYSROOT}" MATCHES "/")
@@ -122,7 +121,6 @@ if(CMAKE_OSX_SYSROOT)
   message(WARNING "Ignoring CMAKE_OSX_SYSROOT value:\n 
${CMAKE_OSX_SYSROOT}\n"
 "because the directory does not exist.")
   set(CMAKE_OSX_SYSROOT "")
-  set(_CMAKE_OSX_SYSROOT_ORIG "")
 endif()
 set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
   else()
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index c09bac4..727baa6 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -64,30 +64,6 @@ if(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
   mark_as_advanced(CMAKE_INSTALL_NAME_TOOL)
 endif()
 
-# Make sure the combination of SDK and Deployment Target are allowed
-if(CMAKE_OSX_DEPLOYMENT_TARGET)
-  if("${_CMAKE_OSX_SYSROOT_PATH}" MATCHES 
"/MacOSX([0-9]+\\.[0-9]+)[^/]*\\.sdk")
-set(_sdk_ver "${CMAKE_MATCH_1}")
-  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$")
-set(_sdk_ver "${CMAKE_MATCH_1}")
-  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/")
-set(_sdk_ver "${_CURRENT_OSX_VERSION}")
-  else()
-message(FATAL_ERROR
-  "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
-  "but CMAKE_OSX_SYSROOT:\n \"${_CMAKE_OSX_SYSROOT_ORIG}\"\n"
-  "is not set to a MacOSX SDK with a recognized version.  "
-  "Either set CMAKE_OSX_SYSROOT to a valid SDK or set "
-  "CMAKE_OSX_DEPLOYMENT_TARGET to empty.")
-  endif()
-  if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER "${_sdk_ver}")
-message(FATAL_ERROR
-  "CMAKE_OSX_DEPLOYMENT_TARGET (${CMAKE_OSX_DEPLOYMENT_TARGET}) "
-  "is greater than CMAKE_OSX_SYSROOT SDK:\n ${_CMAKE_OSX_SYSROOT_ORIG}\n"
-  "Please set CMAKE_OSX_DEPLOYMENT_TARGET to ${_sdk_ver} or lower.")
-  endif()
-endif()
-
 # Enable shared library versioning.
 set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff
commit e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff
Author: Gregor Jasny 
AuthorDate: Mon Oct 31 10:25:38 2016 +0100
Commit: Gregor Jasny 
CommitDate: Mon Oct 31 10:25:38 2016 +0100

Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK 

Re: [CMake] CMake 3.6 and OSX

[Gregor Jasny via CMake]

Hello Robert,

On 29/10/2016 22:03, Robert Ramey wrote:
> I've just "upgraded" to version 3.6 of CMake.  I'm using Xcode with the
> clang compiler.  Now when I'm trying to configure a project I'm getting:
> 
> The C compiler identification is unknown
> The CXX compiler identification is unknown
> CMake Error at CMakeLists.txt:14 (project):
>   No CMAKE_C_COMPILER could be found.
> CMake Error at CMakeLists.txt:14 (project):
>   No CMAKE_CXX_COMPILER could be found.
> 
> What do I have to do to make this work?

Have a look into /CMakeFiles/CMakeOutput.log and
CMakeError.log. There should be an error visible. Most often someone
forgets to accept the Xcode license. The resulting output leads to CMake
errors.

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

Re: [cmake-developers] -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ broken in 3.7.0-rc2

[Gregor Jasny via cmake-developers]

On 30/10/2016 18:33, Jack Howarth wrote:
> Gregor,
>   Your commit of...
> 
> https://cmake.org/gitweb?p=cmake.git;a=log;h=540815eec2b83a8b43689580c54e8950d9f5868b
> 
> has caused a major regression in cmake 3.7.0 as it no longer properly
> honors the combination...
> 
> -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/

I think I revert my change and also completely remove the deployment
target mismatch because I cannot see a way to query SDK versions for
Command Line Tools installs.

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] -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ broken in 3.7.0-rc2

[Gregor Jasny via cmake-developers]

On 30/10/2016 20:23, Jack Howarth wrote:
> Gregor,
>  While I still think your hack to obtain the versioned SDK is
> wrong because it relies on passing invalid arguments to 'xcodebuild
> -sdk', the following change restores the expected behavior for
> -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/
> while allowing your hack to function when
> -DCMAKE_OSX_DEPLOYMENT_TARGET is not an empty string...


Some questions:
1) Is "xcodebuild -sdk / -version SDKVersion" returning the proper
version? I bet not because you called / an invalid argument.

2) Would it make sense to perform some pre-checks before applying my
"hack" in case sdk is a path? For example if it starts with the output
of "xcode-select --print-path"

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] -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ broken in 3.7.0-rc2

[Gregor Jasny via cmake-developers]

On 30/10/2016 20:37, Jack Howarth wrote:
> Proposed fix to restore functionality for
> -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/
> while retaining the current hack when CMAKE_OSX_DEPLOYMENT_TARGET is
> not set to an empty string.

Thanks for the patch but it is breaking #16323 again:

> ~/src/cmake/_build/bin/cmake 
> -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
>  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 -GXcode ..
> -- The C compiler identification is AppleClang 8.0.0.842
> -- The CXX compiler identification is AppleClang 8.0.0.842
> CMake Error at /Users/jasny/src/cmake/Modules/Platform/Darwin.cmake:76 
> (message):
>   CMAKE_OSX_DEPLOYMENT_TARGET is '10.10' but CMAKE_OSX_SYSROOT:
> 
>
> "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
> 
>   is not set to a MacOSX SDK with a recognized version.  Either set
>   CMAKE_OSX_SYSROOT to a valid SDK or set CMAKE_OSX_DEPLOYMENT_TARGET to
>   empty.
> Call Stack (most recent call first):
>   /Users/jasny/src/cmake/Modules/CMakeSystemSpecificInformation.cmake:26 
> (include)
>   CMakeLists.txt
> 
> 
> -- Configuring incomplete, errors occurred!
> See also "/Users/jasny/tmp/cm/_build/CMakeFiles/CMakeOutput.log".



-- 

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] -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ broken in 3.7.0-rc2

[Gregor Jasny via cmake-developers]

Hello Howarth,

I'm sorry that I broke your use case with that patch. The problem I have
with maintaining the Xcode / Darwin code is that it is full of backward
compatibility and unknown, undocumented use cases. That makes it
sometimes hard to foresee consequences.

On 30/10/2016 19:04, Jack Howarth wrote:
> Gregor,
> This is also a severe regression because if forces the cmake
> users to build against the 10.12 SDK on 10.11 which is not well tested
> for backward compatibility on 10.11. Your change makes it impossible
> to build against the SDK in / installed by the Xcode Command Line
> Tools package.

What do you mean with SDK installed into "/"? I was under the impression
that the Command Line Tools package is installed automatically by Xcode
after first start. I thought it provides the /usr/bin/clang etc.

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

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-549-ga23f4f0

[Gregor Jasny via Cmake-commits]

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  a23f4f0666fdbfb7ab75635f62e216b5d5d158d0 (commit)
   via  9ce8fbf522e84f3f596e90453b4c652514a00099 (commit)
  from  54379cab91d6b2d6940d65fa8dd31530bd30ae52 (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=a23f4f0666fdbfb7ab75635f62e216b5d5d158d0
commit a23f4f0666fdbfb7ab75635f62e216b5d5d158d0
Merge: 54379ca 9ce8fbf
Author: Gregor Jasny 
AuthorDate: Sun Oct 16 15:32:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Oct 16 15:32:13 2016 -0400

Merge topic 'refactor-folder-name-retrieval' into next

9ce8fbf5 Refactor IDE folder name retrieval into GetEffectiveFolderName()


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce8fbf522e84f3f596e90453b4c652514a00099
commit 9ce8fbf522e84f3f596e90453b4c652514a00099
Author: Gregor Jasny 
AuthorDate: Tue Aug 30 20:55:37 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Oct 16 21:27:47 2016 +0200

Refactor IDE folder name retrieval into GetEffectiveFolderName()

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7eb0ebf..eb9f419 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1767,6 +1767,22 @@ std::string cmGeneratorTarget::GetMacContentDirectory(
   return fpath;
 }
 
+std::string cmGeneratorTarget::GetEffectiveFolderName() const
+{
+std::string effectiveFolder;
+
+if (!this->GlobalGenerator->UseFolderProperty()) {
+return effectiveFolder;
+}
+
+const char* targetFolder = this->GetProperty("FOLDER");
+if (targetFolder) {
+effectiveFolder += targetFolder;
+}
+
+return effectiveFolder;
+}
+
 cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
   const std::string& config) const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 68ffd5c..9382726 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -220,6 +220,9 @@ public:
   std::string GetMacContentDirectory(const std::string& config = CM_NULLPTR,
  bool implib = false) const;
 
+  /** @return folder prefix for IDEs. */
+  std::string GetEffectiveFolderName() const;
+
   cmTarget* Target;
   cmMakefile* Makefile;
   cmLocalGenerator* LocalGenerator;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx 
b/Source/cmGhsMultiTargetGenerator.cxx
index 5fbaea4..3154f8d 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -44,9 +44,7 @@ cmGhsMultiTargetGenerator::~cmGhsMultiTargetGenerator()
 std::string cmGhsMultiTargetGenerator::GetRelBuildFilePath(
   const cmGeneratorTarget* target)
 {
-  std::string output;
-  char const* folderProp = target->GetProperty("FOLDER");
-  output = NULL == folderProp ? "" : folderProp;
+  std::string output = target->GetEffectiveFolderName();
   cmSystemTools::ConvertToUnixSlashes(output);
   if (!output.empty()) {
 output += "/";
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1aa6af1..7d0c2da 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2377,7 +2377,7 @@ const char* 
cmGlobalGenerator::GetPredefinedTargetsFolder()
   return "CMakePredefinedTargets";
 }
 
-bool cmGlobalGenerator::UseFolderProperty()
+bool cmGlobalGenerator::UseFolderProperty() const
 {
   const char* prop =
 this->GetCMakeInstance()->GetState()->GetGlobalProperty("USE_FOLDERS");
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 38eaa76..c3498e0 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -334,6 +334,8 @@ public:
   i.e. "Can I build Debug and Release in the same tree?" */
   virtual bool IsMultiConfig() const { return false; }
 
+  virtual bool UseFolderProperty() const;
+
   std::string GetSharedLibFlagsForLanguage(std::string const& lang) const;
 
   /** Generate an .rule file path for a given command output.  */
@@ -463,7 +465,6 @@ protected:
 std::string const& name) const;
 
   const char* GetPredefinedTargetsFolder();
-  virtual bool UseFolderProperty();
 
 private:
 #if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx 
b/Source/cmGlobalGhsMultiGenerator.cxx
index 0eac338..d4ae677 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -439,11 +439,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
tgtsI != tgts.end(); ++tgtsI) {
 const cmGeneratorTarget* tgt = 

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-547-g54379ca

[Gregor Jasny via Cmake-commits]

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  54379cab91d6b2d6940d65fa8dd31530bd30ae52 (commit)
   via  25dbc485565649f54d64b57f6a35b651b8a15165 (commit)
   via  5ebba228823ffc96e82f4b6cc1103c2f2ed8cfa7 (commit)
   via  ac5b80e76c102d43749555c9bc888f9ac9b7436e (commit)
  from  1ebf57341d671befa62b4065b7565a01f1fe06aa (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=54379cab91d6b2d6940d65fa8dd31530bd30ae52
commit 54379cab91d6b2d6940d65fa8dd31530bd30ae52
Merge: 1ebf573 25dbc48
Author: Gregor Jasny 
AuthorDate: Sun Oct 16 15:24:51 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Oct 16 15:24:51 2016 -0400

Merge topic '16355-osx-deployment-target-on-cross-compile' into next

25dbc485 Darwin: Do not try to set deployment target when crosscompiling 
(#16355)
5ebba228 CMake Nightly Date Stamp
ac5b80e7 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25dbc485565649f54d64b57f6a35b651b8a15165
commit 25dbc485565649f54d64b57f6a35b651b8a15165
Author: Gregor Jasny 
AuthorDate: Sun Oct 16 20:56:36 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Oct 16 20:59:27 2016 +0200

Darwin: Do not try to set deployment target when crosscompiling (#16355)

diff --git a/Modules/Platform/Darwin-Initialize.cmake 
b/Modules/Platform/Darwin-Initialize.cmake
index 427909d..39374e1 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -90,7 +90,7 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
   endif()
 endforeach()
 
-if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS 
_CMAKE_OSX_DEPLOYMENT_TARGET)
+if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_OSX_DEPLOYMENT_TARGET AND 
_CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
   set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING
 "Minimum OS X version to target for deployment (at runtime); newer 
APIs weak linked. Set to empty string for default value." FORCE)
 endif()

---

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |2 +-
 Source/CMakeVersion.cmake|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.2-2461-gd1bc55f

[Gregor Jasny via Cmake-commits]

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  d1bc55fd7228dd433eb457ec2d2dd38721694151 (commit)
   via  540815eec2b83a8b43689580c54e8950d9f5868b (commit)
   via  02277aef1081478192cc4669093665a01febc7ef (commit)
  from  7ee381d0f5f46674cab4e9554236d6249010655d (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=d1bc55fd7228dd433eb457ec2d2dd38721694151
commit d1bc55fd7228dd433eb457ec2d2dd38721694151
Merge: 7ee381d 540815e
Author: Gregor Jasny 
AuthorDate: Sun Sep 25 07:08:08 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 25 07:08:08 2016 -0400

Merge topic 'xcode-sdk-version' into next

540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK 
path
02277aef CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=540815eec2b83a8b43689580c54e8950d9f5868b
commit 540815eec2b83a8b43689580c54e8950d9f5868b
Author: Gregor Jasny 
AuthorDate: Sun Sep 25 11:37:34 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 25 13:06:23 2016 +0200

Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path

Starting with Xcode 8 the SDK folder also contains an unversioned
entry:

$ ls -l 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs

drwxr-xr-x  5 root  wheel  170 Mar  4  2018 MacOSX.sdk
lrwxr-xr-x  1 root  wheel   10 Sep 16 20:49 MacOSX10.12.sdk -> MacOSX.sdk

If this unversioned path is used CMake cannot detect the SDK
version. To work around the problem we always invoke the code path
that translates short SDK names like "macosx10.12" into a path.
That way we always end up with a versioned SDK path in
_CMAKE_OSX_SYSROOT_PATH which is later used to determine the version.

Closes: #16323

diff --git a/Modules/Platform/Darwin-Initialize.cmake 
b/Modules/Platform/Darwin-Initialize.cmake
index 91c2cf3..427909d 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -125,8 +125,10 @@ if(CMAKE_OSX_SYSROOT)
   set(_CMAKE_OSX_SYSROOT_ORIG "")
 endif()
 set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
-  else()
-# Transform the sdk name into a path.
+  endif()
+
+  if(CMAKE_OSX_SYSROOT)
+# Transform the (maybe unversioned) sysroot into a versioned path.
 execute_process(
   COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path
   OUTPUT_VARIABLE _stdout

---

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |6 --
 Source/CMakeVersion.cmake|2 +-
 2 files changed, 5 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] CMAKE_OSX_DEPLOYMENT_TARGET vs CMAKE_OSX_SYSROOT

[Gregor Jasny via CMake]

On 23/09/2016 22:35, Gregor Jasny wrote:
> On 21/09/2016 10:54, James Turner wrote:
>>
>>> On 20 Sep 2016, at 16:00, Braden McDaniel  wrote:
>>>
>>> When setting CMAKE_OSX_SYSROOT to the unversioned directory name (using 
>>> Xcode 8, as it happens) and setting CMAKE_OSX_DEPLOYMENT_TARGET, I get this 
>>> error:
>>>
>>>
>>> -- The CXX compiler identification is AppleClang 8.0.0.838
>>> CMake Error at 
>>> /Applications/CMake.app/Contents/share/cmake-3.6/Modules/Platform/Darwin.cmake:76
>>>  (message):
>>> CMAKE_OSX_DEPLOYMENT_TARGET is '10.10' but CMAKE_OSX_SYSROOT:
>>>
>>> "/Applications/Xcode-8.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
>>>
>>> is not set to a MacOSX SDK with a recognized version. Either set
>>> CMAKE_OSX_SYSROOT to a valid SDK or set CMAKE_OSX_DEPLOYMENT_TARGET to
>>> empty.
>>> Call Stack (most recent call first):
>>> /Applications/CMake.app/Contents/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake:36
>>>  (include)
>>> CMakeLists.txt:37 (project)
>>>
>>>
>>> I'm able to suppress the error by using the versioned (symlink) directory; 
>>> but isn't the premise of this error message invalid? As I understand it, 
>>> since Xcode 7 (or perhaps earlier?), there is no requirement that the 
>>> deployment target match the SDK version.

The deployment target gives you backwards compatibility back to the
specified version. In your example the binary should be runnable on
macOS 10.10 and later even that you used a newer SDK. That way you have
access to the latest SDK features which you could use after a thorough
check at runtime.

>> I’m seeing a similar error when setting CMAKE_OSX_DEPLOYMENT_TARGET to 10.7 
>> with XCode 8, and leaving CMAKE_OSX_SYSROOT unset. I’m couldn’t identify 
>> where (from  Modules/Platform/Darwin.cmake) the detected value of 
>> _CMAKE_OSX_SYSROOT is computed. (I don’t wish to explicitly set it)

Will be fixed, too.

> Could you please file a bug report and CC me? I'll try to submit a patch
> next week but would appreciate a reminder :)

I filed https://gitlab.kitware.com/cmake/cmake/issues/16323 and will
push a fix soon.

-- 

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] CMAKE_OSX_DEPLOYMENT_TARGET vs CMAKE_OSX_SYSROOT

[Gregor Jasny via CMake]

On 21/09/2016 10:54, James Turner wrote:
> 
>> On 20 Sep 2016, at 16:00, Braden McDaniel  wrote:
>>
>> When setting CMAKE_OSX_SYSROOT to the unversioned directory name (using 
>> Xcode 8, as it happens) and setting CMAKE_OSX_DEPLOYMENT_TARGET, I get this 
>> error:
>>
>>
>> -- The CXX compiler identification is AppleClang 8.0.0.838
>> CMake Error at 
>> /Applications/CMake.app/Contents/share/cmake-3.6/Modules/Platform/Darwin.cmake:76
>>  (message):
>> CMAKE_OSX_DEPLOYMENT_TARGET is '10.10' but CMAKE_OSX_SYSROOT:
>>
>> "/Applications/Xcode-8.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
>>
>> is not set to a MacOSX SDK with a recognized version. Either set
>> CMAKE_OSX_SYSROOT to a valid SDK or set CMAKE_OSX_DEPLOYMENT_TARGET to
>> empty.
>> Call Stack (most recent call first):
>> /Applications/CMake.app/Contents/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake:36
>>  (include)
>> CMakeLists.txt:37 (project)
>>
>>
>> I'm able to suppress the error by using the versioned (symlink) directory; 
>> but isn't the premise of this error message invalid? As I understand it, 
>> since Xcode 7 (or perhaps earlier?), there is no requirement that the 
>> deployment target match the SDK version.
> 
> I’m seeing a similar error when setting CMAKE_OSX_DEPLOYMENT_TARGET to 10.7 
> with XCode 8, and leaving CMAKE_OSX_SYSROOT unset. I’m couldn’t identify 
> where (from  Modules/Platform/Darwin.cmake) the detected value of 
> _CMAKE_OSX_SYSROOT is computed. (I don’t wish to explicitly set it)

Could you please file a bug report and CC me? I'll try to submit a patch
next week but would appreciate a reminder :)

In my projects and toolchain files I always used xcrun to query for the
SDK path:

$ xcrun --sdk macosx --show-sdk-path
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk

The xcrun approach has the advantage that it respects the DEVELOPER_DIR
environment variable and thus works with different Xcode installations.

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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1760-gb8ececb

[Gregor Jasny via Cmake-commits]

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  b8ececb4b62f0fe2bb3fa7000bf00df327d76de5 (commit)
   via  60dcaaea133931a323180c30eafabe4576e72cb8 (commit)
   via  fb357e5fef2e7803f2f745b6aa4cf63935628ed6 (commit)
  from  dfa796fc2815c89ed7a1fcc119b12bcf6afc8294 (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=b8ececb4b62f0fe2bb3fa7000bf00df327d76de5
commit b8ececb4b62f0fe2bb3fa7000bf00df327d76de5
Merge: dfa796f 60dcaae
Author: Gregor Jasny 
AuthorDate: Sun Sep 4 10:56:09 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 4 10:56:09 2016 -0400

Merge topic 'tidy-readability-redundant-string-cstr' into next

60dcaaea tidy: Fix readability-redundant-string-cstr issues
fb357e5f CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60dcaaea133931a323180c30eafabe4576e72cb8
commit 60dcaaea133931a323180c30eafabe4576e72cb8
Author: Gregor Jasny 
AuthorDate: Sun Sep 4 16:55:05 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 4 16:55:05 2016 +0200

tidy: Fix readability-redundant-string-cstr issues

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx 
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 640e437..14436da 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -330,8 +330,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& 
src_dir,
   if (!cpack_dmg_disable_applications_symlink) {
 std::ostringstream application_link;
 application_link << staging.str() << "/Applications";
-cmSystemTools::CreateSymlink("/Applications",
- application_link.str().c_str());
+cmSystemTools::CreateSymlink("/Applications", application_link.str());
   }
 
   // Optionally add a custom volume icon ...
@@ -755,7 +754,7 @@ std::string 
cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix(
 // the current COMPONENT belongs to.
 std::string groupVar =
   "CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP";
-const char* _groupName = GetOption(groupVar.c_str());
+const char* _groupName = GetOption(groupVar);
 if (_groupName) {
   std::string groupName = _groupName;
 
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx 
b/Source/CPack/cmCPackOSXX11Generator.cxx
index c0d2553..c36439f 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -102,15 +102,14 @@ int cmCPackOSXX11Generator::PackageFiles()
   }
 
   std::string applicationsLinkName = diskImageDirectory + "/Applications";
-  cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str());
+  cmSystemTools::CreateSymlink("/Applications", applicationsLinkName);
 
-  if (!this->CopyResourcePlistFile("VolumeIcon.icns",
-   diskImageDirectory.c_str(),
+  if (!this->CopyResourcePlistFile("VolumeIcon.icns", diskImageDirectory,
".VolumeIcon.icns", true) ||
-  !this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(),
-   ".DS_Store", true) ||
+  !this->CopyResourcePlistFile("DS_Store", diskImageDirectory, ".DS_Store",
+   true) ||
   !this->CopyResourcePlistFile("background.png",
-   diskImageBackgroundImageDir.c_str(),
+   diskImageBackgroundImageDir,
"background.png", true) ||
   !this->CopyResourcePlistFile("RuntimeScript", dir) ||
   !this->CopyResourcePlistFile("OSXX11.Info.plist", contDir,
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx 
b/Source/CPack/cmCPackPKGGenerator.cxx
index 19b587a..e5b96e3 100644
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@ -225,8 +225,7 @@ void cmCPackPKGGenerator::CreateChoice(const 
cmCPackComponent& component,
   dirName += '/';
   dirName += component.Name;
   dirName += this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX");
-  unsigned long installedSize =
-component.GetInstalledSizeInKbytes(dirName.c_str());
+  unsigned long installedSize = component.GetInstalledSizeInKbytes(dirName);
 
   xout.StartElement("pkg-ref");
   xout.Attribute("id", packageId);
@@ -283,7 +282,7 @@ bool cmCPackPKGGenerator::CopyCreateResourceFile(const 
std::string& name,
 {
   std::string uname = cmSystemTools::UpperCase(name);
   std::string cpackVar = 

[Cmake-commits] CMake branch, next, updated. v3.6.1-1474-g031a9c4

[Gregor Jasny via Cmake-commits]

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  031a9c4558879f4f5b5b4f5122623a78066e4638 (commit)
   via  4a5c14a5a15bc82e8ea045fe1c8522682b17cbdd (commit)
   via  ff88df48e8a693f213a44aee3ad2474f500857b5 (commit)
  from  81bb94aff906c89cd7bc0cf070df1c34c0a4086b (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=031a9c4558879f4f5b5b4f5122623a78066e4638
commit 031a9c4558879f4f5b5b4f5122623a78066e4638
Merge: 81bb94a 4a5c14a
Author: Gregor Jasny 
AuthorDate: Fri Aug 26 02:54:03 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Aug 26 02:54:03 2016 -0400

Merge topic '16101-xcode-fix-directory-exclude-from-all' into next

4a5c14a5 Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
ff88df48 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a5c14a5a15bc82e8ea045fe1c8522682b17cbdd
commit 4a5c14a5a15bc82e8ea045fe1c8522682b17cbdd
Author: Gregor Jasny 
AuthorDate: Fri Aug 19 21:50:48 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Aug 26 08:53:39 2016 +0200

Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 780ca90..b4bc084 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2635,13 +2635,10 @@ void 
cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target)
 }
 
 bool cmGlobalXCodeGenerator::CreateGroups(
-  cmLocalGenerator* root, std::vector& generators)
+  std::vector& generators)
 {
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (this->IsExcluded(root, *i)) {
-  continue;
-}
 cmMakefile* mf = (*i)->GetMakefile();
 std::vector sourceGroups = mf->GetSourceGroups();
 std::vector tgts = (*i)->GetGeneratorTargets();
@@ -2873,7 +2870,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
   this->MainGroupChildren->AddObject(resourcesGroup);
 
   // now create the cmake groups
-  if (!this->CreateGroups(root, generators)) {
+  if (!this->CreateGroups(generators)) {
 return false;
   }
 
@@ -3041,10 +3038,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
   std::vector targets;
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (!this->IsExcluded(root, *i)) {
-  if (!this->CreateXCodeTargets(*i, targets)) {
-return false;
-  }
+if (!this->CreateXCodeTargets(*i, targets)) {
+  return false;
 }
   }
   // loop over all targets and add link and depend info
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 0485d4f..303dfa0 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -92,8 +92,7 @@ private:
   cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
  cmSourceGroup* sg);
   cmXCodeObject* CreatePBXGroup(cmXCodeObject* parent, std::string name);
-  bool CreateGroups(cmLocalGenerator* root,
-std::vector& generators);
+  bool CreateGroups(std::vector& generators);
   std::string XCodeEscapePath(const std::string& p);
   std::string RelativeToSource(const char* p);
   std::string RelativeToBinary(const char* p);
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
new file mode 100644
index 000..f686005
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
@@ -0,0 +1,6 @@
+enable_language(CXX)
+
+add_subdirectory(ExcludeFromAll EXCLUDE_FROM_ALL)
+
+add_executable(main main.cpp)
+target_link_libraries(main PRIVATE foo)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
new file mode 100644
index 000..b1df6b0
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(bar STATIC bar.cpp)
+
+add_library(foo STATIC foo.cpp)
+target_include_directories(foo PUBLIC .)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
new file mode 100644
index 000..7a828bd
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
@@ -0,0 +1 @@

[Cmake-commits] CMake branch, next, updated. v3.6.1-1374-g91e3176

[Gregor Jasny via Cmake-commits]

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  91e3176521915a83fa1bbe3efbd03042a906bcc2 (commit)
   via  a0fbdb8b2c928306848dd19de0ceaf5a90c741a7 (commit)
  from  8007742a3a19ff7d9fded4ee7a8aeec8201dce1f (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=91e3176521915a83fa1bbe3efbd03042a906bcc2
commit 91e3176521915a83fa1bbe3efbd03042a906bcc2
Merge: 8007742 a0fbdb8
Author: Gregor Jasny 
AuthorDate: Tue Aug 23 15:12:21 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 23 15:12:21 2016 -0400

Merge topic '16101-xcode-fix-directory-exclude-from-all' into next

a0fbdb8b Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0fbdb8b2c928306848dd19de0ceaf5a90c741a7
commit a0fbdb8b2c928306848dd19de0ceaf5a90c741a7
Author: Gregor Jasny 
AuthorDate: Fri Aug 19 21:50:48 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Aug 20 22:27:09 2016 +0200

Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 780ca90..7b7c744 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2639,9 +2639,6 @@ bool cmGlobalXCodeGenerator::CreateGroups(
 {
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (this->IsExcluded(root, *i)) {
-  continue;
-}
 cmMakefile* mf = (*i)->GetMakefile();
 std::vector sourceGroups = mf->GetSourceGroups();
 std::vector tgts = (*i)->GetGeneratorTargets();
@@ -3041,10 +3038,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
   std::vector targets;
   for (std::vector::iterator i = generators.begin();
i != generators.end(); ++i) {
-if (!this->IsExcluded(root, *i)) {
-  if (!this->CreateXCodeTargets(*i, targets)) {
-return false;
-  }
+if (!this->CreateXCodeTargets(*i, targets)) {
+  return false;
 }
   }
   // loop over all targets and add link and depend info
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
new file mode 100644
index 000..f686005
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll.cmake
@@ -0,0 +1,6 @@
+enable_language(CXX)
+
+add_subdirectory(ExcludeFromAll EXCLUDE_FROM_ALL)
+
+add_executable(main main.cpp)
+target_link_libraries(main PRIVATE foo)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
new file mode 100644
index 000..b1df6b0
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(bar STATIC bar.cpp)
+
+add_library(foo STATIC foo.cpp)
+target_include_directories(foo PUBLIC .)
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
new file mode 100644
index 000..7a828bd
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/bar.cpp
@@ -0,0 +1 @@
+#error This should be excluded from all target
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
new file mode 100644
index 000..2789e61
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.cpp
@@ -0,0 +1,3 @@
+#include "foo.h"
+
+int foo() { return 42; }
diff --git a/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h 
b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
new file mode 100644
index 000..5d5f8f0
--- /dev/null
+++ b/Tests/RunCMake/add_subdirectory/ExcludeFromAll/foo.h
@@ -0,0 +1 @@
+int foo();
diff --git a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake 
b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
index 9d514e1..6d9418b 100644
--- a/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
+++ b/Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
@@ -3,3 +3,15 @@ include(RunCMake)
 run_cmake(DoesNotExist)
 run_cmake(Missing)
 run_cmake(Function)
+
+set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ExcludeFromAll)
+set(RunCMake_TEST_NO_CLEAN 1)
+
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+run_cmake(ExcludeFromAll)
+run_cmake_command(ExcludeFromAll-build ${CMAKE_COMMAND} --build .)
+
+unset(RunCMake_TEST_BINARY_DIR)

Re: [cmake-developers] [PATCH] Fix RunCMake.Framework on case sensitive file systems.

[Gregor Jasny via cmake-developers]

On 09/08/16 22:01, Brad King wrote:
> On 08/09/2016 03:47 PM, Chaoren Lin via cmake-developers wrote:
>> The file is lowercase: Tests/RunCMake/Framework/osx.cmake
> 
> Thanks, applied:
> 
>  Tests: Fix RunCMake.Framework on case sensitive file systems.
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=677e73cb

Clang will get a warning for those kind of errors[1] regarding header
files. Would it make sense to add similar warning-functionality to CMake?

Thanks,
Gregor

[1] http://lists.llvm.org/pipermail/cfe-dev/2016-April/048406.html
-- 

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] Email feed for new CMake bugs

[Gregor Jasny via cmake-developers]

Hello,

in the past (with Mantis) I found it quite helpful to see new bugs
posted here on this mailing list. Is it planned to restore that
functionality?

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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1205-g8bbcf86

[Gregor Jasny via Cmake-commits]

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  8bbcf863e5d24a91a371ee9dec87381d6e09da9f (commit)
   via  93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583 (commit)
  from  c0566538859b568a58f23eabe12e49ff2370a140 (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=8bbcf863e5d24a91a371ee9dec87381d6e09da9f
commit 8bbcf863e5d24a91a371ee9dec87381d6e09da9f
Merge: c056653 93ac2a7
Author: Gregor Jasny 
AuthorDate: Tue Aug 9 15:25:55 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Aug 9 15:25:55 2016 -0400

Merge topic '15687-xcode-support-system-include' into next

93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
commit 93ac2a78d5e0dbb6607105cc8d2a3f19ebdd8583
Author: Gregor Jasny 
AuthorDate: Mon Aug 31 22:33:37 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Aug 9 20:30:07 2016 +0200

Xcode: Obey SYSTEM keyword for includes (#15687)

CMake used to put all header search paths into HEADER_SEARCH_PATHS
attribute. Unfortunately this attribute does not support to declare
a search path as a system include.

As a hack one could add a -isystem /path to the cflags but then include
ordering is not deterministic. A better approach was chosen with this
patch by not filling HEADER_SEARCH_PATHS at all and to populate
the C, C++, and Fortran flags directly. The include paths used by
Xcode should be now identical to the ones used by Unix Makefiles and
Ninja generator.

diff --git a/Modules/CMakeSwiftInformation.cmake 
b/Modules/CMakeSwiftInformation.cmake
index 61ad928..85d3143 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -13,6 +13,7 @@
 #  License text for the above reference.)
 
 set(CMAKE_Swift_OUTPUT_EXTENSION .o)
+set(CMAKE_INCLUDE_FLAG_Swift "-I")
 
 # Load compiler-specific information.
 if(CMAKE_Swift_COMPILER_ID)
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index b396ea1..780ca90 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1907,23 +1907,40 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 
   BuildObjectListOrString dirs(this, this->XcodeVersion >= 30);
   BuildObjectListOrString fdirs(this, this->XcodeVersion >= 30);
-  std::vector includes;
-  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
- configName);
   std::set emitted;
   emitted.insert("/System/Library/Frameworks");
-  for (std::vector::iterator i = includes.begin();
-   i != includes.end(); ++i) {
-if (this->NameResolvesToFramework(i->c_str())) {
-  std::string frameworkDir = *i;
-  frameworkDir += "/../";
-  frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
-  if (emitted.insert(frameworkDir).second) {
-fdirs.Add(this->XCodeEscapePath(frameworkDir));
+
+  if (this->XcodeVersion < 60) {
+std::vector includes;
+this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, "C",
+   configName);
+for (std::vector::iterator i = includes.begin();
+ i != includes.end(); ++i) {
+  if (this->NameResolvesToFramework(i->c_str())) {
+std::string frameworkDir = *i;
+frameworkDir += "/../";
+frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
+if (emitted.insert(frameworkDir).second) {
+  fdirs.Add(this->XCodeEscapePath(frameworkDir));
+}
+  } else {
+std::string incpath = this->XCodeEscapePath(*i);
+dirs.Add(incpath);
+  }
+}
+  } else {
+for (std::set::iterator li = languages.begin();
+ li != languages.end(); ++li) {
+  std::vector includes;
+  this->CurrentLocalGenerator->GetIncludeDirectories(includes, gtgt, *li,
+ configName);
+  std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags(
+includes, gtgt, *li, true, false, configName);
+
+  std::string& flags = cflags[*li];
+  if (!includeFlags.empty()) {
+flags += " " + includeFlags;
   }
-} else {
-  std::string incpath = this->XCodeEscapePath(*i);
-  dirs.Add(incpath);
 }
   }
   // Add framework search paths needed for linking.
@@ -2008,6 +2025,9 @@ void 

Re: [CMake] XCode generator and .metal shader files

[Gregor Jasny via CMake]

Hello,

On 22/07/16 23:07, Victor Rykov wrote:
> After adding a .metal file to a target via add_executable the metal file
> does not get pushed to the generated project`s Compile Sources queue and
> subsequently does not compile during project build unless I add the file to
> the queue manually from Xcode, I`ve tried setting compile flags on the
> .metal file as I`ve seen people mention that it works:
> 
> set(MetalTriangle_SHADERS Shaders.metal)
> 
> set_source_files_properties(${MetalTriangle_SHADERS} PROPERTIES
> COMPILE_FLAGS "-fno-fast-math")
> 
> 
> but unfortunately it did not help, is there any workaround to this problem?

Does it help to set the source files LANGUAGE property to C or C++ via
https://cmake.org/cmake/help/v3.6/prop_sf/LANGUAGE.html ?

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

[Cmake-commits] CMake branch, next, updated. v3.6.0-970-gfc0ef29

[Gregor Jasny via Cmake-commits]

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  fc0ef29399c7a03fc5ec11289826e9392a0bb803 (commit)
   via  f951d0adb4f7ca185804fba530a3dbc9b81f1cc5 (commit)
   via  c63380b1955422d7116f7ea90c238ab8619e9bc4 (commit)
   via  134d5c1f7c82698b79d88ba92a7bd98b81dceaec (commit)
   via  2b909c08f526536d4dd84dfe68edf22682ae88ca (commit)
   via  7bfbcc75a3158677897b2a80b02500425620e714 (commit)
  from  e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7 (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=fc0ef29399c7a03fc5ec11289826e9392a0bb803
commit fc0ef29399c7a03fc5ec11289826e9392a0bb803
Merge: e4b2afd f951d0a
Author: Gregor Jasny 
AuthorDate: Fri Jul 22 02:21:47 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 02:21:47 2016 -0400

Merge topic 'app-framework-bundle-extension' into next

f951d0ad Add tests for BUNDLE_EXTENSION
c63380b1 Update documentation about bundle extensions
134d5c1f Honor BUNDLE_EXTENSION also for Frameworks (#14742)
2b909c08 Honor BUNDLE_EXTENSION also for App Bundles (#16148)
7bfbcc75 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f951d0adb4f7ca185804fba530a3dbc9b81f1cc5
commit f951d0adb4f7ca185804fba530a3dbc9b81f1cc5
Author: Gregor Jasny 
AuthorDate: Mon Jul 18 09:11:44 2016 -0700
Commit: Gregor Jasny 
CommitDate: Thu Jul 21 23:18:56 2016 -0700

Add tests for BUNDLE_EXTENSION

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index b77d5d4..0684d57 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -31,13 +31,16 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesOSX-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_IOS=OFF")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_IOS=OFF"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -45,13 +48,16 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesIOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_IOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_IOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -61,13 +67,16 @@ endif()
 if(NOT XCODE_VERSION VERSION_LESS 7)
   set(RunCMake_TEST_BINARY_DIR 
${RunCMake_BINARY_DIR}/XcodeBundlesWatchOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_WATCHOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_WATCHOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
@@ -77,13 +86,16 @@ endif()
 if(NOT XCODE_VERSION VERSION_LESS 7.1)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesTvOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS "-DTEST_TVOS=ON")
+  set(RunCMake_TEST_OPTIONS
+"-DTEST_TVOS=ON"
+"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
   run_cmake(XcodeBundles)
   run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(XcodeBundles-install ${CMAKE_COMMAND} --build . --target 
install)
 
   unset(RunCMake_TEST_BINARY_DIR)
   

[Cmake-commits] CMake branch, next, updated. v3.6.0-964-ge4b2afd

[Gregor Jasny via Cmake-commits]

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  e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7 (commit)
   via  ea6475334aff57633ad7bb80c013c8953328a909 (commit)
  from  d5be5b5f444f165229cfd699eed28fe25bff4342 (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=e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7
commit e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7
Merge: d5be5b5 ea64753
Author: Gregor Jasny 
AuthorDate: Fri Jul 22 00:44:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 00:44:13 2016 -0400

Merge topic 'aliased-target-properties' into next

ea647533 Do not report ALIASED_TARGET as always set (#15783)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea6475334aff57633ad7bb80c013c8953328a909
commit ea6475334aff57633ad7bb80c013c8953328a909
Author: Gregor Jasny 
AuthorDate: Sat Jun 25 22:51:51 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Jul 16 11:09:18 2016 -0700

Do not report ALIASED_TARGET as always set (#15783)

The cmGetPropertyCommand::StoreResult expects NULL for unset
properties. Make ALIASED_TARGET align with that expectation.

Additional corrections to the unit tests are necessary because
get_property removes variables for unset properties (in contrast
to get_target_property which stores a -NOTFOUND value).

diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 854fdb8..2307e08 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
   if (this->Makefile->IsAlias(this->Name)) {
 return this->StoreResult(target->GetName().c_str());
   } else {
-return this->StoreResult((this->Variable + "-NOTFOUND").c_str());
+return this->StoreResult(NULL);
   }
 }
 return this->StoreResult(
diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index 47ccbdc..552c83c 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -66,6 +66,11 @@ endif()
 add_library(iface INTERFACE)
 add_library(Alias::Iface ALIAS iface)
 
+get_property(_aliased_target_set TARGET foo PROPERTY ALIASED_TARGET SET)
+if(_aliased_target_set)
+  message(SEND_ERROR "ALIASED_TARGET is set for target foo")
+endif()
+
 get_target_property(_notAlias1 foo ALIASED_TARGET)
 if (NOT DEFINED _notAlias1)
   message(SEND_ERROR "_notAlias1 is not defined")
@@ -78,12 +83,6 @@ if (NOT _notAlias1 STREQUAL _notAlias1-NOTFOUND)
 endif()
 
 get_property(_notAlias2 TARGET foo PROPERTY ALIASED_TARGET)
-if (NOT DEFINED _notAlias2)
-  message(SEND_ERROR "_notAlias2 is not defined")
-endif()
 if (_notAlias2)
-  message(SEND_ERROR "_notAlias2 is defined, but foo is not an ALIAS")
-endif()
-if (NOT _notAlias2 STREQUAL _notAlias2-NOTFOUND)
-  message(SEND_ERROR "_notAlias2 not defined to a -NOTFOUND variant")
+  message(SEND_ERROR "_notAlias2 evaluates to true, but foo is not an ALIAS")
 endif()

---

Summary of changes:
 Source/cmGetPropertyCommand.cxx  |2 +-
 Tests/AliasTarget/CMakeLists.txt |   13 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)


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

Re: [CMake] Logical block opening error

[Gregor Jasny via CMake]

Hello,

an editor with syntax highlighting and indention support would have 
helped here.


On 04/07/16 01:26, Sambeet Panigrahi wrote:

  IF(NOT NOT_BUILD_SHARED )
  ADD_LIBRARY(orocos-rtt-mqueue-${OROCOS_TARGET}_dynamic SHARED ${CPPS})
  TARGET_LINK_LIBRARIES(orocos-rtt-mqueue-${OROCOS_TARGET}_dynamic
orocos-rtt-${OROCOS_TARGET}_dynamic
${MQ_LIBRARIES} ${Boost_SERIALIZATION_LIBRARY}
)
  SET_TARGET_PROPERTIES( orocos-rtt-mqueue-${OROCOS_TARGET}_dynamic
PROPERTIES
  DEFINE_SYMBOL "RTT_MQ_DLL_EXPORT"
  OUTPUT_NAME orocos-rtt-mqueue-${OROCOS_TARGET}
  CLEAN_DIRECT_OUTPUT 1
  LINK_FLAGS "${MQ_LDFLAGS} ${CMAKE_LD_FLAGS}"
  COMPILE_DEFINITIONS "${OROCOS-RTT_DEFINITIONS}"
  SOVERSION "${RTT_VERSION_MAJOR}.${RTT_VERSION_MINOR}"
  VERSION "${RTT_VERSION}"


The SET_TARGET_PROPERTIES lacks a closing )


ENDIF(NOT NOT_BUILD_SHARED )


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-539-g56b88e2

[Gregor Jasny via Cmake-commits]

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  56b88e20cd8dfdb1cd2abb8ff300b4c48ec06714 (commit)
   via  2ca76a6651dd16586334067f6a41524a4015adc9 (commit)
   via  c68cf9e4d111fa7c92973acec92d71ce6d187ff9 (commit)
  from  76e61c487c40540d7a7bd58a4aaf375d4241b09a (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=56b88e20cd8dfdb1cd2abb8ff300b4c48ec06714
commit 56b88e20cd8dfdb1cd2abb8ff300b4c48ec06714
Merge: 76e61c4 2ca76a6
Author: Gregor Jasny 
AuthorDate: Sun Jun 26 16:18:43 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Jun 26 16:18:43 2016 -0400

Merge topic 'unknown-aliased-target' into next

2ca76a66 Validate target name in ALIASED_TARGET property getter
c68cf9e4 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ca76a6651dd16586334067f6a41524a4015adc9
commit 2ca76a6651dd16586334067f6a41524a4015adc9
Author: Gregor Jasny 
AuthorDate: Sun Jun 26 22:00:00 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Jun 26 22:00:00 2016 +0200

Validate target name in ALIASED_TARGET property getter

diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 06f7504..67b0e9d 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -248,15 +248,14 @@ bool cmGetPropertyCommand::HandleTargetMode()
 return false;
   }
 
-  if (this->PropertyName == "ALIASED_TARGET") {
-if (this->Makefile->IsAlias(this->Name)) {
-  if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) {
+  if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) {
+if (this->PropertyName == "ALIASED_TARGET") {
+  if (this->Makefile->IsAlias(this->Name)) {
 return this->StoreResult(target->GetName().c_str());
+  } else {
+return this->StoreResult((this->Variable + "-NOTFOUND").c_str());
   }
 }
-return this->StoreResult((this->Variable + "-NOTFOUND").c_str());
-  }
-  if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) {
 return this->StoreResult(
   target->GetProperty(this->PropertyName, this->Makefile));
   } else {
diff --git a/Source/cmGetTargetPropertyCommand.cxx 
b/Source/cmGetTargetPropertyCommand.cxx
index dded9f7..073cf32 100644
--- a/Source/cmGetTargetPropertyCommand.cxx
+++ b/Source/cmGetTargetPropertyCommand.cxx
@@ -24,22 +24,18 @@ bool cmGetTargetPropertyCommand::InitialPass(
   std::string prop;
   bool prop_exists = false;
 
-  if (args[2] == "ALIASED_TARGET") {
-if (this->Makefile->IsAlias(targetName)) {
-  if (cmTarget* target = this->Makefile->FindTargetToUse(targetName)) {
-prop = target->GetName();
+  if (cmTarget* tgt = this->Makefile->FindTargetToUse(targetName)) {
+if (args[2] == "ALIASED_TARGET") {
+  if (this->Makefile->IsAlias(targetName)) {
+prop = tgt->GetName();
+prop_exists = true;
+  }
+} else if (!args[2].empty()) {
+  const char* prop_cstr = tgt->GetProperty(args[2], this->Makefile);
+  if (prop_cstr) {
+prop = prop_cstr;
 prop_exists = true;
   }
-}
-  } else if (cmTarget* tgt = this->Makefile->FindTargetToUse(targetName)) {
-cmTarget& target = *tgt;
-const char* prop_cstr = 0;
-if (!args[2].empty()) {
-  prop_cstr = target.GetProperty(args[2], this->Makefile);
-}
-if (prop_cstr) {
-  prop = prop_cstr;
-  prop_exists = true;
 }
   } else {
 bool issueMessage = false;

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmGetPropertyCommand.cxx   |   11 +--
 Source/cmGetTargetPropertyCommand.cxx |   24 ++--
 3 files changed, 16 insertions(+), 21 deletions(-)


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

Re: [cmake-developers] [patch] iOS combined, some fixes

[Gregor Jasny via cmake-developers]

On 21/06/16 18:48, Ruslan Baratov wrote:
> Is the patch applied? Let me know if there are any questions left about it.

Pushed into next. Sorry for the delay.



-- 

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.6.0-rc3-530-g2152e11

[Gregor Jasny via Cmake-commits]

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  2152e11e7a4f9d5bb80e224265e3aba40c92a060 (commit)
   via  e301be8c4f82aeab9a5693e611d93b22a901866e (commit)
   via  3b9d0962e79e8bdeec8a92684d62172197c1ae6d (commit)
   via  1721529fa69b60ec2717e85ef8730de549e226b1 (commit)
   via  f05657de9d1ae7247a527186830d37702ec30de4 (commit)
  from  41a51131f9a253459577cbe4562be5dd368a517d (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=2152e11e7a4f9d5bb80e224265e3aba40c92a060
commit 2152e11e7a4f9d5bb80e224265e3aba40c92a060
Merge: 41a5113 e301be8
Author: Gregor Jasny 
AuthorDate: Fri Jun 24 17:26:16 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jun 24 17:26:16 2016 -0400

Merge topic 'app-framework-bundle-extension' into next

e301be8c Update documentation about bundle extensions
3b9d0962 Honor BUNDLE_EXTENSION also for Frameworks (#14742)
1721529f Honor BUNDLE_EXTENSION also for App Bundles (#16148)
f05657de CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e301be8c4f82aeab9a5693e611d93b22a901866e
commit e301be8c4f82aeab9a5693e611d93b22a901866e
Author: Gregor Jasny 
AuthorDate: Fri Jun 24 23:17:22 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Jun 24 23:17:22 2016 +0200

Update documentation about bundle extensions

diff --git a/Help/prop_tgt/BUNDLE_EXTENSION.rst 
b/Help/prop_tgt/BUNDLE_EXTENSION.rst
index ea265b3..6b3d580 100644
--- a/Help/prop_tgt/BUNDLE_EXTENSION.rst
+++ b/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -1,7 +1,8 @@
 BUNDLE_EXTENSION
 
 
-The file extension used to name a :prop_tgt:`BUNDLE` target on the OS X and 
iOS.
+The file extension used to name a :prop_tgt:`BUNDLE`, a :prop_tgt:`FRAMEWORK`,
+or a :prop_tgt:`MACOSX_BUNDLE` target on the OS X and iOS.
 
-The default value is ``bundle`` - you can also use ``plugin`` or whatever
-file extension is required by the host app for your bundle.
+The default value is ``bundle``, ``framework``, or ``app`` for the respective
+target types.
diff --git a/Help/release/dev/app-framework-bundle-extension.rst 
b/Help/release/dev/app-framework-bundle-extension.rst
new file mode 100644
index 000..01855a2
--- /dev/null
+++ b/Help/release/dev/app-framework-bundle-extension.rst
@@ -0,0 +1,5 @@
+app-framework-bundle-extension
+--
+
+* On Apple platforms the :prop_tgt:`BUNDLE_EXTENSION` now also applies to
+  Frameworks and App Bundles.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b9d0962e79e8bdeec8a92684d62172197c1ae6d
commit 3b9d0962e79e8bdeec8a92684d62172197c1ae6d
Author: Gregor Jasny 
AuthorDate: Sun Jun 19 21:26:40 2016 +0200
Commit: Gregor Jasny 
CommitDate: Fri Jun 24 23:06:45 2016 +0200

Honor BUNDLE_EXTENSION also for Frameworks (#14742)

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4db1bd9..eec3422 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1396,7 +1396,12 @@ std::string 
cmGeneratorTarget::GetFrameworkDirectory(const std::string& config,
 {
   std::string fpath;
   fpath += this->GetOutputName(config, false);
-  fpath += ".framework";
+  fpath += ".";
+  const char* ext = this->GetProperty("BUNDLE_EXTENSION");
+  if (!ext) {
+ext = "framework";
+  }
+  fpath += ext;
   if (!rootDir && !this->Makefile->PlatformIsAppleIos()) {
 fpath += "/Versions/";
 fpath += this->GetFrameworkVersion();
@@ -3013,7 +3018,13 @@ void cmGeneratorTarget::GetFullNameInternal(const 
std::string& config,
   std::string fw_prefix;
   if (this->IsFrameworkOnApple()) {
 fw_prefix = this->GetOutputName(config, false);
-fw_prefix += ".framework/";
+fw_prefix += ".";
+const char* ext = this->GetProperty("BUNDLE_EXTENSION");
+if (!ext) {
+  ext = "framework";
+}
+fw_prefix += ext;
+fw_prefix += "/";
 targetPrefix = fw_prefix.c_str();
 targetSuffix = 0;
   }
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index d27c579..91a90b2 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1843,6 +1843,11 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 std::string fw_version = gtgt->GetFrameworkVersion();
 buildSettings->AddAttribute("FRAMEWORK_VERSION",
 this->CreateString(fw_version));
+const char* ext = 

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-410-gbb9d46a

[Gregor Jasny via Cmake-commits]

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  bb9d46a0c05ba8ee02686eb2bb6b54653154efac (commit)
   via  e36e5a2680f34c64773944b152e5337f8951a644 (commit)
  from  c4b7479bd0583670302562c9d1841fa13b3c8fea (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=bb9d46a0c05ba8ee02686eb2bb6b54653154efac
commit bb9d46a0c05ba8ee02686eb2bb6b54653154efac
Merge: c4b7479 e36e5a2
Author: Gregor Jasny 
AuthorDate: Sat Jun 18 17:23:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Jun 18 17:23:56 2016 -0400

Merge topic 'xcode-bundle-extension' into next

e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36e5a2680f34c64773944b152e5337f8951a644
commit e36e5a2680f34c64773944b152e5337f8951a644
Author: Gregor Jasny 
AuthorDate: Sat Jun 18 22:59:40 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Jun 18 23:23:32 2016 +0200

Xcode: Properly handle BUNDLE_EXTENSION

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index d30830a..e82cb16 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1801,6 +1801,11 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   extraLinkOptions += " ";
   extraLinkOptions += createFlags;
 }
+const char* ext = gtgt->GetProperty("BUNDLE_EXTENSION");
+if (ext) {
+  buildSettings->AddAttribute("WRAPPER_EXTENSION",
+  this->CreateString(ext));
+}
 std::string plist = this->ComputeInfoPListLocation(gtgt);
 // Xcode will create the final version of Info.plist at build time,
 // so let it replace the cfbundle name. This avoids creating
diff --git a/Tests/CFBundleTest/CMakeLists.txt 
b/Tests/CFBundleTest/CMakeLists.txt
index 5cda527..0fe6bb7 100644
--- a/Tests/CFBundleTest/CMakeLists.txt
+++ b/Tests/CFBundleTest/CMakeLists.txt
@@ -50,7 +50,6 @@ set_source_files_properties(
 set_target_properties(CFBundleTest PROPERTIES
 BUNDLE 1
 BUNDLE_EXTENSION plugin
-XCODE_ATTRIBUTE_WRAPPER_EXTENSION plugin  #sets the extension to .plugin
 XCODE_ATTRIBUTE_MACH_O_TYPE mh_bundle
 XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
 MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |5 +
 Tests/CFBundleTest/CMakeLists.txt |1 -
 2 files changed, 5 insertions(+), 1 deletion(-)


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

Re: [cmake-developers] [patch] iOS combined, some fixes

[Gregor Jasny via cmake-developers]

Hello,

Thanks for the patch!

On 15/06/16 16:41, Ruslan Baratov wrote:
> Sending some fixes found by testing with Xcode 7.3

We were chasing some errors regarding the unified build some time ago.
But it appeared some for of heisenbug: the more I looked the less likely
it happened.

Is the error 100% reproducible for you? And do you know what goes wrong?

Does the

   list(LENGTH _lipo_path len)
   if(NOT len EQUAL 1)

take paths with spaces into account?

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

[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-291-g5ec42ea

[Gregor Jasny via Cmake-commits]

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  5ec42eaf96b0088cd5b3e989e7458b73b65e5951 (commit)
   via  b3ba006100b776351c62d8e2b53beadff771bf13 (commit)
   via  1dffee9afe54314b9522f8cfcf72bb48baad6fbc (commit)
   via  8d4ed32eff88dfb708a3e403641c28eedd42 (commit)
   via  91a77cfaa78364affc99562cfdc357a70f972ca9 (commit)
   via  2a942b6eab0521bd22e8841a52b3c7f22d069059 (commit)
  from  f6355822b1bb2874cf6130dbd0f8bd10654bb9d3 (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=5ec42eaf96b0088cd5b3e989e7458b73b65e5951
commit 5ec42eaf96b0088cd5b3e989e7458b73b65e5951
Merge: f635582 b3ba006
Author: Gregor Jasny 
AuthorDate: Mon Jun 13 12:22:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Jun 13 12:22:04 2016 -0400

Merge topic 'xcode-mig-support' into next

b3ba0061 Xcode: Add support for mig files
1dffee9a Xcode: Add XCODE_FILE_ATTRIBUTES source file property
8d4ed32e Xcode: Don't emit empty settings blocks.
91a77cfa Xcode: Add function to conditionally add Xcode Attributes
2a942b6e Xcode: Add const qualifiers


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3ba006100b776351c62d8e2b53beadff771bf13
commit b3ba006100b776351c62d8e2b53beadff771bf13
Author: James Touton 
AuthorDate: Fri Jun 3 18:27:39 2016 -0700
Commit: Gregor Jasny 
CommitDate: Sun Jun 12 22:20:22 2016 +0200

Xcode: Add support for mig files

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 8eefb19..d30830a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -787,6 +787,8 @@ std::string GetSourcecodeValueFromFileExtension(const 
std::string& _ext,
 sourcecode += ".asm";
   } else if (ext == "metal") {
 sourcecode += ".metal";
+  } else if (ext == "mig") {
+sourcecode += ".mig";
   }
   // else
   //  {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dffee9afe54314b9522f8cfcf72bb48baad6fbc
commit 1dffee9afe54314b9522f8cfcf72bb48baad6fbc
Author: James Touton 
AuthorDate: Fri Jun 3 18:51:18 2016 -0700
Commit: Gregor Jasny 
CommitDate: Sun Jun 12 22:20:22 2016 +0200

Xcode: Add XCODE_FILE_ATTRIBUTES source file property

This adds values to the ATTRIBUTES list in PBXBuildFile settings.

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 3403dcd..1c64d63 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -344,6 +344,7 @@ Properties on Source Files
/prop_sf/VS_XAML_TYPE
/prop_sf/WRAP_EXCLUDE
/prop_sf/XCODE_EXPLICIT_FILE_TYPE
+   /prop_sf/XCODE_FILE_ATTRIBUTES
/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE
 
 .. _`Cache Entry Properties`:
diff --git a/Help/prop_sf/XCODE_FILE_ATTRIBUTES.rst 
b/Help/prop_sf/XCODE_FILE_ATTRIBUTES.rst
new file mode 100644
index 000..39e6966
--- /dev/null
+++ b/Help/prop_sf/XCODE_FILE_ATTRIBUTES.rst
@@ -0,0 +1,11 @@
+XCODE_FILE_ATTRIBUTES
+-
+
+Add values to the Xcode ``ATTRIBUTES`` setting on its reference to a
+source file.  Among other things, this can be used to set the role on
+a mig file::
+
+  set_source_files_properties(defs.mig
+  PROPERTIES
+  XCODE_FILE_ATTRIBUTES "Client;Server"
+  )
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index b439018..8eefb19 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -714,6 +714,20 @@ cmXCodeObject* 
cmGlobalXCodeGenerator::CreateXCodeSourceFile(
 }
   }
 
+  // Add user-specified file attributes.
+  const char* extraFileAttributes = sf->GetProperty("XCODE_FILE_ATTRIBUTES");
+  if (extraFileAttributes) {
+// Expand the list of attributes.
+std::vector attributes;
+cmSystemTools::ExpandListArgument(extraFileAttributes, attributes);
+
+// Store the attributes.
+for (std::vector::const_iterator ai = attributes.begin();
+ ai != attributes.end(); ++ai) {
+  attrs->AddObject(this->CreateString(*ai));
+}
+  }
+
   settings->AddAttributeIfNotEmpty("ATTRIBUTES", attrs);
 
   // Add the fileRef to the top level Resources group/folder if it is not

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d4ed32eff88dfb708a3e403641c28eedd42
commit 8d4ed32eff88dfb708a3e403641c28eedd42
Author: James Touton 
AuthorDate: Fri Jun 3 18:32:38 2016 -0700
Commit: Gregor Jasny 

Re: [cmake-developers] CMake 3.5.2 conflates OSX SDK version with target deployment

[Gregor Jasny via cmake-developers]

I'm away from keyboard until June 8th. everything written is from the top
of my head.

AFAIR the warning goes away if you properly set the OSX SYSROOT. Setting it
to macosx without version number should be sufficient (maybe you have to
insert a xcrun --showsdk-path there).

As far as I see the warning originates from times where Xcode bundled two
SDKs and CMake was not sure which one to pick if there was no direct match
between of the deployment target version.

I would keep the warning but document the mechanics between SYSROOT and
Deployment Target. The warning then could refer to the docs.

In the long term CMake should provide a tool chain file for OSX and iOS.

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] Cannot include third-party Framework headers directories as system directories in XCode for avoiding their warning

[Gregor Jasny via CMake]

Hello,

On 11/05/16 09:25, Attila Krasznahorkay wrote:
> I'm a bit surprised by this. I had to explicitly tell CMake not to treat 
> includes coming from imported targets as system includes. Using this variable:
> 
> https://cmake.org/cmake/help/v3.0/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.html
> https://cmake.org/cmake/help/v3.0/prop_tgt/NO_SYSTEM_FROM_IMPORTED.html
> 
> So I think this is in general a MacOS specific issue. I remember reading 
> about such issues a while ago. That CMake would not recognise that MacOS X's 
> clang would accept the -isystem argument out of the box.

This is a known bug: http://public.kitware.com/Bug/view.php?id=15687
Please look there for possible work-arounds.

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

Re: [cmake-developers] CLang error when building iOS bundle

[Gregor Jasny via cmake-developers]

Hello,

On 11/05/16 21:22, Roman Wüger wrote:
> I got the following error when linking the iOS bundle:
> 
> clang: error: cannot specify -o when generating multiple output files
> 
> I didn’t found anything about the error in the internet, so maybe someone
> has already solved such error?
> 
> Does any one have a hint what could be wrong?

I cannot see any suspicious things, either (besides that -arch armv7 is
listed twice). I would suggest you create a new user on the machine and
try there. Or you could remove ~/Library/Developer/Xcode/DerivedData first.

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] [cmake-developers] CLang error when building iOS bundle

[Gregor Jasny via CMake]

Hello,

On 11/05/16 21:22, Roman Wüger wrote:
> I got the following error when linking the iOS bundle:
> 
> clang: error: cannot specify -o when generating multiple output files
> 
> I didn’t found anything about the error in the internet, so maybe someone
> has already solved such error?
> 
> Does any one have a hint what could be wrong?

I cannot see any suspicious things, either (besides that -arch armv7 is
listed twice). I would suggest you create a new user on the machine and
try there. Or you could remove ~/Library/Developer/Xcode/DerivedData first.

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

Re: [CMake] Xcode generator results in a project file without optimization

[Gregor Jasny via CMake]

On 10/05/16 01:52, Siyuan Ren wrote:
> Version 7.3.1 (7D1014)

Could you please share your build and source directory with me?

-- 

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] Xcode generator results in a project file without optimization

[Gregor Jasny via CMake]

On 02/05/16 11:16, Siyuan Ren wrote:
> I have CMake 3.5.2.
> 
> I write a simple CMakeLists.txt like the below
> 
> ```
> project(mytest)
> add_executable(mytest test.cpp)
> ```
> 
> Then generate the Xcode project file with `cmake -G Xcode .`. Open the
> project file in Xcode, and I found the optimization level on all kinds
> of build, including "Debug", "Release", "RelWithDebInfo",
> "MinSizeRel", to be "None (-O0)".
> 
> Do I do something wrong? Or CMake Xcode generator cannot even handle
> the simplest project right?

Works for me:
xcodebuild -showBuildSettings -target mytest -configuration Release|grep
OPTIMI
GCC_OPTIMIZATION_LEVEL = 3


Which version of Xcode do you use?
-- 

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] Integration of clang-tidy

[Gregor Jasny via cmake-developers]

Hallo Daniel,

On 09/04/16 00:31, Daniel Pfeifer wrote:
> I implemented the integration of `clang-tidy` along the lines of the
> `include-what-you-use` integration.
> There is a new `_CLANG_TIDY` target property that is initialized
> with the value of the `CMAKE__CLANG_TIDY` variable.
> It contains the command line for `clang-tidy` as a ;-list.

I'm wondering what's the advantage of having this built-in support for
clang tidy over using the generated compile command database instead?

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

[Cmake-commits] CMake branch, next, updated. v3.5.2-1110-g3483677

[Gregor Jasny via Cmake-commits]

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  3483677c2681eb5627e7bfdffdaa0e3402fd2cca (commit)
   via  2d7d33ecb3efc5446c25d3ecb9327cd3fa2bae28 (commit)
  from  b3f751575385969e808fdaf45de09958822d5b1a (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=3483677c2681eb5627e7bfdffdaa0e3402fd2cca
commit 3483677c2681eb5627e7bfdffdaa0e3402fd2cca
Merge: b3f7515 2d7d33e
Author: Gregor Jasny 
AuthorDate: Wed Apr 27 16:40:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Apr 27 16:40:04 2016 -0400

Merge topic 'hyperlink-documentation' into next

2d7d33ec Help: Hyperlink properties


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d7d33ecb3efc5446c25d3ecb9327cd3fa2bae28
commit 2d7d33ecb3efc5446c25d3ecb9327cd3fa2bae28
Author: Gregor Jasny 
AuthorDate: Wed Apr 27 22:38:59 2016 +0200
Commit: Gregor Jasny 
CommitDate: Wed Apr 27 22:38:59 2016 +0200

Help: Hyperlink properties

diff --git a/Help/prop_dir/LISTFILE_STACK.rst b/Help/prop_dir/LISTFILE_STACK.rst
index f729c1e..22ec4b6 100644
--- a/Help/prop_dir/LISTFILE_STACK.rst
+++ b/Help/prop_dir/LISTFILE_STACK.rst
@@ -5,5 +5,6 @@ The current stack of listfiles being processed.
 
 This property is mainly useful when trying to debug errors in your
 CMake scripts.  It returns a list of what list files are currently
-being processed, in order.  So if one listfile does an INCLUDE command
-then that is effectively pushing the included listfile onto the stack.
+being processed, in order.  So if one listfile does an
+:command:`include` command then that is effectively pushing the
+included listfile onto the stack.
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst 
b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
index 185246c..e52f8eb 100644
--- a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
@@ -1,9 +1,10 @@
 FIND_LIBRARY_USE_LIB64_PATHS
 
 
-Whether FIND_LIBRARY should automatically search lib64 directories.
+Whether :command:`find_library` should automatically search lib64
+directories.
 
 FIND_LIBRARY_USE_LIB64_PATHS is a boolean specifying whether the
-FIND_LIBRARY command should automatically search the lib64 variant of
-directories called lib in the search path when building 64-bit
-binaries.
+:command:`find_library` command should automatically search the lib64
+variant of directories called lib in the search path when building
+64-bit binaries.
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst 
b/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
index 9a3edd8..beb94ac 100644
--- a/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.rst
@@ -1,9 +1,10 @@
 FIND_LIBRARY_USE_OPENBSD_VERSIONING
 ---
 
-Whether FIND_LIBRARY should find OpenBSD-style shared libraries.
+Whether :command:`find_library` should find OpenBSD-style shared
+libraries.
 
-This property is a boolean specifying whether the FIND_LIBRARY command
-should find shared libraries with OpenBSD-style versioned extension:
-".so..".  The property is set to true on OpenBSD and
-false on other platforms.
+This property is a boolean specifying whether the
+:command:`find_library` command should find shared libraries with
+OpenBSD-style versioned extension: ".so..".  The
+property is set to true on OpenBSD and false on other platforms.
diff --git a/Help/prop_gbl/IN_TRY_COMPILE.rst b/Help/prop_gbl/IN_TRY_COMPILE.rst
index 3a2ef5b..fd2d2e1 100644
--- a/Help/prop_gbl/IN_TRY_COMPILE.rst
+++ b/Help/prop_gbl/IN_TRY_COMPILE.rst
@@ -3,4 +3,5 @@ IN_TRY_COMPILE
 
 Read-only property that is true during a try-compile configuration.
 
-True when building a project inside a TRY_COMPILE or TRY_RUN command.
+True when building a project inside a :command:`try_compile` or
+:command:`try_run` command.
diff --git a/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst 
b/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst
index e85b823..bf8c9a3 100644
--- a/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst
+++ b/Help/prop_gbl/PREDEFINED_TARGETS_FOLDER.rst
@@ -5,5 +5,5 @@ Name of FOLDER for targets that are added automatically by 
CMake.
 
 If not set, CMake uses "CMakePredefinedTargets" as a default value for
 this property.  Targets such as INSTALL, PACKAGE and RUN_TESTS will be
-organized into this FOLDER.  See also the documentation for the FOLDER
-target property.
+organized into this FOLDER.  See also the 

Re: [CMake] OBJECT Libraries with Xcode Generator

[Gregor Jasny via CMake]

On 06/04/16 20:32, Matthew Keeler wrote:
>  
> I think I ran into a bug but I am wondering if anyone has seen it an worked 
> around.
> 
> I have a source structure like the following (this is a contrived small 
> example to illustrate the problem):  
> 
> - CMakeLists.txt  
> - main.c
> - lib
>- CMakeLists.txt
>- x.c
>- x.h
>- alt1
>   - x.c
>   - x.h
>- alt2
>   - x.c
>   - x.h
> 
> CMakeLists.txt:
> 
>cmake_minimum_required(VERSION 3.5)
>project(example)
>add_subdirectory(lib)
>include_directories(lib)
>add_executable(main main.c $)
> 
> 
> main.c:
> 
>#include "x.h"
>
>int main()
>{
>   return example_func();
>}
> 
> lib/CMakeLists.txt:
> 
>option(ALT1 "ALT1" ON)
>option(ALT2 "ALT2" ON)
>set(SOURCES x.c)
>if ( ALT1 )
>   add_definitions(-DALT1)
>   list(APPEND SOURCES alt1/x.c)
>elseif ( ALT2 )
>   add_definitions(-DALT2)
>   list(APPEND SOURCES alt2/x.c)
>else ()
>message(FATAL_ERROR "No alt defined")
>endif()
>add_library(example OBJECT ${SOURCES})
> 
> lib/x.h:
> 
>#ifndef X_H
>#define X_H
>int example_func();
>#endif
> 
> lib/x.c:
> 
> #include "x.h"
> #ifdef ALT2
> #include "alt2/x.h"
> #else
> #include "alt1/x.h"
> #endif
> int example_func()
> {
>   return call_example_func();
> }
> 
> 
> lib/alt1/x.h:
> 
>#ifndef ALT1_X_H
>#define ALT1_X_H
>int alt1_example_func();
>#define call_example_func() alt1_example_func()
>#endif
> 
> 
> lib/alt1/x.c:
> 
>int alt1_example_func()
>{
>   return 1;
>}
> 
> lib/alt2/x.h:
> 
>#ifndef ALT2_X_H
>#define ALT2_X_H
>int alt2_example_func();
>#define call_example_func() alt2_example_func()
>#endif
> 
> 
> lib/alt2/x.c:
> 
>int alt2_example_func()
>{
>   return 2;
>}
> 
> 
> 
> Now if I run cmake using the makefile generator and then run make, all is 
> well and everything is built and runs as expected. If I use the Xcode 
> generator I get the following errors:
> 
> clang: error: no such file or directory: ‘ directory>/lib/example.build/Debug/example.build/Objects-normal/x86_64/x.o’
> 
> Within the directory  directory>/lib/example.build/Debug/example.build/Objects-normal/x86_64 there 
> is in fact no x.o. Instead there are two files, x-8171277E06B93FB2.o and 
> x-FA155118579B6D7E.o. So it looks like for the XCode generators sources 
> intermediate object files for a single CMakeLists.txt are stored within a 
> single directory. And in this case the sources have the same name so the 
> x-.o names are used instead. However the $ generator 
> expression seems to be referencing an incorrect name. Is there any workaround 
> so that for the Xcode generator it will not store all the build artifacts in 
> a single directory and not use the object file name with the unique id in it 
> and secondly where is the proper place to file a bug for this.

Thank you for the minimal example. Please file a bug in the bug tracker.

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

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

[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] EFFECTIVE_PLATFORM_NAME not expanded in TARGET_* generator expressions on iOS

[Gregor Jasny via CMake]

Hello,

I fear you're one of the first users of the XCtest feature :)

On 21/03/16 13:42, Vladimír Vondruš wrote:

Hello,

I came across this problem when trying to use XCTest macros ( 
https://cmake.org/cmake/help/latest/module/FindXCTest.html ) on iOS. When 
compiling for OSX, ctest properly executes all test cases, but when targeting 
iOS or iOS simulator, all the test cases fail similarly to the following:

 25: Test command: /Applications/Xcode.app/Contents/Developer/usr/bin/xctest 
"/Users/mosra/Code/corrade/build-ioss/src/Corrade/Utility/Test/Debug${EFFECTIVE_PLATFORM_NAME}/UtilityTypeTraitsTestRunner.xctest/../.."
 25: Environment variables:
 25:  
DYLD_FRAMEWORK_PATH=/Users/mosra/Code/corrade/build-ioss/src/Corrade/Utility/Test/Debug${EFFECTIVE_PLATFORM_NAME}/UtilityTypeTraitsTest.framework/..
 25: Test timeout computed to be: 9.99988e+06
 25: 2016-03-21 12:41:38.799 xctest[31113:31078264] The bundle “Test” 
couldn’t be loaded because its executable couldn’t be located. Try reinstalling 
the bundle.
 25/28 Test #25: UtilityTypeTraitsTest ...***Failed0.04 sec

As you can see, the `${EFFECTIVE_PLATFORM_NAME}` is not being expanded to 
`-iphonesimulator` and thus the file is not found. The problem is that the 
`$` generator expression does not expand the 
variable. On the other hand, installation works without an issue, because the 
`cmake_install.cmake` scripts do additional round of variable expansion that 
(accidentally?) fixes this. The relevant part of the CMake source is here: 
https://github.com/Kitware/CMake/blob/cd569b962dbeaa7ea718021c16582cddd158df3a/Source/cmGeneratorTarget.cxx#L5063

 From the source it looks like the generator is just putting the 
"${EFFECTIVE_PLATFORM_NAME}" output and hopes that someone later expands it. 
That's the case with install scripts (so they work), but not with generator expressions. 
The `TARGET_LINKER_FILE_DIR` is not the only affected, the problem is the same for all 
`TARGET_*` generator expressions.

Currently I'm working around this by partially hardcoding the path, but that's 
far from ideal and I would like to avoid that:

 if(CMAKE_OSX_SYSROOT MATCHES "iPhoneOS")
 set(platform_name "-iphoneos")
 elseif(CMAKE_OSX_SYSROOT MATCHES "iPhoneSimulator")
 set(platform_name "-iphonesimulator")
 endif()
 set(target_linker_file_dir 
${CMAKE_CURRENT_BINARY_DIR}/$${platform_name}/${target}.xctest)

Is there any way to fix this directly in CMake? Also the above workaround works 
only when targeting single SDK and not when having single generated project for 
both the device and the simulator.


Could you please send me a minimal example and a command line how you 
invoke CMake?


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

[Cmake-commits] CMake branch, next, updated. v3.5.1-671-g2d932b4

[Gregor Jasny via Cmake-commits]

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  2d932b45dc63e8fb0f43fdcb9f69a6d020e553da (commit)
   via  ed8979540f1f0549bb7ab5432a1a35e46790ba76 (commit)
  from  0f364a2b1b134ce79fe62093f959d0d79657a96c (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=2d932b45dc63e8fb0f43fdcb9f69a6d020e553da
commit 2d932b45dc63e8fb0f43fdcb9f69a6d020e553da
Merge: 0f364a2 ed89795
Author: Gregor Jasny 
AuthorDate: Mon Mar 28 16:35:33 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Mar 28 16:35:33 2016 -0400

Merge topic 'asm-includes' into next

ed897954 Add missing  placeholder for ASM languages


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed8979540f1f0549bb7ab5432a1a35e46790ba76
commit ed8979540f1f0549bb7ab5432a1a35e46790ba76
Author: Gregor Jasny 
AuthorDate: Fri Mar 25 23:18:07 2016 +0100
Commit: Gregor Jasny 
CommitDate: Fri Mar 25 23:18:07 2016 +0100

Add missing  placeholder for ASM languages

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:
 Modules/CMakeASM-ATTInformation.cmake   |2 +-
 Modules/CMakeASM_NASMInformation.cmake  |2 +-
 Modules/Compiler/ARMCC-ASM.cmake|2 +-
 Modules/Platform/Generic-ADSP-ASM.cmake |2 +-
 Modules/Platform/gas.cmake  |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


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

Re: [CMake] CMAKE_SIZEOF_VOID_P is unset when building libgit2 on Windows

[Gregor Jasny via CMake]

On 25/03/16 22:11, Sebastian Schuberth wrote:
> I also just realized CMAKE_C_ABI_COMPILER is set to FALSE in
> CMakeCCompiler.cmake. Looking at CMakeError.log was a good hint. I
> found:
> 
> ---8<---
> Building C object CMakeFiles/cmTC_c0166.dir/CMakeCCompilerABI.c.obj
> 
> C:/Ruby-DevKit/mingw/bin/gcc.exe-fPIC-o
> CMakeFiles/cmTC_c0166.dir/CMakeCCompilerABI.c.obj   -c "C:/Program
> Files (x86)/CMake/share/cmake-3.5/Modules/CMakeCCompilerABI.c"
> 
> /usr/bin/sh: -c: line 0: syntax error near unexpected token `('
> /usr/bin/sh: -c: line 0: `C:/Ruby-DevKit/mingw/bin/gcc.exe-fPIC
> -o CMakeFiles/cmTC_c0166.dir/CMakeCCompilerABI.c.obj   -c \C:/Program
> Files (x86)/CMake/share/cmake-3.5/Modules/CMakeCCompilerABI.c\'
> CMakeFiles/cmTC_c0166.dir/build.make:65: recipe for target
> 'CMakeFiles/cmTC_c0166.dir/CMakeCCompilerABI.c.obj' failed
> ---8<---

To unblock you until the problem is sorted out you might want to install
a 64bit version of cmake which should not have the problematic (x86) in
the path (or you choose a custom install location).

http://ifw.podsvirov.pro/cmake/files/v3.5/

Hope that helps,
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

Re: [cmake-developers] [CMake 0016030]: CMAKE_ASM_NASM_COMPILE_OBJECT lacks

[Gregor Jasny via cmake-developers]

On 25/03/16 19:28, Brad King wrote:
> On 03/25/2016 01:46 PM, Gregor Jasny via cmake-developers wrote:
>> Does anyone see a reason to *not* prepend all  with a ?
> 
> I'm not particularly familiar with the ASM tooling landscape but
> that prepend step is exactly what was done for all other languages
> in commit v3.4.0-rc1~342^2 (Factor an  placeholder out
> of  in rule variables, 2015-07-13):
> 
>   Factor an  placeholder out of  in rule variables
>   https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c736de7b
> 
> Since prior to that change the -I flags were included in 
> I think leaving ASM changes out of the commit was an oversight.

I pushed a first commit to asm-includes topic but did not merge to next,
yet. Looking at your quoted patch I wonder if  is missing as well?

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

[Cmake-commits] CMake branch, next, updated. v3.5.1-657-g021e01c

[Gregor Jasny via Cmake-commits]

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  021e01c423475f7c358a50775e0fc4073be8e75c (commit)
   via  62473f5689e6b03ec92b266b5feb822aec2b88dc (commit)
  from  7d8ab1b2b2ee7cc15940cf6e97ba034d91bbb074 (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=021e01c423475f7c358a50775e0fc4073be8e75c
commit 021e01c423475f7c358a50775e0fc4073be8e75c
Merge: 7d8ab1b 62473f5
Author: Gregor Jasny 
AuthorDate: Fri Mar 25 17:35:18 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Mar 25 17:35:18 2016 -0400

Merge topic 'xcode73-xctest-location' into next

62473f56 Xcode: Fixup XCTest bundle location for Xcode 7.3


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62473f5689e6b03ec92b266b5feb822aec2b88dc
commit 62473f5689e6b03ec92b266b5feb822aec2b88dc
Author: Gregor Jasny 
AuthorDate: Fri Mar 25 22:20:14 2016 +0100
Commit: Gregor Jasny 
CommitDate: Fri Mar 25 22:20:14 2016 +0100

Xcode: Fixup XCTest bundle location for Xcode 7.3

Prior to Xcode 7.3 a XCTest bundle was built like an ordinary
bundle. But starting with Xcode 7.3 it is implicitely built as
a plugin for the test host. It looks like in that case the
'Build Products Path' is ignored.

This patch simply sets the CMake target output path to the value
Xcode expects internally to get a matching view of both.

The command:

  xcodebuild -showBuildSettings -target CocoaExampleTests -configuration 
Debug

Output with Xcode 7.2:

  TARGET_BUILD_DIR = .../Tests/XCTest/Debug

Output with Xcode 7.3

  TARGET_BUILD_DIR = 
.../Tests/XCTest/Debug/CocoaExample.app/Contents/PlugIns

Signed-off-by: Gregor Jasny 

diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake
index 3cd9c22..805a58c 100644
--- a/Modules/FindXCTest.cmake
+++ b/Modules/FindXCTest.cmake
@@ -140,6 +140,10 @@ function(xctest_add_bundle target testee)
   set_target_properties(${target} PROPERTIES
 XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
 XCODE_ATTRIBUTE_TEST_HOST "$")
+  if(NOT XCODE_VERSION VERSION_LESS 7.3)
+set_target_properties(${target} PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY "$/../PlugIns")
+  endif()
 else(XCODE)
   target_link_libraries(${target}
 PRIVATE -bundle_loader $)

---

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


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

Re: [cmake-developers] [CMake 0016030]: CMAKE_ASM_NASM_COMPILE_OBJECT lacks

[Gregor Jasny via cmake-developers]

Hello,

On 22/03/16 17:10, Mantis Bug Tracker wrote:
> Starting with CMake 3.4 the ASM_NASM language does not pass forward
> include_directories(XYZ) to the nasm compiler line.
> 
> As far as I can see  is missing for other assemblers as well.

When I grep for CMAKE_ASM * _COMPILE_OBJECT I get the (non-complete) list:

> Modules/CMakeASM-ATTInformation.cmake:set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT
>  "  -o  ")
> Modules/CMakeASMInformation.cmake:  
> set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT 
> "-o  
> -c ")
> Modules/CMakeASM_MASMInformation.cmake:set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT
>  "/c  /Fo 
>  ")
> Modules/CMakeASM_NASMInformation.cmake:set(CMAKE_ASM_NASM_COMPILE_OBJECT 
> "  -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o 
>  ")
> Modules/Compiler/ARMCC-ASM.cmake:set(CMAKE_ASM_COMPILE_OBJECT   
> "  -o  ")
> Modules/Compiler/IAR-ASM.cmake:set(CMAKE_ASM_COMPILE_OBJECT  
> " -o ")
> Modules/Compiler/TI-ASM.cmake:set(CMAKE_ASM_COMPILE_OBJECT  
> " --compile_only --asm_file=   
>  --output_file=")
> Modules/Platform/gas.cmake:set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT 
> "  -o  ")

Does anyone see a reason to *not* prepend all  with a ?

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

[Cmake-commits] CMake branch, next, updated. v3.5.0-409-g49cff25

[Gregor Jasny via Cmake-commits]

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  49cff25ca3e667d6d5a20a6b64ed55ef875890c1 (commit)
   via  111cd679191c8aa4e081765ac4f7bc2e08657c7f (commit)
  from  96f661517d1e98a7a940f16781e6713745074e2a (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=49cff25ca3e667d6d5a20a6b64ed55ef875890c1
commit 49cff25ca3e667d6d5a20a6b64ed55ef875890c1
Merge: 96f6615 111cd67
Author: Gregor Jasny 
AuthorDate: Wed Mar 9 14:33:43 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Mar 9 14:33:43 2016 -0500

Merge topic 'xcode-regenerate-on-deleted-files' into next

111cd679 Xcode: ReRunCMake even if files disappeared (#15992)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=111cd679191c8aa4e081765ac4f7bc2e08657c7f
commit 111cd679191c8aa4e081765ac4f7bc2e08657c7f
Author: Gregor Jasny 
AuthorDate: Sun Mar 6 17:46:53 2016 +0100
Commit: Gregor Jasny 
CommitDate: Wed Mar 9 20:33:01 2016 +0100

Xcode: ReRunCMake even if files disappeared (#15992)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index ef18729..7c85281 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -593,19 +593,28 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   cmGeneratedFileStream makefileStream
 (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
-  makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = root->GetBinaryDirectory();
-  checkCache += "/";
-  checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
-  checkCache += "cmake.check_cache";
-  makefileStream << this->ConvertToRelativeForMake(checkCache.c_str())
- << ": ";
+  makefileStream << "# Generated by CMake, DO NOT EDIT\n\n";
+
+  makefileStream << "empty:= \n";
+  makefileStream << "space:= $(empty) $(empty)\n";
+  makefileStream << "spaceplus:= $(empty)\\ $(empty)\n\n";
+
   for(std::vector::const_iterator i = lfiles.begin();
   i !=  lfiles.end(); ++i)
 {
-makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
+makefileStream << "TARGETS += $(subst $(space),$(spaceplus),$(wildcard "
+   << this->ConvertToRelativeForMake(i->c_str())
+   << "))\n";
 }
-  makefileStream << "\n\t" <<
+
+  std::string checkCache = root->GetBinaryDirectory();
+  checkCache += "/";
+  checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
+  checkCache += "cmake.check_cache";
+
+  makefileStream << "\n" << this->ConvertToRelativeForMake(checkCache.c_str())
+ << ": $(TARGETS)\n";
+  makefileStream << "\t" <<
 this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
  << " -H" << this->ConvertToRelativeForMake(
root->GetSourceDirectory())
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake 
b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 31c72fb..51e0b0a 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -40,3 +40,42 @@ if(NOT RunCMake_GENERATOR MATCHES "Visual Studio [67]|Xcode")
 endif()
 
 run_BuildDepends(Custom-Always)
+
+function(run_ReGeneration)
+  # test re-generation of project even if CMakeLists.txt files disappeared
+
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/regenerate-project-build)
+  set(RunCMake_TEST_SOURCE_DIR 
${RunCMake_BINARY_DIR}/regenerate-project-source)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+  set(ProjectHeader [=[
+cmake_minimum_required(VERSION 3.5)
+project(Regenerate-Project NONE)
+  ]=])
+
+  # create project with subdirectory
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
+"add_subdirectory(mysubdir)")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
+
+  run_cmake(Regenerate-Project)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay})
+
+  # now we delete the subdirectory and adjust the CMakeLists.txt
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
+
+  run_cmake_command(Regenerate-Project-Directory-Removed
+${CMAKE_COMMAND} --build 

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-307-g67e7b48

[Gregor Jasny via Cmake-commits]

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  67e7b4843d0df72f6b50278970352c42852ead17 (commit)
   via  b59d4aa65317e1c2292bd70d85e2de65fe773dec (commit)
  from  5be433e1cad0265f8e972c7a18f3f489878657fe (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=67e7b4843d0df72f6b50278970352c42852ead17
commit 67e7b4843d0df72f6b50278970352c42852ead17
Merge: 5be433e b59d4aa
Author: Gregor Jasny 
AuthorDate: Mon Feb 29 03:30:27 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 29 03:30:27 2016 -0500

Merge topic 'xcode-regenerate-on-deleted-files' into next

b59d4aa6 Revert "Xcode: ReRunCMake even if files disappeared (#15992)"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59d4aa65317e1c2292bd70d85e2de65fe773dec
commit b59d4aa65317e1c2292bd70d85e2de65fe773dec
Author: Gregor Jasny 
AuthorDate: Mon Feb 29 09:29:50 2016 +0100
Commit: Gregor Jasny 
CommitDate: Mon Feb 29 09:29:50 2016 +0100

Revert "Xcode: ReRunCMake even if files disappeared (#15992)"

Whitespace handling in paths is broken.

This reverts commit aa4b5ea60018e38683fc8960c2e3534845c44a02.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 7844611..ef18729 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -603,8 +603,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   for(std::vector::const_iterator i = lfiles.begin();
   i !=  lfiles.end(); ++i)
 {
-makefileStream << "\\\n" << "$(wildcard "
-   << this->ConvertToRelativeForMake(i->c_str()) << ")";
+makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
 }
   makefileStream << "\n\t" <<
 this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 274e13e..a07bbbe 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -298,37 +298,3 @@ set(CMAKE_RELATIVE_PATH_TOP_BINARY 
\"${RunCMake_TEST_BINARY_DIR}\")
 )
 endfunction()
 run_cmake_depends()
-
-# test re-generation of project even if CMakeLists.txt files disappeared
-if(UNIX)
-  # Use a single build tree for a few tests without cleaning.
-  set(RunCMake_TEST_BINARY_DIR
-${RunCMake_BINARY_DIR}/regenerate-project-build)
-  set(RunCMake_TEST_SOURCE_DIR
-${RunCMake_BINARY_DIR}/regenerate-project-source)
-  set(RunCMake_TEST_NO_CLEAN 1)
-  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
-  set(ProjectHeader [=[
-cmake_minimum_required(VERSION 3.5)
-project(regenerate-project NONE)
-  ]=])
-
-  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
-"add_subdirectory(mysubdir)")
-  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
-  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
-
-  run_cmake(regenerate-project-create)
-
-  # now we delete the subdirectory and adjust the CMakeLists.txt
-  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
-  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
-
-  run_cmake_command(regenerate-project-should-work
-${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}")
-
-  unset(RunCMake_TEST_BINARY_DIR)
-  unset(RunCMake_TEST_SOURCE_DIR)
-  unset(RunCMake_TEST_NO_CLEAN)
-endif()

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |3 +--
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake |   34 -
 2 files changed, 1 insertion(+), 36 deletions(-)


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

Re: [cmake-developers] [CMake 0015992]: Xcode generator's ReRunCMake.make fails if dependencies have been deleted

[Gregor Jasny via cmake-developers]

On 27/02/16 06:11, Mantis Bug Tracker wrote:
> Summary:Xcode generator's ReRunCMake.make fails if
> dependencies have been deleted
> Description: 
> Currently, if a file that a CMake script previously had a dependency on is
> deleted, the Xcode generator's ReRunCMake.make Makefile will fail with a "no
> rule to make target <…>" error. This happens pretty frequently if you have a
> CMake script that reads the ref file for your current git branch and you 
> delete
> branches regularly, and can also happen if you make other build system 
> changes.
> 
> This can be solved by wrapping each item in the list with `$(wildcard 
> )`,
> which effectively makes the dependencies optional.

Brad: I pushed and merged the xcode-regenerate-on-deleted-files topic
but I'm unsure about the test location itself and if this is a feature
all generators should provide. I tested it with Xcode, Make, and Ninja.

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

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-305-g5be433e

[Gregor Jasny via Cmake-commits]

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  5be433e1cad0265f8e972c7a18f3f489878657fe (commit)
   via  aa4b5ea60018e38683fc8960c2e3534845c44a02 (commit)
   via  b500c98c91ce1ca90d152daab81b5761a6c480ee (commit)
   via  499be36a64e186a7426aae5ee4613b07a722827a (commit)
  from  d7b1a40b0f039ed46522d5c9f3c7c421833ba32c (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=5be433e1cad0265f8e972c7a18f3f489878657fe
commit 5be433e1cad0265f8e972c7a18f3f489878657fe
Merge: d7b1a40 aa4b5ea
Author: Gregor Jasny 
AuthorDate: Sun Feb 28 11:35:53 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 28 11:35:53 2016 -0500

Merge topic 'xcode-regenerate-on-deleted-files' into next

aa4b5ea6 Xcode: ReRunCMake even if files disappeared (#15992)
b500c98c CMake Nightly Date Stamp
499be36a CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa4b5ea60018e38683fc8960c2e3534845c44a02
commit aa4b5ea60018e38683fc8960c2e3534845c44a02
Author: Gregor Jasny 
AuthorDate: Sun Feb 28 17:27:17 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Feb 28 17:35:15 2016 +0100

Xcode: ReRunCMake even if files disappeared (#15992)

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index ef18729..7844611 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -603,7 +603,8 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   for(std::vector::const_iterator i = lfiles.begin();
   i !=  lfiles.end(); ++i)
 {
-makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
+makefileStream << "\\\n" << "$(wildcard "
+   << this->ConvertToRelativeForMake(i->c_str()) << ")";
 }
   makefileStream << "\n\t" <<
 this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index a07bbbe..274e13e 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -298,3 +298,37 @@ set(CMAKE_RELATIVE_PATH_TOP_BINARY 
\"${RunCMake_TEST_BINARY_DIR}\")
 )
 endfunction()
 run_cmake_depends()
+
+# test re-generation of project even if CMakeLists.txt files disappeared
+if(UNIX)
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR
+${RunCMake_BINARY_DIR}/regenerate-project-build)
+  set(RunCMake_TEST_SOURCE_DIR
+${RunCMake_BINARY_DIR}/regenerate-project-source)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+  set(ProjectHeader [=[
+cmake_minimum_required(VERSION 3.5)
+project(regenerate-project NONE)
+  ]=])
+
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
+"add_subdirectory(mysubdir)")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
+
+  run_cmake(regenerate-project-create)
+
+  # now we delete the subdirectory and adjust the CMakeLists.txt
+  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
+  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
+
+  run_cmake_command(regenerate-project-should-work
+${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}")
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_SOURCE_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+endif()

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmGlobalXCodeGenerator.cxx |3 ++-
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake |   34 +
 3 files changed, 37 insertions(+), 2 deletions(-)


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

Re: [CMake] check_cxx_compiler_flag fails silently for complex compiler paths

[Gregor Jasny via CMake]

Hello,

On 26/02/16 00:00, Andrew Hundt wrote:
> I believe check_cxx_compiler_flags is failing due to a long/complicated
> compiler path.
> 
> Specifically my compiler is set to:
> /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++
> 
> CMake version: 3.4.3
> 
> Full trace output in gist where you can see lines warning of regex failure:
> https://gist.github.com/ahundt/88ce65bcc3c268acdd94
> 
> 
> Here is the code snippet that fails:
> 
> include(CheckCXXCompilerFlag)
>> check_cxx_compiler_flag(-std=c++11 COMPILER_SUPPORTS_CXX11)
>> check_cxx_compiler_flag(-std=c++0x COMPILER_SUPPORTS_CXX0X)
>> message(STATUS COMPILER_SUPPORTS_CXX11:${COMPILER_SUPPORTS_CXX11})

The problem is not compiler path related but related to the additional
warnings that are enabled:

https://github.com/code-iai/iai_kinect2/blob/master/kinect2_calibration/CMakeLists.txt#L4

> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBT_USE_DOUBLE_PRECISION -Wall")
> # Unused warnings
> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wuninitialized -Winit-self 
> -Wunused-function -Wunused-label -Wunused-variable -Wunused-but-set-variable 
> -Wunused-but-set-parameter")
> # Additional warnings
> set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Warray-bounds -Wtype-limits 
> -Wreturn-type -Wsequence-point -Wparentheses -Wmissing-braces 
> -Wchar-subscripts -Wswitch -Wwrite-strings -Wenum-compare -Wempty-body 
> -Wlogical-op")

Those cause clang to emit a warning about unknown warnings:

>  clang -c -DBT_USE_DOUBLE_PRECISION -Wall -Wuninitialized -Winit-self 
> -Wunused-function -Wunused-label -Wunused-variable -Wunused-but-set-variable 
> -Wunused-but-set-parameter -Warray-bounds -Wtype-limits -Wreturn-type 
> -Wsequence-point -Wparentheses -Wmissing-braces -Wchar-subscripts -Wswitch 
> -Wwrite-strings -Wenum-compare -Wempty-body foo.cpp
> warning: unknown warning option '-Wunused-but-set-variable'; did you mean
>   '-Wunused-const-variable'? [-Wunknown-warning-option]
> warning: unknown warning option '-Wunused-but-set-parameter'; did you mean
>   '-Wunused-parameter'? [-Wunknown-warning-option]
> 2 warnings generated.

Those warnings are interpreted by check_cxx_compiler_flag as failure
(this is the regex you observed [1]) which leads to a negative setting
of the variable.

I see three possible solutions:

1) Move the check before touching the CMAKE_CXX_FLAGS.
2) Require a more modern CMake (3.3) and set
  CMAKE_CXX_STANDARD to 11
  CMAKE_CXX_STANDARD_REQUIRED to TRUE
3) Use modern CMake with target compile features:
  https://cmake.org/cmake/help/v3.3/manual/cmake-compile-features.7.html

Thanks,
Gregor

[1]
https://github.com/Kitware/CMake/blob/master/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake#L25


-- 

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] [ANNOUNCE] CMake 3.5.0-rc3 is now ready!

[Gregor Jasny via CMake]

Hello,

I discovered that the Visual Studio 2015 Generator does not work with 
v120 toolsets (#15986) and consider that major issue.


As far as I see this is related to the debug information setting from 
#15894.


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