[cmake-developers] [CMake 0015042]: Add CPACK_PACKAGE_COMPONENT_NAME that naming component packages gets more flexible
The following issue has been SUBMITTED.
==
http://www.cmake.org/Bug/view.php?id=15042
==
Reported By:Lucas Betschart
Assigned To:
==
Project:CMake
Issue ID: 15042
Category: CPack
Reproducibility:always
Severity: minor
Priority: normal
Status: new
==
Date Submitted: 2014-07-28 09:08 EDT
Last Modified: 2014-07-28 09:08 EDT
==
Summary:Add CPACK_PACKAGE_COMPONENT_NAME that naming
component packages gets more flexible
Description:
If I build my -dev package with cpack COMPONENT flag, it get this:
opentxs-0.93.0-1.x86_64-dev.tar.gz (I add the version and system to the name),
but I'd like to have opentxs-dev-0.93.0-1.x86_64.tar.gz
Please add CPACK_PACKAGE_COMPONENT_NAME as a variable so one can use that in the
package file name.
So I could do something like this:
set(CPACK_PACKAGE_FILE_NAME
${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_COMPONENT_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR})
Thx!
Additional Information:
In your source:
http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/CPack/cmCPackGenerator.cxx;h=9336bedecad9ab0f0a6354cfe5597f670fb971f0;hb=HEAD#l1427
==
Issue History
Date ModifiedUsername FieldChange
==
2014-07-28 09:08 Lucas BetschartNew Issue
==
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [patch] Qt plugins are missing when deploying
On 07/24/2014 03:57 AM, Mathieu MARACHE wrote: I added two plugins qnativewifi and qtga that where missing in FindQt4.cmake Applied, thanks: FindQt4: Add nativewifi and qtga plugins http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b5052b0 -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Install in Build Tree
On 07/25/2014 09:54 AM, Daniele E. Domenichelli wrote: Some projects also arrange their layout within the build tree to look like the install tree by setting CMAKE_RUNTIME_OUTPUT_DIRECTORY[_CONFIG] and related variables appropriately. That's exactly what I would like to be able to do, but for data files as well, and at the moment that is possible, but not in an easy way. Okay, that clarifies things. The proposal in 15035 makes more sense now. FYI, CMake solves this problem for locating its own resources when running in the build tree by looking for a file relative to the executable whose content tells it where to find the resources directly out of the source tree: http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/cmSystemTools.cxx;hb=v3.0.0#l2187 -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Review Request] Topic CMakePackageConfigHelpers_build_tree
On 07/25/2014 10:00 AM, Daniele E. Domenichelli wrote: Sorry if I insist, but I still don't understand why not allowing to be able to use CMakePackageConfigHelpers for the build tree I didn't mean to imply that the patch is not acceptable. After the revisions to the documentation from our discussion in another branch of this thread I think it is ready for testing in 'next'. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] CMake generates Makefiles that don't parallelize as much as they could.
On 07/24/2014 05:47 PM, Nick Overdijk wrote: I'm using target_include_directories of A to get some include directories into B well, so I can't use target_link_libraries(A INTERFACE B), Can you clarify this with sample code please? and I can't seem to use the OBJECT-way neither since B's sources won't compile without A's INTERFACE_INCLUDE_DIRECTORIES... Usage requirements were designed with target_link_libraries as the main way to propagate them, but OBJECT libraries do not allow use with target_link_libraries. This is an open problem with the design of the two features. See also discussion here: http://www.cmake.org/Bug/view.php?id=14970 -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] CPack IFW generator
On 07/23/2014 04:44 PM, Brad King wrote: These draft commits are now in 'next' for upstream testing. After squashing in one fixup for building with CMake 2.8.9 this feature is now in master: CPack: Add an IFW generator for Qt Framework Installer http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44850a26 CPackIFW: Replace use of strftime with cmTimestamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73b336c9 Help: Add notes for topic 'cpack-ifw-generator' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9be4d21 -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Review Request] Topic CMakePackageConfigHelpers_build_tree
On 28/07/14 16:11, Brad King wrote: On 07/25/2014 10:00 AM, Daniele E. Domenichelli wrote: Sorry if I insist, but I still don't understand why not allowing to be able to use CMakePackageConfigHelpers for the build tree I didn't mean to imply that the patch is not acceptable. After the revisions to the documentation from our discussion in another branch of this thread I think it is ready for testing in 'next'. Sorry, I misunderstood your email! I applied the changes you requested to the documentation, rebased, and merged to next for testing. Thanks, Daniele -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015043]: How to convert Visual Studio .props file into cmake
The following issue has been SUBMITTED.
==
http://www.gccxml.org/Bug/view.php?id=15043
==
Reported By:Ravi Raman
Assigned To:
==
Project:CMake
Issue ID: 15043
Category: CMake
Reproducibility:always
Severity: major
Priority: high
Status: new
==
Date Submitted: 2014-07-28 11:20 EDT
Last Modified: 2014-07-28 11:20 EDT
==
Summary:How to convert Visual Studio .props file into cmake
Description:
Hello,
We are using CMake 3.0 on Windows. Our main objective is to convert Microsoft
Visual Studio built solution to CMake 3.0 solution.
In the process of doing so, we have come across many Visual Studio property
files (.props) which get included in the Visual Studio project files (.vcxproj)
files.
For example in a Visual Studio project file , the Property file (test.props)
gets included as follows:
ImportGroup Label=PropertySheets
Import Project=$(TestCfg)\test.props /
/ImportGroup
To achieve the same thing, in the CMakeLists file we are using the following
command:
set_target_properties(testproj PROPERTIES VS_PROPERTY_SHEETS
${TestCfg}/test.props)
Note that we have set TestCfg appropriately in one of the .cmake files that we
include in our CMakeLists.txt
The cmake build is successful and the cmake VCX project also gets created. But
that vcx project does not contain the entry of the test.props file.
Please let us know what we are missing or doing wrong.
Also, is there any other way to include .props files in cmake.
Any help in this regard would be appreciated.
==
Issue History
Date ModifiedUsername FieldChange
==
2014-07-28 11:20 Ravi Raman New Issue
==
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015044]: How to convert existing Visual Studio .targets file to cmake
The following issue has been SUBMITTED. == http://www.gccxml.org/Bug/view.php?id=15044 == Reported By:Ravi Raman Assigned To: == Project:CMake Issue ID: 15044 Category: CMake Reproducibility:always Severity: major Priority: high Status: new == Date Submitted: 2014-07-28 11:32 EDT Last Modified: 2014-07-28 11:32 EDT == Summary:How to convert existing Visual Studio .targets file to cmake Description: Hello, We are using CMake 3.0 on Windows. Our main objective is to convert Microsoft Visual Studio built solution to CMake 3.0 solution. In the process of doing so, we have come across many Visual Studio targets files (files with extension .targets) which get included in the Visual Studio project files (.vcxproj) files. For example in a Visual Studio project file , the targets file (test.targets) gets included as follows: Import Project=test.targets / To achieve the same thing, in the CMakeLists file we are using the following command: add_custom_targets() with the appropriate target name test Please let us know if this is the correct way to convert existing Visual Studio .targets files to cmake ? If this is incorrect, please let us know how to achieve it with a simple example. Thanks. == Issue History Date ModifiedUsername FieldChange == 2014-07-28 11:32 Ravi Raman New Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[CMake] target_link_libraries on imported targets
Hi! i am using the cmake feature with target_link_libraries for static libraries to describe additional link dependencies from static libs e.g. to system libs and qt libraries. The cmake files is use are used for developper build and customer build, but the customer does not get all source code to all libraries. So i am using target definitions with imported targets. But on this imported targets i cannot define these link dependencies with target_link_libraries. Which properties could i set on the IMPORTED Targets to get the same behaviour? Mannheim HRB 504702 Geschäftsführer: Dipl.-Ing. (FH) Michael Brenk (Vorsitzender), Dipl.-Ing. (FH) Dipl.-Inf. (FH) Jens Heyen This e-mail may contain confidential and/or legally protected information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and delete this e-mail. Any unauthorized copying, disclosure or distribution of the material in this email is strictly forbidden. Thank you! -- 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] target_link_libraries on imported targets
On 07/28/2014 10:33 AM, Jörg Kreuzberger wrote: But on this imported targets i cannot define these link dependencies with target_link_libraries. Which properties could i set on the IMPORTED Targets to get the same behaviour? http://cmake.org/cmake/help/v3.0/prop_tgt/INTERFACE_LINK_LIBRARIES.html Nils -- 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] Typo in cmake-packages(7)
Hi,
In cmake-packages(7) [1], there is a typo that prevents the example from
working correctly.
The command
configure_file(cmake/ClimbingStatsConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/ClimbingStats/ClimbingStatsConfig.cmake
COPY_ONLY
)
should use COPYONLY, not COPY_ONLY.
Cheers,
Johannes
P.S.: I really like the new documentation website. Kudos to whoever had the
idea for this!
[1] http://www.cmake.org/cmake/help/git-master/manual/cmake-
packages.7.html#creating-packages
--
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] Typo in cmake-packages(7)
In fact, it's not just a documentation typo.. It occurs three times
in cmake 'next' and 'master':
$ git grep COPY_ONLY
Help/manual/cmake-packages.7.rst:COPY_ONLY
Modules/Qt4Macros.cmake: configure_file(${infile}
${out_depends} COPY_ONLY)
Source/kwsys/CMakeLists.txt:${PROJECT_BINARY_DIR}/kwsysPrivate.h
COPY_ONLY IMMEDIATE)
-Original Message-
From: Johannes Zarl johannes.z...@jku.at
To: cmake cmake@cmake.org
Sent: Mon, Jul 28, 2014 5:06 am
Subject: [CMake] Typo in cmake-packages(7)
Hi,
In cmake-packages(7) [1], there is a typo that prevents the example
from
working correctly.
The command
configure_file(cmake/ClimbingStatsConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/ClimbingStats/ClimbingStatsConfig.cmake
COPY_ONLY
)
should use COPYONLY, not COPY_ONLY.
Cheers,
Johannes
P.S.: I really like the new documentation website. Kudos to whoever had
the
idea for this!
[1] http://www.cmake.org/cmake/help/git-master/manual/cmake-
packages.7.html#creating-packages
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For
more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] How to set Look for CMakeDetermineLang.cmake here
Hi David,
You can add to the search path CMake uses by appending to the
CMAKE_MODULE_PATH variable. In your case, you'll probably want to set it
before the project command to make sure it's present for you're entire
project. For example:
In your project, you create CMake directory where you would place
additional *.cmake files, such as your language files,or maybe even custom
Find modules. Then in your top level CMakeLists file, you would have:
cmake_minimum_required(VERSION 2.8.12)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
project(MyAwesomeProject)
Now anytime CMake searches for any sort of *.cmake file, it will also
search the CMake folder in your source tree.
Hope that helps.
- Chuck
On Mon, Jul 21, 2014 at 7:32 PM, David Zemon da...@zemon.name wrote:
I am attempting to build an easy-to-use build system for an embedded
system. This chip uses .dat, .spin, .cogc, and .ecogc files along with .S,
.c, and .cpp. I've added the necessary language files to my project path
which will enable cogc (I'll get to the other file types eventually) and
they work great, but it requires manually linking or copying the files out
of the project directory and into CMake's installation path. Is there some
way to tell CMake that it should look for these files in a custom path?
Thanks,
David
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at http://www.kitware.com/
opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
--
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] Using CPack with OSX 10.9
Hi there, We’re looking to update our CMake packaging scripts so that we can deploy to OSX 10.9 Mavericks. For previous OSX releases, we have used the PackageMaker generator with CPack to create .pkg files inside .dmg files. I believe PackageMaker has now disappeared (I can’t run the old version on my current machine and there doesn’t seem to be a new version available anywhere), so I would like to ask you all: what is the preferred generator for deploying to OSX 10.9? I’m currently looking into the OSX Bundle generator, however, our application ships with multiple executables and a number of dependent libraries and frameworks, so I’m not quite sure whether this is the right way to go. From what I’ve read, OSX application bundles are supposed to have a single executable only – how would I go about deploying an application that has multiple component applications? If we use the bundle generator, our application is going to look like this (I think), which seems strange: OurApplication.app/ Contents/ Info.plist MacOS/ executable1 Frameworks/ QtCore.framework QtGui.framework … Resources/ bin/ executable1 executable2 … lib/ non-framework dependencies Thanks for your help, Lachlan Hetherton Software Engineer (Visualisation) ☎ +613-9545-8041 -- 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 CPack with OSX 10.9
Thanks Mihai, That’s good to know. Having said that, I’m now knee deep in this stuff so if anyone has any recommendations on how to proceed going forward (e.g. with app bundles), that would be great. Regards, Lachlan Hetherton Software Engineer (Visualisation) ☎ +613-9545-8041 On 7/29/14, 11:31 AM, Mihai Moldovan io...@ionic.de wrote: On 29.07.2014 03:06 am, lachlan.hether...@csiro.au wrote: I believe PackageMaker has now disappeared (I can’t run the old version on my current machine and there doesn’t seem to be a new version available anywhere) A Mavericks-compatible version of PackageMaker is available on https://developer.apple.com/downloads/, search for Auxiliary Tools For Xcode - Late July 2012. While this does not help you in the long run (PackageMaker is deprecated and has already been removed from the most current AuxTools package as you have noticed), it may enable you to keep working with the current setup you have right now for some more time. Mihai -- 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 CPack with OSX 10.9
On 29.07.2014 03:06 am, lachlan.hether...@csiro.au wrote: I believe PackageMaker has now disappeared (I can’t run the old version on my current machine and there doesn’t seem to be a new version available anywhere) A Mavericks-compatible version of PackageMaker is available on https://developer.apple.com/downloads/, search for Auxiliary Tools For Xcode - Late July 2012. While this does not help you in the long run (PackageMaker is deprecated and has already been removed from the most current AuxTools package as you have noticed), it may enable you to keep working with the current setup you have right now for some more time. Mihai smime.p7s Description: S/MIME Cryptographic Signature -- 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 CPack with OSX 10.9
As a further FYI, I have tried installing that version of PackageMaker and it simply crashes on load, so I’m not sure whether this is even an option any more. Regards, Lachlan Hetherton Software Engineer (Visualisation) ☎ +613-9545-8041 On 7/29/14, 11:31 AM, Mihai Moldovan io...@ionic.de wrote: On 29.07.2014 03:06 am, lachlan.hether...@csiro.au wrote: I believe PackageMaker has now disappeared (I can’t run the old version on my current machine and there doesn’t seem to be a new version available anywhere) A Mavericks-compatible version of PackageMaker is available on https://developer.apple.com/downloads/, search for Auxiliary Tools For Xcode - Late July 2012. While this does not help you in the long run (PackageMaker is deprecated and has already been removed from the most current AuxTools package as you have noticed), it may enable you to keep working with the current setup you have right now for some more time. Mihai -- 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] [ExternalEmail] Re: Using CPack with OSX 10.9
I lie, it does run - the wrong version of the PackageMaker executable was on my PATH. As you say - at least this will keep me going for the time being, but we will need a way of building our application as a framework bundle or something similar going forward (keep in mind that we also deploy to Windows and Linux, so heavily customizing our build process for OSX is less than ideal). Thanks again, Lachlan Hetherton Software Engineer (Visualisation) ☎ +613-9545-8041 On 7/29/14, 1:52 PM, lachlan.hether...@csiro.au lachlan.hether...@csiro.au wrote: As a further FYI, I have tried installing that version of PackageMaker and it simply crashes on load, so I’m not sure whether this is even an option any more. Regards, Lachlan Hetherton Software Engineer (Visualisation) ☎ +613-9545-8041 On 7/29/14, 11:31 AM, Mihai Moldovan io...@ionic.de wrote: On 29.07.2014 03:06 am, lachlan.hether...@csiro.au wrote: I believe PackageMaker has now disappeared (I can’t run the old version on my current machine and there doesn’t seem to be a new version available anywhere) A Mavericks-compatible version of PackageMaker is available on https://developer.apple.com/downloads/, search for Auxiliary Tools For Xcode - Late July 2012. While this does not help you in the long run (PackageMaker is deprecated and has already been removed from the most current AuxTools package as you have noticed), it may enable you to keep working with the current setup you have right now for some more time. Mihai -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.0.0-4512-gd655bff
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 d655bffdfa67691dccbcad2acf5be9891e9f37e7 (commit) via 8201e0826a5f11e2101d3e071c8da7cfdde833dc (commit) from 500c21da7f1427ad29e46d6c0dedc18d2a2d9044 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d655bffdfa67691dccbcad2acf5be9891e9f37e7 commit d655bffdfa67691dccbcad2acf5be9891e9f37e7 Merge: 500c21d 8201e08 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 09:36:14 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 09:36:14 2014 -0400 Merge topic 'add-liblzma' into next 8201e082 liblzma: Suppress more MSVC warnings http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8201e0826a5f11e2101d3e071c8da7cfdde833dc commit 8201e0826a5f11e2101d3e071c8da7cfdde833dc Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 09:35:35 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jul 28 09:35:35 2014 -0400 liblzma: Suppress more MSVC warnings diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h index 2bcaeb3..c84f01c 100644 --- a/Utilities/cmliblzma/common/sysdefs.h +++ b/Utilities/cmliblzma/common/sysdefs.h @@ -18,6 +18,8 @@ #if defined(_MSC_VER) # pragma warning(push,1) +# pragma warning(disable: 4142) /* benign redefinition of type */ +# pragma warning(disable: 4761) /* integral size mismatch in argument */ #endif // --- Summary of changes: Utilities/cmliblzma/common/sysdefs.h |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.0.0-4514-ga658e61
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 a658e61dadbc1619eda8a10da0b7d237eb737036 (commit)
via 4b5052b0cd37e8896966ee2ce3040e1a8ded64e4 (commit)
from d655bffdfa67691dccbcad2acf5be9891e9f37e7 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a658e61dadbc1619eda8a10da0b7d237eb737036
commit a658e61dadbc1619eda8a10da0b7d237eb737036
Merge: d655bff 4b5052b
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 09:41:32 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 09:41:32 2014 -0400
Merge topic 'FindQt4-more-plugins' into next
4b5052b0 FindQt4: Add nativewifi and qtga plugins
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b5052b0cd37e8896966ee2ce3040e1a8ded64e4
commit 4b5052b0cd37e8896966ee2ce3040e1a8ded64e4
Author: Mathieu MARACHE mathieu.mara...@cstb.fr
AuthorDate: Thu Jul 24 09:46:26 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 09:39:23 2014 -0400
FindQt4: Add nativewifi and qtga plugins
While at it, update QT_QTGUI_PLUGINS to use QT_IMAGEFORMATS_PLUGINS
instead of duplicating the list.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index d0515c6..99e574e 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1190,14 +1190,14 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
set( QT_PLUGIN_TYPES accessible bearer codecs decorations designer
gfxdrivers graphicssystems iconengines imageformats inputmethods mousedrivers
phonon_backend script sqldrivers )
set( QT_ACCESSIBLE_PLUGINS qtaccessiblecompatwidgets qtaccessiblewidgets )
- set( QT_BEARER_PLUGINS qcorewlanbearer qgenericbearer )
+ set( QT_BEARER_PLUGINS qcorewlanbearer qgenericbearer qnativewifibearer )
set( QT_CODECS_PLUGINS qcncodecs qjpcodecs qkrcodecs qtwcodecs )
set( QT_DECORATIONS_PLUGINS qdecorationdefault qdecorationwindows )
set( QT_DESIGNER_PLUGINS arthurplugin containerextension customwidgetplugin
phononwidgets qdeclarativeview qt3supportwidgets qwebview taskmenuextension
worldtimeclockplugin )
set( QT_GRAPHICSDRIVERS_PLUGINS qgfxtransformed qgfxvnc qscreenvfb )
set( QT_GRAPHICSSYSTEMS_PLUGINS qglgraphicssystem qtracegraphicssystem )
set( QT_ICONENGINES_PLUGINS qsvgicon )
- set( QT_IMAGEFORMATS_PLUGINS qgif qjpeg qmng qico qsvg qtiff )
+ set( QT_IMAGEFORMATS_PLUGINS qgif qjpeg qmng qico qsvg qtiff qtga )
set( QT_INPUTMETHODS_PLUGINS qimsw_multi )
set( QT_MOUSEDRIVERS_PLUGINS qwstslibmousehandler )
if(APPLE)
@@ -1211,7 +1211,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
set( QT_PHONON_PLUGINS ${QT_PHONON_BACKEND_PLUGINS} )
set( QT_QT3SUPPORT_PLUGINS qtaccessiblecompatwidgets )
set( QT_QTCORE_PLUGINS ${QT_BEARER_PLUGINS} ${QT_CODECS_PLUGINS} )
- set( QT_QTGUI_PLUGINS qtaccessiblewidgets qgif qjpeg qmng qico qtiff
${QT_DECORATIONS_PLUGINS} ${QT_GRAPHICSDRIVERS_PLUGINS}
${QT_GRAPHICSSYSTEMS_PLUGINS} ${QT_INPUTMETHODS_PLUGINS}
${QT_MOUSEDRIVERS_PLUGINS} )
+ set( QT_QTGUI_PLUGINS qtaccessiblewidgets ${QT_IMAGEFORMATS_PLUGINS}
${QT_DECORATIONS_PLUGINS} ${QT_GRAPHICSDRIVERS_PLUGINS}
${QT_GRAPHICSSYSTEMS_PLUGINS} ${QT_INPUTMETHODS_PLUGINS}
${QT_MOUSEDRIVERS_PLUGINS} )
set( QT_QTSCRIPT_PLUGINS ${QT_SCRIPT_PLUGINS} )
set( QT_QTSQL_PLUGINS ${QT_SQLDRIVERS_PLUGINS} )
set( QT_QTSVG_PLUGINS qsvg qsvgicon )
---
Summary of changes:
Modules/FindQt4.cmake |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4520-gf8d67f9
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 f8d67f90f0a88a368d154cc1e6bbe6566d9f7dc4 (commit)
via 5b4faeefe36fd775fd60f98aedf0cc35202f99f4 (commit)
via a971de3adf5f89cbbc37c492f1a53d1790d23729 (commit)
via a31b42a46fe16376607fdda1cec160b7e860063a (commit)
via 06a190b10a16f8504b546f21f1295696aac794d9 (commit)
via 4d7b9375b0a56a78a6cfa823069cc57e37fe9766 (commit)
from a658e61dadbc1619eda8a10da0b7d237eb737036 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8d67f90f0a88a368d154cc1e6bbe6566d9f7dc4
commit f8d67f90f0a88a368d154cc1e6bbe6566d9f7dc4
Merge: a658e61 5b4faee
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 10:03:51 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 10:03:51 2014 -0400
Merge topic 'osx-no-sysroot-for-deployment' into next
5b4faeef OS X: Allow deployment target with / sysroot (#15040)
a971de3a CMake Nightly Date Stamp
a31b42a4 CMake Nightly Date Stamp
06a190b1 CMake Nightly Date Stamp
4d7b9375 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b4faeefe36fd775fd60f98aedf0cc35202f99f4
commit 5b4faeefe36fd775fd60f98aedf0cc35202f99f4
Author: Jeremy Huddleston jerem...@macports.org
AuthorDate: Sat Jul 19 20:43:20 2014 -0700
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 09:52:21 2014 -0400
OS X: Allow deployment target with / sysroot (#15040)
Allow the combination
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_OSX_SYSROOT=/
to work. Treat the / sysroot as targeting the current OS X version.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index e25df1e..e5c5f36 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -70,6 +70,8 @@ if(CMAKE_OSX_DEPLOYMENT_TARGET)
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}'
---
Summary of changes:
Modules/Platform/Darwin.cmake |2 ++
Source/CMakeVersion.cmake |2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4524-g89907b3
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 89907b37665ab05492a496eac7fdf19990e550e8 (commit)
via b9be4d21779ba7b301f12a7a5c358000e1424cee (commit)
via 73b336c9f145746b5d554c80b9d8d6c40613ec5c (commit)
via 44850a267d1c2ee64947ebb93de3998549b59d03 (commit)
from f8d67f90f0a88a368d154cc1e6bbe6566d9f7dc4 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89907b37665ab05492a496eac7fdf19990e550e8
commit 89907b37665ab05492a496eac7fdf19990e550e8
Merge: f8d67f9 b9be4d2
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 10:23:16 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 10:23:16 2014 -0400
Merge topic 'cpack-ifw-generator' into next
b9be4d21 Help: Add notes for topic 'cpack-ifw-generator'
73b336c9 CPackIFW: Replace use of strftime with cmTimestamp
44850a26 CPack: Add an IFW generator for Qt Framework Installer
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9be4d21779ba7b301f12a7a5c358000e1424cee
commit b9be4d21779ba7b301f12a7a5c358000e1424cee
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jul 24 11:07:14 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 10:24:03 2014 -0400
Help: Add notes for topic 'cpack-ifw-generator'
diff --git a/Help/release/dev/cpack-ifw-generator.rst
b/Help/release/dev/cpack-ifw-generator.rst
new file mode 100644
index 000..f667136
--- /dev/null
+++ b/Help/release/dev/cpack-ifw-generator.rst
@@ -0,0 +1,5 @@
+cpack-ifw-generator
+---
+
+* :manual:`cpack(1)` gained an ``IFW`` generator to package using
+ Qt Framework Installer tools. See the :module:`CPackIFW` module.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73b336c9f145746b5d554c80b9d8d6c40613ec5c
commit 73b336c9f145746b5d554c80b9d8d6c40613ec5c
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 16:31:15 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 10:24:03 2014 -0400
CPackIFW: Replace use of strftime with cmTimestamp
The latter is more portable.
diff --git a/Source/CPack/cmCPackIFWGenerator.cxx
b/Source/CPack/cmCPackIFWGenerator.cxx
index a4f33b4..51c0f2e 100644
--- a/Source/CPack/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/cmCPackIFWGenerator.cxx
@@ -19,6 +19,7 @@
#include cmGeneratedFileStream.h
#include cmCPackLog.h
#include cmCPackComponentGroup.h
+#include cmTimestamp.h
#include cmsys/SystemTools.hxx
#include cmsys/Glob.hxx
@@ -809,16 +810,8 @@ int cmCPackIFWGenerator::IfwCreatePackageFile()
//--
std::string cmCPackIFWGenerator::IfwCreateCurrentDate()
{
- time_t rawtime;
- struct tm * timeinfo;
- char buffer[80];
-
- time (rawtime);
- timeinfo = localtime(rawtime);
-
- strftime(buffer, 80, %Y-%m-%d, timeinfo);
-
- return buffer;
+ cmTimestamp timestamp;
+ return timestamp.CurrentTime(%Y-%m-%d, false);
}
//--
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44850a267d1c2ee64947ebb93de3998549b59d03
commit 44850a267d1c2ee64947ebb93de3998549b59d03
Author: Konstantin Podsvirov konstan...@podsvirov.pro
AuthorDate: Wed Jul 23 11:01:59 2014 +0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 10:24:03 2014 -0400
CPack: Add an IFW generator for Qt Framework Installer
Add support for packaging with the Qt Framework Installer tools:
http://qt-project.org/doc/qtinstallerframework/index.html
Reviewed-by: Nils Gladitz nilsglad...@gmail.com
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index fb55bfc..5b096ad 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -59,11 +59,43 @@ if(EXISTS ${CMAKE_ROOT}/Modules/CPack.cmake)
if(${CPACK_SYSTEM_NAME} MATCHES Windows)
if(CMAKE_CL_64)
set(CPACK_SYSTEM_NAME win64-x64)
+ set(CPACK_IFW_TARGET_DIRECTORY @RootDir@/Program
Files/${CMAKE_PROJECT_NAME})
else()
set(CPACK_SYSTEM_NAME win32-x86)
endif()
endif()
+ # default component for IFW
+ if(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
+set(_CPACK_IFW_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
+ else()
+set(_CPACK_IFW_COMPONENT_NAME Unspecified)
+ endif()
+ string(TOUPPER ${_CPACK_IFW_COMPONENT_NAME} _CPACK_IFW_COMPONENT_UNAME)
+
+ if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
+if(BUILD_QtDialog)
+ set(_CPACK_IFW_SHORTCUT_OPTIONAL
${_CPACK_IFW_SHORTCUT_OPTIONAL}component.addOperation(\CreateShortcut\,
[Cmake-commits] CMake branch, master, updated. v3.0.0-1491-gd128c6c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via d128c6c9b33f4ca3139352baee774a9e08f6c32e (commit) via 133cd996d161cd349e67d90052ac4e20d9488620 (commit) via a4d58722a47b3712d1f78683371f88a3b6182a59 (commit) from a971de3adf5f89cbbc37c492f1a53d1790d23729 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d128c6c9b33f4ca3139352baee774a9e08f6c32e commit d128c6c9b33f4ca3139352baee774a9e08f6c32e Merge: a971de3 133cd99 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:40 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:40 2014 -0400 Merge topic 'target-drop-build-setting-cache' 133cd996 cmTarget: Drop internal cache of build properties a4d58722 cmTarget: Drop internal cache of link interface usage requirements --- Summary of changes: Source/cmTarget.cxx | 380 +-- 1 file changed, 126 insertions(+), 254 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1518-g2699ac5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 2699ac5ef727c824e22dc515149529783d8b9a8f (commit) via 8981513a810a97d10e299407e12c46aabe68f00a (commit) via 731427a646cd0ca81aa392872d18d125e917bf47 (commit) from fd0229e8c5bffa4807962dbe4e077ae7ac2d3dda (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2699ac5ef727c824e22dc515149529783d8b9a8f commit 2699ac5ef727c824e22dc515149529783d8b9a8f Merge: fd0229e 8981513 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:53 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:53 2014 -0400 Merge topic 'fix-re-cmake-with-compiler' 8981513a CMakeDetermineCompiler: Simplify CMAKE_LANG_COMPILER default force-cache 731427a6 cmGlobalGenerator: Do not re-add CMAKE_LANG_COMPILER --- Summary of changes: Modules/CMakeDetermineCompiler.cmake |2 +- Source/cmGlobalGenerator.cxx |4 2 files changed, 1 insertion(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1515-gfd0229e
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via fd0229e8c5bffa4807962dbe4e077ae7ac2d3dda (commit) via 0e88b1d6d92b32b767dff33109855f079a272f00 (commit) from 68f4a0ee306e5b5aec1252d0e7ed2af93273ee9f (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd0229e8c5bffa4807962dbe4e077ae7ac2d3dda commit fd0229e8c5bffa4807962dbe4e077ae7ac2d3dda Merge: 68f4a0e 0e88b1d Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:51 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:51 2014 -0400 Merge topic 'fix_qt4_automoc_leak' 0e88b1d6 Fix memory leak of local generator detected by LeakSanitizer. --- Summary of changes: Source/cmQtAutoGenerators.cxx |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1513-g68f4a0e
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 68f4a0ee306e5b5aec1252d0e7ed2af93273ee9f (commit) via b9be4d21779ba7b301f12a7a5c358000e1424cee (commit) via 73b336c9f145746b5d554c80b9d8d6c40613ec5c (commit) via 44850a267d1c2ee64947ebb93de3998549b59d03 (commit) from 95c47f6d379764c818bd0693b1928d3339401a52 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68f4a0ee306e5b5aec1252d0e7ed2af93273ee9f commit 68f4a0ee306e5b5aec1252d0e7ed2af93273ee9f Merge: 95c47f6 b9be4d2 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:49 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:49 2014 -0400 Merge topic 'cpack-ifw-generator' b9be4d21 Help: Add notes for topic 'cpack-ifw-generator' 73b336c9 CPackIFW: Replace use of strftime with cmTimestamp 44850a26 CPack: Add an IFW generator for Qt Framework Installer --- Summary of changes: CMakeCPack.cmake | 32 ++ CMakeCPackOptions.cmake.in | 14 + Help/manual/cmake-modules.7.rst |1 + Help/module/CPackIFW.rst |1 + Help/release/dev/cpack-ifw-generator.rst |5 + Modules/CPack.cmake |2 + Modules/CPackComponent.cmake |3 + Modules/CPackIFW.cmake | 384 ++ Source/CMakeLists.txt|1 + Source/CPack/cmCPackGeneratorFactory.cxx |6 + Source/CPack/cmCPackIFWGenerator.cxx | 849 ++ Source/CPack/cmCPackIFWGenerator.h | 82 +++ Source/QtIFW/cmake.org.html |7 + Source/QtIFW/installscript.qs.in | 24 + 14 files changed, 1411 insertions(+) create mode 100644 Help/module/CPackIFW.rst create mode 100644 Help/release/dev/cpack-ifw-generator.rst create mode 100644 Modules/CPackIFW.cmake create mode 100644 Source/CPack/cmCPackIFWGenerator.cxx create mode 100644 Source/CPack/cmCPackIFWGenerator.h create mode 100644 Source/QtIFW/cmake.org.html create mode 100644 Source/QtIFW/installscript.qs.in hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1506-g107db68
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 107db681e3a1298463c7f432a2756ee59516ad47 (commit) via 09164c637b02f964152453bdbe1b1591c39c1f7c (commit) via 29a0642ba78392ab20037e677d28eae2eea23de7 (commit) via 8fa087ab38c41e76e502f438eff42d412962108f (commit) via 1c209ac165cd2c25c632cdd238a9948c1651f907 (commit) via 91c933546d1eebb6a637f403824d63177c86c11e (commit) from 90f6de8a0192eb169be2a7e0ddbe8bce9d6714fb (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=107db681e3a1298463c7f432a2756ee59516ad47 commit 107db681e3a1298463c7f432a2756ee59516ad47 Merge: 90f6de8 09164c6 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:45 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:45 2014 -0400 Merge topic 'vs-escaping' 09164c63 VS: Encode more content correctly in vcxproj files (#15031) 29a0642b VS: Encode mapped flag values in XML project files (#15031) 8fa087ab cmVisualStudioGeneratorOptions: Simplify XML escaping API 1c209ac1 cmIDEOption: Store mapped flag values as a vectorstring 91c93354 cmVisualStudio10TargetGenerator: Remove dupilcate line --- Summary of changes: Source/cmIDEOptions.cxx| 27 ++-- Source/cmIDEOptions.h | 19 - Source/cmLocalVisualStudio7Generator.cxx |2 +- Source/cmVisualStudio10TargetGenerator.cxx | 62 +--- Source/cmVisualStudio10TargetGenerator.h |3 +- Source/cmVisualStudioGeneratorOptions.cxx | 41 +++--- 6 files changed, 89 insertions(+), 65 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1498-g9303da5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 9303da53ce980bf71df52f3e75ed18f93127d7b9 (commit) via 7b743a2e761783f930de41db3f7a706b065bbb2e (commit) via 807e4ffeefb0e10ef0546e0eb7383f3d5533809b (commit) via 46099b82ed71394f1dc6e0bbb91704d274edab7d (commit) via 438d9c7c822f42c4fccd77a47b1a32f52a87e617 (commit) via fe665fdda8986b3af061ec91a7ab5fbe8f606e4f (commit) via 9d13e1679f2b52e88748a710edd201ed9fba7447 (commit) from d128c6c9b33f4ca3139352baee774a9e08f6c32e (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9303da53ce980bf71df52f3e75ed18f93127d7b9 commit 9303da53ce980bf71df52f3e75ed18f93127d7b9 Merge: d128c6c 7b743a2 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:42 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:42 2014 -0400 Merge topic 'genex-head-sensitive-conditions' 7b743a2e cmTarget: Avoid re-computing head-independent link interfaces 807e4ffe Genex: Track whether an expression depends on the 'head' target 46099b82 cmTarget: Move ComputeLinkImplementation* to internals 438d9c7c cmTarget: Re-order link interface map lookup logic fe665fdd cmTarget: Refactor link interface map storage 9d13e167 cmTarget: Remove duplicate link interface map --- Summary of changes: Source/cmGeneratorExpression.cxx |3 + Source/cmGeneratorExpression.h|5 + Source/cmGeneratorExpressionEvaluator.cxx | 14 +++ Source/cmGeneratorExpressionEvaluator.h |1 + Source/cmTarget.cxx | 193 ++--- Source/cmTarget.h |8 +- 6 files changed, 148 insertions(+), 76 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.0.0-4534-gd7ab2e4
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 d7ab2e432828b7af15840956a643900ff22479d6 (commit) via 0f06bb52baafca335d495a14de5a942fae8dffe8 (commit) via 2699ac5ef727c824e22dc515149529783d8b9a8f (commit) via fd0229e8c5bffa4807962dbe4e077ae7ac2d3dda (commit) via 68f4a0ee306e5b5aec1252d0e7ed2af93273ee9f (commit) via 95c47f6d379764c818bd0693b1928d3339401a52 (commit) via 107db681e3a1298463c7f432a2756ee59516ad47 (commit) via 90f6de8a0192eb169be2a7e0ddbe8bce9d6714fb (commit) via 9303da53ce980bf71df52f3e75ed18f93127d7b9 (commit) via d128c6c9b33f4ca3139352baee774a9e08f6c32e (commit) from 89907b37665ab05492a496eac7fdf19990e550e8 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7ab2e432828b7af15840956a643900ff22479d6 commit d7ab2e432828b7af15840956a643900ff22479d6 Merge: 89907b3 0f06bb5 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:37:26 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jul 28 10:37:26 2014 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1500-g90f6de8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 90f6de8a0192eb169be2a7e0ddbe8bce9d6714fb (commit) via 57a2df224a4bcf4463937d5e121f917d450c144f (commit) from 9303da53ce980bf71df52f3e75ed18f93127d7b9 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90f6de8a0192eb169be2a7e0ddbe8bce9d6714fb commit 90f6de8a0192eb169be2a7e0ddbe8bce9d6714fb Merge: 9303da5 57a2df2 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:44 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:44 2014 -0400 Merge topic 'fix_tar_leaks' 57a2df22 Fix memory leaks in extract tar. --- Summary of changes: Source/cmSystemTools.cxx |3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1520-g0f06bb5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 0f06bb52baafca335d495a14de5a942fae8dffe8 (commit) via 5d40d88e0026824e237938a9e771206220857034 (commit) from 2699ac5ef727c824e22dc515149529783d8b9a8f (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f06bb52baafca335d495a14de5a942fae8dffe8 commit 0f06bb52baafca335d495a14de5a942fae8dffe8 Merge: 2699ac5 5d40d88 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 10:35:54 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 10:35:54 2014 -0400 Merge topic 'sanitizer_handle_more_pids' 5d40d88e Handle more than one process with sanitizer errors. --- Summary of changes: Source/CTest/cmCTestMemCheckHandler.cxx | 27 +++ Source/CTest/cmCTestMemCheckHandler.h |4 ++-- Tests/CTestTestMemcheck/testLeakSanitizer.cmake |7 ++ 3 files changed, 27 insertions(+), 11 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, release, updated. v3.0.0-23-gce7a5ca
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.
The branch, release has been updated
via ce7a5ca895d0669b33d213c6fc94f484611d6e24 (commit)
via cc3248f45231d24061bbc88fa6dd66897162cb3a (commit)
via 9d2bada3d4948f2a7c40d3e73ebc0a15d1c2dc3a (commit)
via fd63722dc86ec30e8a6f543881d56b3c473da34d (commit)
via d8934eedaf679d45b2f183aa2f6f70ac1eaa93a1 (commit)
via 3151024d241c581463d20bf0ce3d1060bdd22de4 (commit)
from afc452fe210f5b46e5a2c9fbbde70b4e6880d4e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
---
Summary of changes:
Modules/Compiler/QCC-C.cmake |2 ++
Modules/Compiler/QCC-CXX.cmake | 12 +++
.../Linux-GNU.cmake = Compiler/QCC.cmake} | 19 -
Modules/Platform/QNX-QCC-C.cmake |4
Modules/Platform/QNX-QCC-CXX.cmake |4
Modules/Platform/QNX.cmake | 22 +++-
Source/kwsys/SystemInformation.cxx |5 -
Utilities/cmcurl/hostip.c |2 +-
8 files changed, 31 insertions(+), 39 deletions(-)
create mode 100644 Modules/Compiler/QCC-C.cmake
create mode 100644 Modules/Compiler/QCC-CXX.cmake
copy Modules/{Platform/Linux-GNU.cmake = Compiler/QCC.cmake} (60%)
delete mode 100644 Modules/Platform/QNX-QCC-C.cmake
delete mode 100644 Modules/Platform/QNX-QCC-CXX.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1524-gf188845
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via f188845237cdfee74dae065a61c855e285b3 (commit) via ce7a5ca895d0669b33d213c6fc94f484611d6e24 (commit) via 9d2bada3d4948f2a7c40d3e73ebc0a15d1c2dc3a (commit) via d8934eedaf679d45b2f183aa2f6f70ac1eaa93a1 (commit) from 0f06bb52baafca335d495a14de5a942fae8dffe8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4544-g309d1a6
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 309d1a645e358d0b88414d6b95e0d13185d8c1f6 (commit)
via 8bab4454afa9e364d1ff08501309b902e65d98f2 (commit)
via b01fdb58b36bcd6694cf6c5d02a3db70f3befc82 (commit)
via 9528e6a6a17a43207fb22e051fa7df06a8844223 (commit)
via 855e76e90d249664fafb66b9f0b2d37cfc508a40 (commit)
from dea3d880aff4e50131a1ebf3ad082a70826f1e0c (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=309d1a645e358d0b88414d6b95e0d13185d8c1f6
commit 309d1a645e358d0b88414d6b95e0d13185d8c1f6
Merge: dea3d88 8bab445
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Jul 28 11:06:30 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 11:06:30 2014 -0400
Merge topic 'CMakePackageConfigHelpers_build_tree' into next
8bab4454 CMakePackageConfigHelpers: Add unit tests for BUILD_TREE option
b01fdb58 CMakePackageConfigHelpers: Add BUILD_TREE option
9528e6a6 CMakePackageConfigHelpers: restructure documentation and document
commands
855e76e9 CMakePackageConfigHelpers: Remove unused variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bab4454afa9e364d1ff08501309b902e65d98f2
commit 8bab4454afa9e364d1ff08501309b902e65d98f2
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Jul 15 19:51:16 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Jul 28 17:03:06 2014 +0200
CMakePackageConfigHelpers: Add unit tests for BUILD_TREE option
diff --git a/Tests/FindPackageTest/CMakeLists.txt
b/Tests/FindPackageTest/CMakeLists.txt
index 092bf20..5a81b44 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -374,6 +374,7 @@ endif()
include(CMakePackageConfigHelpers)
+# Generate a config file ready to be installed.
set(INCLUDE_INSTALL_DIR include )
set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/ )
set(CURRENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} )
@@ -407,6 +408,43 @@ if(Relocatable_FOUND)
message(SEND_ERROR Relocatable_FOUND set to TRUE !)
endif()
+# Generate a config file for the build tree.
+set(INCLUDE_INSTALL_DIR include )
+set(SHARE_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/share/ )
+set(CURRENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} )
+
+configure_package_config_file(RelocatableConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/RelocatableConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+ PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR
CURRENT_BUILD_DIR
+ BUILD_TREE
+ )
+
+set(Relocatable_FIND_COMPONENTS AComp BComp CComp)
+set(Relocatable_FIND_REQUIRED_BComp 1)
+include(${CMAKE_CURRENT_BINARY_DIR}/RelocatableConfig.cmake)
+
+if(NOT ${RELOC_INCLUDE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}/include)
+ message(SEND_ERROR RELOC_INCLUDE_DIR set by configure_package_config_file()
is set to \${RELOC_INCLUDE_DIR}\ (expected
\${CMAKE_CURRENT_BINARY_DIR}/include\))
+endif()
+
+if(NOT ${RELOC_SHARE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}/share/)
+ message(SEND_ERROR RELOC_SHARE_DIR set by configure_package_config_file()
is set to \${RELOC_SHARE_DIR}\ (expected
\${CMAKE_CURRENT_BINARY_DIR}/share/\))
+endif()
+
+if(NOT ${RELOC_BUILD_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
+ message(SEND_ERROR RELOC_BUILD_DIR set by configure_package_config_file()
is set to \${RELOC_BUILD_DIR}\ (expected \${CMAKE_CURRENT_BINARY_DIR}\))
+endif()
+
+if(NOT DEFINED Relocatable_FOUND)
+ message(SEND_ERROR Relocatable_FOUND not defined !)
+endif()
+
+if(Relocatable_FOUND)
+ message(SEND_ERROR Relocatable_FOUND set to TRUE !)
+endif()
+
+
+
#-
# Test write_basic_config_version_file().
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b01fdb58b36bcd6694cf6c5d02a3db70f3befc82
commit b01fdb58b36bcd6694cf6c5d02a3db70f3befc82
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Jul 15 19:10:54 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Jul 28 17:03:06 2014 +0200
CMakePackageConfigHelpers: Add BUILD_TREE option
This option instructs configure_package_config_file to consider paths
that are not absolute as relative to the CMAKE_BINARY_DIR directory
instead of relative to the CMAKE_INSTALL_PREFIX` directory.
The new signature is therefore:
configure_package_config_file(input
[Cmake-commits] CMake branch, next, updated. v3.0.0-4547-gdf5e2d8
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 df5e2d8d9bd26508d1d3e4fa974928ff16aaf42d (commit)
via 4869bb3f75c5776134a2ceb4a54619ec23a355df (commit)
via 6dda62e70bd12ef813377b4a699500e131483346 (commit)
from 309d1a645e358d0b88414d6b95e0d13185d8c1f6 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df5e2d8d9bd26508d1d3e4fa974928ff16aaf42d
commit df5e2d8d9bd26508d1d3e4fa974928ff16aaf42d
Merge: 309d1a6 4869bb3
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 11:49:24 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 11:49:24 2014 -0400
Merge topic 'pdb-genex' into next
4869bb3f Genex: Disallow PDB genex on targets not created by linker
6dda62e7 Genex: Revise documentation on PDB generator expressions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4869bb3f75c5776134a2ceb4a54619ec23a355df
commit 4869bb3f75c5776134a2ceb4a54619ec23a355df
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 17:48:13 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Mon Jul 28 17:48:13 2014 +0200
Genex: Disallow PDB genex on targets not created by linker
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index e3a7681..35df9cd 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1563,8 +1563,28 @@ struct
TargetFilesystemArtifactResultCreatorArtifactPdbTag
{
static std::string Create(cmTarget* target,
cmGeneratorExpressionContext *context,
-const GeneratorExpressionContent *)
+const GeneratorExpressionContent *content)
{
+if(!target-IsDLLPlatform())
+ {
+ ::reportError(context, content-GetOriginalExpression(),
+TARGET_PDB_FILE is only allowed
+for DLL target platforms.);
+ return std::string();
+ }
+
+cmTarget::TargetType targetType = target-GetType();
+
+if(targetType != cmTarget::SHARED_LIBRARY
+ targetType != cmTarget::MODULE_LIBRARY
+ targetType != cmTarget::EXECUTABLE)
+ {
+ ::reportError(context, content-GetOriginalExpression(),
+TARGET_PDB_FILE is allowed only for
+targets with linker created artifacts.);
+ return std::string();
+ }
+
std::string result = target-GetPDBDirectory(context-Config);
result += /;
result += target-GetPDBName(context-Config);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dda62e70bd12ef813377b4a699500e131483346
commit 6dda62e70bd12ef813377b4a699500e131483346
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 16:52:11 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Mon Jul 28 16:52:11 2014 +0200
Genex: Revise documentation on PDB generator expressions
diff --git a/Help/manual/cmake-generator-expressions.7.rst
b/Help/manual/cmake-generator-expressions.7.rst
index 4f55687..77259a0 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -149,11 +149,16 @@ than 4.2.0.
``$TARGET_SONAME_FILE_DIR:tgt``
Directory of with soname (.so.3).
``$TARGET_PDB_FILE:tgt``
- Full path to program database file (.pdb) where ``tgt`` is the name of a
target.
+ Full path to the linker generated program database file (.pdb)
+ where ``tgt`` is the name of a target.
+
+ See also the :prop_tgt:`PDB_NAME` and :prop_tgt:`PDB_OUTPUT_DIRECTORY`
+ target properties and their configuration specific variants
+ :prop_tgt:`PDB_NAME_CONFIG` and :prop_tgt:`PDB_OUTPUT_DIRECTORY_CONFIG`.
``$TARGET_PDB_FILE_NAME:tgt``
- Name of program database file (.pdb).
+ Name of the linker generated program database file (.pdb).
``$TARGET_PDB_FILE_DIR:tgt``
- Directory of program database file (.pdb).
+ Directory of the linker generated program database file (.pdb).
``$TARGET_PROPERTY:tgt,prop``
Value of the property ``prop`` on the target ``tgt``.
---
Summary of changes:
Help/manual/cmake-generator-expressions.7.rst | 11 ---
Source/cmGeneratorExpressionEvaluator.cxx | 22 +-
2 files changed, 29 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.0.0-4549-g32adeae
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 32adeae6c4c1edae5087c0a7ddb833f65aa79de8 (commit)
via c161023ca9fcddbb5ab09d7fc732ecc0c5fdba94 (commit)
from df5e2d8d9bd26508d1d3e4fa974928ff16aaf42d (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32adeae6c4c1edae5087c0a7ddb833f65aa79de8
commit 32adeae6c4c1edae5087c0a7ddb833f65aa79de8
Merge: df5e2d8 c161023
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 11:50:13 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 11:50:13 2014 -0400
Merge topic 'pdb-genex' into next
c161023c Genex: Implement generator expressions for target PDB files.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c161023ca9fcddbb5ab09d7fc732ecc0c5fdba94
commit c161023ca9fcddbb5ab09d7fc732ecc0c5fdba94
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Thu Jul 24 22:18:21 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Mon Jul 28 17:49:54 2014 +0200
Genex: Implement generator expressions for target PDB files.
diff --git a/Help/manual/cmake-generator-expressions.7.rst
b/Help/manual/cmake-generator-expressions.7.rst
index bc24798..77259a0 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -148,6 +148,17 @@ than 4.2.0.
Name of file with soname (.so.3).
``$TARGET_SONAME_FILE_DIR:tgt``
Directory of with soname (.so.3).
+``$TARGET_PDB_FILE:tgt``
+ Full path to the linker generated program database file (.pdb)
+ where ``tgt`` is the name of a target.
+
+ See also the :prop_tgt:`PDB_NAME` and :prop_tgt:`PDB_OUTPUT_DIRECTORY`
+ target properties and their configuration specific variants
+ :prop_tgt:`PDB_NAME_CONFIG` and :prop_tgt:`PDB_OUTPUT_DIRECTORY_CONFIG`.
+``$TARGET_PDB_FILE_NAME:tgt``
+ Name of the linker generated program database file (.pdb).
+``$TARGET_PDB_FILE_DIR:tgt``
+ Directory of the linker generated program database file (.pdb).
``$TARGET_PROPERTY:tgt,prop``
Value of the property ``prop`` on the target ``tgt``.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 6f940a6..35df9cd 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1512,6 +1512,7 @@ static const struct InstallPrefixNode : public
cmGeneratorExpressionNode
class ArtifactNameTag;
class ArtifactLinkerTag;
class ArtifactSonameTag;
+class ArtifactPdbTag;
class ArtifactPathTag;
class ArtifactDirTag;
@@ -1558,6 +1559,41 @@ struct
TargetFilesystemArtifactResultCreatorArtifactSonameTag
//
template
+struct TargetFilesystemArtifactResultCreatorArtifactPdbTag
+{
+ static std::string Create(cmTarget* target,
+cmGeneratorExpressionContext *context,
+const GeneratorExpressionContent *content)
+ {
+if(!target-IsDLLPlatform())
+ {
+ ::reportError(context, content-GetOriginalExpression(),
+TARGET_PDB_FILE is only allowed
+for DLL target platforms.);
+ return std::string();
+ }
+
+cmTarget::TargetType targetType = target-GetType();
+
+if(targetType != cmTarget::SHARED_LIBRARY
+ targetType != cmTarget::MODULE_LIBRARY
+ targetType != cmTarget::EXECUTABLE)
+ {
+ ::reportError(context, content-GetOriginalExpression(),
+TARGET_PDB_FILE is allowed only for
+targets with linker created artifacts.);
+ return std::string();
+ }
+
+std::string result = target-GetPDBDirectory(context-Config);
+result += /;
+result += target-GetPDBName(context-Config);
+return result;
+ }
+};
+
+//
+template
struct TargetFilesystemArtifactResultCreatorArtifactLinkerTag
{
static std::string Create(cmTarget* target,
@@ -1706,6 +1742,9 @@ TargetFilesystemArtifactNodeGroupArtifactLinkerTag
targetLinkerNodeGroup;
static const
TargetFilesystemArtifactNodeGroupArtifactSonameTag targetSoNameNodeGroup;
+static const
+TargetFilesystemArtifactNodeGroupArtifactPdbTag targetPdbNodeGroup;
+
//
static const
cmGeneratorExpressionNode* GetNode(const std::string identifier)
@@ -1733,12 +1772,15 @@ cmGeneratorExpressionNode* GetNode(const std::string
identifier)
nodeMap[TARGET_FILE] =
[Cmake-commits] CMake branch, next, updated. v3.0.0-4551-g53ecb02
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 53ecb02357acb3e5b520aa400d1205e8d823b957 (commit) via 8c03f157765256113928edb5e58ef3a5cf82125c (commit) from 32adeae6c4c1edae5087c0a7ddb833f65aa79de8 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53ecb02357acb3e5b520aa400d1205e8d823b957 commit 53ecb02357acb3e5b520aa400d1205e8d823b957 Merge: 32adeae 8c03f15 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 12:45:22 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 12:45:22 2014 -0400 Merge topic 'doc-tll-flags' into next 8c03f157 Help: Clarify target_link_libraries treatment of flags (#15034) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c03f157765256113928edb5e58ef3a5cf82125c commit 8c03f157765256113928edb5e58ef3a5cf82125c Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 12:45:06 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jul 28 12:45:06 2014 -0400 Help: Clarify target_link_libraries treatment of flags (#15034) Explain that link flags should not be used in transitive contexts. diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index bced169..39537a7 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -18,7 +18,10 @@ If a library name matches that of another target in the project a dependency will automatically be added in the build system to make sure the library being linked is up-to-date before the target links. Item names starting with ``-``, but not ``-l`` or ``-framework``, are treated as -linker flags. +linker flags. Note that such flags will be treated like any other library +link item for purposes of transitive dependencies, so they are generally +safe to specify only as private link items that will not propagate to +dependents of ``target``. A ``debug``, ``optimized``, or ``general`` keyword indicates that the library immediately following it is to be used only for the --- Summary of changes: Help/command/target_link_libraries.rst |5 - 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4553-ge5c672d
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 e5c672d0d46ee61ccd9c789ba0aaf0c20916b567 (commit)
via 608cf8149ccbf8954926ab7c86fd658099a52f7b (commit)
from 53ecb02357acb3e5b520aa400d1205e8d823b957 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5c672d0d46ee61ccd9c789ba0aaf0c20916b567
commit e5c672d0d46ee61ccd9c789ba0aaf0c20916b567
Merge: 53ecb02 608cf81
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 13:14:58 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 13:14:58 2014 -0400
Merge topic 'xcode-6-librarian-flags' into next
608cf814 Xcode: Fix static library creation for Xcode 6 (#15038)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=608cf8149ccbf8954926ab7c86fd658099a52f7b
commit 608cf8149ccbf8954926ab7c86fd658099a52f7b
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 11:41:53 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 13:06:33 2014 -0400
Xcode: Fix static library creation for Xcode 6 (#15038)
Xcode 6 introduced an 'OTHER_LIBTOOLFLAGS' setting for the Other
Librarian Flags of a static library. Now 'OTHER_LDFLAGS' are ignored.
Teach the Xcode generator to choose the correct name for the build
setting based on the type of target and the version of Xcode.
Inspired-by: Jamie Kirkpatrick j...@spotify.com
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 484b28f..3503e19 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2298,7 +2298,7 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
}
}
- buildSettings-AddAttribute(OTHER_LDFLAGS,
+ buildSettings-AddAttribute(this-GetTargetLinkFlagsVar(target),
this-CreateString(extraLinkOptions.c_str()));
buildSettings-AddAttribute(OTHER_REZFLAGS,
this-CreateString());
@@ -2522,6 +2522,22 @@ std::string
cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
}
//
+const char*
+cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const cmtarget) const
+{
+ if(this-XcodeVersion = 60
+ (cmtarget.GetType() == cmTarget::STATIC_LIBRARY ||
+ cmtarget.GetType() == cmTarget::OBJECT_LIBRARY))
+{
+return OTHER_LIBTOOLFLAGS;
+}
+ else
+{
+return OTHER_LDFLAGS;
+}
+}
+
+//
const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget cmtarget)
{
switch(cmtarget.GetType())
@@ -2834,8 +2850,9 @@ void cmGlobalXCodeGenerator
sep = ;
linkObjs += this-XCodeEscapePath(oi-c_str());
}
- this-AppendBuildSettingAttribute(target, OTHER_LDFLAGS,
-linkObjs.c_str(), configName);
+ this-AppendBuildSettingAttribute(
+target, this-GetTargetLinkFlagsVar(*cmtarget),
+linkObjs.c_str(), configName);
}
// Skip link information for object libraries.
@@ -2913,8 +2930,9 @@ void cmGlobalXCodeGenerator
target-AddDependTarget(configName, li-Target-GetName());
}
}
-this-AppendBuildSettingAttribute(target, OTHER_LDFLAGS,
- linkLibs.c_str(), configName);
+this-AppendBuildSettingAttribute(
+ target, this-GetTargetLinkFlagsVar(*cmtarget),
+ linkLibs.c_str(), configName);
}
}
}
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index c9d20c2..a7b54e9 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -141,6 +141,7 @@ private:
cmXCodeObject* buildPhases);
void ForceLinkerLanguages();
void ForceLinkerLanguage(cmTarget cmtarget);
+ const char* GetTargetLinkFlagsVar(cmTarget const cmtarget) const;
const char* GetTargetFileType(cmTarget cmtarget);
const char* GetTargetProductType(cmTarget cmtarget);
std::string AddConfigurations(cmXCodeObject* target, cmTarget cmtarget);
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 28 +++-
Source/cmGlobalXCodeGenerator.h |1 +
2 files changed, 24 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
[Cmake-commits] CMake branch, next, updated. v3.0.0-4555-g2a4a4c3
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 2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274 (commit)
via 9e5e7e71c5b34f442be4008daf7be7e33438556a (commit)
from e5c672d0d46ee61ccd9c789ba0aaf0c20916b567 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274
commit 2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274
Merge: e5c672d 9e5e7e7
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 15:08:52 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 15:08:52 2014 -0400
Merge topic 'fix-qthelp-windows' into next
9e5e7e71 Help: Fix QtHelp commands on Windows
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e5e7e71c5b34f442be4008daf7be7e33438556a
commit 9e5e7e71c5b34f442be4008daf7be7e33438556a
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 21:07:53 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Mon Jul 28 21:07:53 2014 +0200
Help: Fix QtHelp commands on Windows
Explicitly invoke python script through the interpreter since
windows does not act on hashbangs.
Use the found qcollectiongenerator executable rather than what
happens to be in PATH.
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index fd8cda9..a58604e 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -69,6 +69,8 @@ if(SPHINX_TEXT)
list(APPEND doc_formats text)
endif()
if(SPHINX_QTHELP)
+ find_package(PythonInterp REQUIRED)
+
find_program(QCOLLECTIONGENERATOR_EXECUTABLE
NAMES qcollectiongenerator
DOC qcollectiongenerator tool
@@ -91,9 +93,12 @@ if(SPHINX_QTHELP)
# Create proper identifiers. Workaround for
#
https://bitbucket.org/birkenfeld/sphinx/issue/1491/qthelp-should-generate-identifiers-for
-COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create_identifiers.py
${CMAKE_CURRENT_BINARY_DIR}/qthelp/
+COMMAND ${PYTHON_EXECUTABLE}
+ ${CMAKE_CURRENT_SOURCE_DIR}/create_identifiers.py
+ ${CMAKE_CURRENT_BINARY_DIR}/qthelp/
-COMMAND qcollectiongenerator ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp
+COMMAND ${QCOLLECTIONGENERATOR_EXECUTABLE}
+ ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp
)
endif()
---
Summary of changes:
Utilities/Sphinx/CMakeLists.txt |9 +++--
1 file changed, 7 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.0.0-4559-g4dbe189
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 4dbe18970588193b9b181bd6c8b5102bb2cfb1c9 (commit) via 7079f33d6ac00f9417d2d7aa222c8d0675ce3752 (commit) via 05373f7ea79f950bf56657e6b5aabb02b34d4c76 (commit) via 1acde6b003812e9964bdf67db5c1ce68a566e675 (commit) from 2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dbe18970588193b9b181bd6c8b5102bb2cfb1c9 commit 4dbe18970588193b9b181bd6c8b5102bb2cfb1c9 Merge: 2a4a4c3 7079f33 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 16:23:04 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jul 28 16:23:04 2014 -0400 Merge topic 'windows-ce-cleanup' into next 7079f33d WindowsCE: Drop unused Platform/WindowsCE-MSVC module 05373f7e WindowsCE: Refactor setting of WINCE 1acde6b0 MSVC: Use STREQUAL to check for WindowsCE http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7079f33d6ac00f9417d2d7aa222c8d0675ce3752 commit 7079f33d6ac00f9417d2d7aa222c8d0675ce3752 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 14:06:52 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jul 28 16:21:50 2014 -0400 WindowsCE: Drop unused Platform/WindowsCE-MSVC module This module was created to mirror Platform/Windows-MSVC.cmake, but this is not necessary because nothing includes Platform/os-id.cmake directly. The Platform/Windows-MSVC module is only a helper for the Platform/Windows-MSVC-lang modules. diff --git a/Modules/Platform/WindowsCE-MSVC.cmake b/Modules/Platform/WindowsCE-MSVC.cmake deleted file mode 100644 index d28b4ab..000 --- a/Modules/Platform/WindowsCE-MSVC.cmake +++ /dev/null @@ -1 +0,0 @@ -include(Platform/Windows-MSVC) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05373f7ea79f950bf56657e6b5aabb02b34d4c76 commit 05373f7ea79f950bf56657e6b5aabb02b34d4c76 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 14:14:58 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jul 28 16:21:47 2014 -0400 WindowsCE: Refactor setting of WINCE Move it to the Platform/Windows module since it is independent of the compiler used. While at it, remove redundant WIN32 setting from Platform/Windows-MSVC since Plaform/Windows already sets its. diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 5b57ee7..2cfe6fe 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -36,13 +36,10 @@ else() set(CMAKE_CL_NOLOGO /nologo) endif() -set(WIN32 1) - if(CMAKE_SYSTEM_NAME STREQUAL WindowsCE) set(CMAKE_CREATE_WIN32_EXE /entry:WinMainCRTStartup) set(CMAKE_CREATE_CONSOLE_EXE /entry:mainACRTStartup) set(_PLATFORM_LINK_FLAGS /subsystem:windowsce) - set(WINCE 1) else() set(CMAKE_CREATE_WIN32_EXE /subsystem:windows) set(CMAKE_CREATE_CONSOLE_EXE /subsystem:console) diff --git a/Modules/Platform/Windows.cmake b/Modules/Platform/Windows.cmake index b158a9d..7e97111 100644 --- a/Modules/Platform/Windows.cmake +++ b/Modules/Platform/Windows.cmake @@ -1,5 +1,9 @@ set(WIN32 1) +if(CMAKE_SYSTEM_NAME STREQUAL WindowsCE) + set(WINCE 1) +endif() + set(CMAKE_STATIC_LIBRARY_PREFIX ) set(CMAKE_STATIC_LIBRARY_SUFFIX .lib) set(CMAKE_SHARED_LIBRARY_PREFIX ) # lib http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1acde6b003812e9964bdf67db5c1ce68a566e675 commit 1acde6b003812e9964bdf67db5c1ce68a566e675 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jul 28 14:12:39 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jul 28 16:21:45 2014 -0400 MSVC: Use STREQUAL to check for WindowsCE In the Platform/Windows-MSVC module it is not necessary to use MATCHES because we are comparing against an exact string. diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 8e988c9..5b57ee7 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -38,7 +38,7 @@ endif() set(WIN32 1) -if(CMAKE_SYSTEM_NAME MATCHES WindowsCE) +if(CMAKE_SYSTEM_NAME STREQUAL WindowsCE) set(CMAKE_CREATE_WIN32_EXE /entry:WinMainCRTStartup) set(CMAKE_CREATE_CONSOLE_EXE /entry:mainACRTStartup) set(_PLATFORM_LINK_FLAGS /subsystem:windowsce) --- Summary of changes: Modules/Platform/Windows-MSVC.cmake |5 + Modules/Platform/Windows.cmake|4
[Cmake-commits] CMake branch, next, updated. v3.0.0-4561-g4cedb1e
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 4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95 (commit)
via 99e14a3865f96371284daef463df5e261b5698e3 (commit)
from 4dbe18970588193b9b181bd6c8b5102bb2cfb1c9 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95
commit 4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95
Merge: 4dbe189 99e14a3
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 16:24:03 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 16:24:03 2014 -0400
Merge topic 'vs10-comment-typo' into next
99e14a38 cmGlobalVisualStudio10Generator: Fix typo KHLM = HKLM
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99e14a3865f96371284daef463df5e261b5698e3
commit 99e14a3865f96371284daef463df5e261b5698e3
Author: Gilles Khouzam gill...@microsoft.com
AuthorDate: Mon Jul 28 14:04:45 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 16:23:54 2014 -0400
cmGlobalVisualStudio10Generator: Fix typo KHLM = HKLM
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index c1b087a..80fd9f0 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -435,7 +435,7 @@ bool
cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
// This edition does not come with 64-bit tools. Look for them.
//
// TODO: Detect available tools? x64\v100 exists but does not work?
- // KHLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\4.0;VCTargetsPath
+ // HKLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\4.0;VCTargetsPath
// c:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/Platforms/
// {Itanium,Win32,x64}/PlatformToolsets/{v100,v90,Windows7.1SDK}
std::string winSDK_7_1;
---
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4564-g7f962df
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 7f962dfebf65a6d0aa386c5def86d85725da34bd (commit)
via e58f97531aa6e2a124540f38b5acd18fd989cf3b (commit)
via d0dd28fa92cb2223e20f3586b8973a931aa61dac (commit)
from 4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f962dfebf65a6d0aa386c5def86d85725da34bd
commit 7f962dfebf65a6d0aa386c5def86d85725da34bd
Merge: 4cedb1e e58f975
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 16:29:28 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 16:29:28 2014 -0400
Merge topic 'vs10-system-hook' into next
e58f9753 VS: Add a hook to adapt to SystemName and SystemVersion
d0dd28fa VS: Save system name and version in global generator members
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e58f97531aa6e2a124540f38b5acd18fd989cf3b
commit e58f97531aa6e2a124540f38b5acd18fd989cf3b
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 15:37:15 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 16:26:00 2014 -0400
VS: Add a hook to adapt to SystemName and SystemVersion
Add a virtual cmGlobalVisualStudio10Generator::InitializeSystem method
called from SetSystemName once the SystemName and SystemVersion members
have been populated. This will give VS version-specific generators a
chance to recognize and adapt to the target system.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index ad74537..32049b3 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -130,6 +130,10 @@ bool
cmGlobalVisualStudio10Generator::SetSystemName(std::string const s,
{
this-SystemName = s;
this-SystemVersion = mf-GetSafeDefinition(CMAKE_SYSTEM_VERSION);
+ if(!this-InitializeSystem(mf))
+{
+return false;
+}
if(this-PlatformName == Itanium || this-PlatformName == x64)
{
if(this-IsExpressEdition() !this-Find64BitTools(mf))
@@ -142,6 +146,12 @@ bool
cmGlobalVisualStudio10Generator::SetSystemName(std::string const s,
}
//
+bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile*)
+{
+ return true;
+}
+
+//
void cmGlobalVisualStudio10Generator
::AddVSPlatformToolsetDefinition(cmMakefile* mf) const
{
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index dfdb649..4d7ff80 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -92,6 +92,7 @@ public:
protected:
virtual void Generate();
+ virtual bool InitializeSystem(cmMakefile* mf);
virtual const char* GetIDEVersion() { return 10.0; }
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0dd28fa92cb2223e20f3586b8973a931aa61dac
commit d0dd28fa92cb2223e20f3586b8973a931aa61dac
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jul 28 15:33:40 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jul 28 16:25:08 2014 -0400
VS: Save system name and version in global generator members
Add to cmGlobalVisualStudio10Generator members for SystemName and
SystemVersion and populate them in SetSystemName.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index c1b087a..ad74537 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -128,6 +128,8 @@
cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const ts,
bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const s,
cmMakefile* mf)
{
+ this-SystemName = s;
+ this-SystemVersion = mf-GetSafeDefinition(CMAKE_SYSTEM_VERSION);
if(this-PlatformName == Itanium || this-PlatformName == x64)
{
if(this-IsExpressEdition() !this-Find64BitTools(mf))
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index 9f154e9..dfdb649 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -99,6 +99,8 @@ protected:
std::string GeneratorToolset;
std::string DefaultPlatformToolset;
+ std::string SystemName;
+ std::string SystemVersion;
bool ExpressEdition;
bool MasmEnabled;
[Cmake-commits] CMake branch, next, updated. v3.0.0-4567-gb2c6c53
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 b2c6c531909aa6c58c5a89bf99f0e0767cb39208 (commit)
via d31508452fb4a2ec691b0472a4c9a326159d4b3f (commit)
via beedfd1136f7200be90e4e368ce65d450d511af8 (commit)
from 7f962dfebf65a6d0aa386c5def86d85725da34bd (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2c6c531909aa6c58c5a89bf99f0e0767cb39208
commit b2c6c531909aa6c58c5a89bf99f0e0767cb39208
Merge: 7f962df d315084
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 17:36:34 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 17:36:34 2014 -0400
Merge topic 'pdb-genex' into next
d3150845 Genex: Introduce CMAKE_LANG_LINKER_SUPPORTS_PDB
beedfd11 Genex: Add tests for new PDB genex
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d31508452fb4a2ec691b0472a4c9a326159d4b3f
commit d31508452fb4a2ec691b0472a4c9a326159d4b3f
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 23:33:39 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Mon Jul 28 23:33:39 2014 +0200
Genex: Introduce CMAKE_LANG_LINKER_SUPPORTS_PDB
diff --git a/Modules/Platform/Windows-MSVC.cmake
b/Modules/Platform/Windows-MSVC.cmake
index 8e988c9..ecb323a 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -261,4 +261,5 @@ macro(__windows_compiler_msvc lang)
set(CMAKE_${lang}_FLAGS_RELEASE_INIT /MD /O2 /Ob2 /D NDEBUG)
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT /MD /Zi /O2 /Ob1 /D NDEBUG)
set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT /MD /O1 /Ob1 /D NDEBUG)
+ set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
endmacro()
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 35df9cd..3547e66 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1565,11 +1565,14 @@ struct
TargetFilesystemArtifactResultCreatorArtifactPdbTag
cmGeneratorExpressionContext *context,
const GeneratorExpressionContent *content)
{
-if(!target-IsDLLPlatform())
+std::string language = target-GetLinkerLanguage(context-Config);
+
+std::string pdbSupportVar = CMAKE_ + language + _LINKER_SUPPORTS_PDB;
+
+if(!context-Makefile-IsOn(pdbSupportVar))
{
::reportError(context, content-GetOriginalExpression(),
-TARGET_PDB_FILE is only allowed
-for DLL target platforms.);
+TARGET_PDB_FILE is not supported by the target linker.);
return std::string();
}
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index ff3b9a0..7ba44fb 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -7,6 +7,7 @@ macro(add_RunCMake_test test)
-DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
+-DRunCMake_CXX_COMPILER_ID=${CMAKE_CXX_COMPILER_ID}
${${test}_ARGS}
-P ${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake
)
diff --git
a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-result.txt
b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-result.txt
deleted file mode 100644
index d00491f..000
---
a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git
a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-stderr.txt
b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-stderr.txt
deleted file mode 100644
index b1b91e3..000
---
a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-stderr.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CMake Error at NonValidCompiler-TARGET_PDB_FILE.cmake:6 \(file\):
- Error evaluating generator expression:
-
-\$TARGET_PDB_FILE:empty
-
- TARGET_PDB_FILE is only allowed for DLL target platforms.
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
diff --git
a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE.cmake
b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE.cmake
deleted file mode 100644
index a85c20e..000
--- a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-
-enable_language(C)
-
-add_library(empty SHARED empty.c)
-
-file(GENERATE
- OUTPUT
[Cmake-commits] CMake branch, next, updated. v3.0.0-4569-g767c8c3
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 767c8c39ef2a37ab0c3cbe4c50a429abd1613886 (commit)
via 8402e1d79ee41ef65101636c23abac14a8ea42e2 (commit)
from b2c6c531909aa6c58c5a89bf99f0e0767cb39208 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=767c8c39ef2a37ab0c3cbe4c50a429abd1613886
commit 767c8c39ef2a37ab0c3cbe4c50a429abd1613886
Merge: b2c6c53 8402e1d
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Mon Jul 28 18:09:59 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 18:09:59 2014 -0400
Merge topic 'pdb-genex' into next
8402e1d7 Genex: Use first available config in multi-config generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8402e1d79ee41ef65101636c23abac14a8ea42e2
commit 8402e1d79ee41ef65101636c23abac14a8ea42e2
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Tue Jul 29 00:09:45 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Tue Jul 29 00:09:45 2014 +0200
Genex: Use first available config in multi-config generators
diff --git
a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
index e8c5184..2cd6db3 100644
--- a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
+++ b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
@@ -3,6 +3,11 @@ enable_language(C)
add_library(empty SHARED empty.c)
+if(CMAKE_CONFIGURATION_TYPES)
+ list(GET CMAKE_CONFIGURATION_TYPES 0 FIRST_CONFIG)
+ set(GENERATE_CONDITION CONDITION ${FIRST_CONFIG})
+endif()
+
file(GENERATE
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test.txt
CONTENT
@@ -10,4 +15,5 @@ file(GENERATE
$TARGET_PDB_FILE_NAME:empty
$TARGET_PDB_FILE_DIR:empty
]]
+ ${GENERATE_CONDITION}
)
---
Summary of changes:
.../GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake|6 ++
1 file changed, 6 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1525-gb6acd96
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via b6acd96f7fbe4df80e3735b101271cb801ba375a (commit) from f188845237cdfee74dae065a61c855e285b3 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6acd96f7fbe4df80e3735b101271cb801ba375a commit b6acd96f7fbe4df80e3735b101271cb801ba375a Author: Kitware Robot kwro...@kitware.com AuthorDate: Tue Jul 29 00:01:12 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Tue Jul 29 00:01:12 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 769ab83..94f9919 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) -set(CMake_VERSION_PATCH 20140728) +set(CMake_VERSION_PATCH 20140729) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
