Re: [cmake-developers] CMake generates Makefiles that don't parallelize as much as they could.
Here's the sample code: https://github.com/NickNick/cmake-interface-includes/commits/master . The second commit breaks the build. I sort of understand why it does, but that means I can't use the INTERFACE-trick, so to say, even with static libraries. Thanks for linking the other bug. On Mon, Jul 28, 2014 at 4:19 PM, Brad King brad.k...@kitware.com wrote: 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/29/2014 01:47 PM, Konstantin Podsvirov wrote: I have some news and changes. The source code is now available here: http://git.podsvirov.pro/?p=kitware/cmake.git New changes applied here: CPackIFW: Document cpack_ifw_configure_component DEPENDS option http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2340001 CPackIFW: Add package configuration variables http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7511b7f Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Review Request] Topic CMakePackageConfigHelpers_build_tree
On 07/28/2014 11:07 AM, Daniele E. Domenichelli wrote: I applied the changes you requested to the documentation, rebased, and merged to next for testing. Thanks. While reviewing the commits in 'next' again I realized that assuming paths are relative to CMAKE_BINARY_DIR may not be correct. Some projects may be nested inside others, and the CMAKE_BINARY_DIR may not be the proper location for a nested project. Instead the BUILD_TREE option should be followed by another argument specifying the base for relative paths, i.e. the in-build-tree prefix. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015046]: visual studio configuration sometimes switches from x64 to win32
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=15046 == Reported By:tim blechmann Assigned To: == Project:CMake Issue ID: 15046 Category: CMake Reproducibility:sometimes Severity: minor Priority: normal Status: new == Date Submitted: 2014-07-30 09:42 EDT Last Modified: 2014-07-30 09:42 EDT == Summary:visual studio configuration sometimes switches from x64 to win32 Description: i'm configuring my windows/64bit builds using the Visual Studio 12 2013 Win64 generator. however sometimes when running cmake on this existing build folder, the configuration switches from x64 to win32 (likewise the generator is switched to Visual Studio 12 2013). while i have seen this a couple of time on different machines, i haven't been able to find a reproducer. == Issue History Date ModifiedUsername FieldChange == 2014-07-30 09:42 tim blechmann New Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] LZMA support
On 07/23/2014 10:43 AM, Brad King wrote: I've merged the topic to 'next' for testing, but without the CPack or ExternalProject pieces. Likely some more portability fixes will be required after testing on the dashboard. Once that is clean I will add the other changes again on top of the revised topic. This is all now in master as of commit 6370c90f. I've updated issues 13072, 13515, 14504, and 14519 accordingly. Thanks! -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] CPack IFW generator
Hi guys! 30.07.2014, 17:15, Brad King brad.k...@kitware.com: New changes applied here: CPackIFW: Document cpack_ifw_configure_component DEPENDS option http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2340001 CPackIFW: Add package configuration variables http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7511b7f Thank You Brad! The code is now in the branch 'next' so soon it will get to 'master' :-) Regards, Konstantin Podsvirov -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] CMake generates Makefiles that don't parallelize as much as they could.
On 07/30/2014 05:31 AM, Nick Overdijk wrote: https://github.com/NickNick/cmake-interface-includes/commits/master Thanks. For reference, the summary is: cmake_minimum_required(VERSION 2.8.12) project(FOO CXX) add_library(foo foo/foo.cpp) target_include_directories(foo INTERFACE foo) add_library(bar bar/bar.cpp) target_link_libraries(bar foo) # reduces parallel compilation #target_link_libraries(bar INTERFACE foo) # compiles bar without foo reqs With CMake 3.0 you might be able to hack something up with INTERFACE libraries, but that will increase complexity. The INTERFACE workaround commented out in the above example is really only good when no usage requirements need to be propagated. Otherwise, I think you're stuck with the reduced parallelism until CMake can be taught to detect when it is safe to drop such dependencies as I explained earlier. FWIW, I've been building large projects this way for years and rarely been bothered by this. Usually each library has so many sources that parallelism within each target is enough. -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.
True, I was just bothered by it when we got distcc running with a good amount of cores. Thanks for your effort. :) I'll try and make something with the things I've learned (I'm thinking of making some functions that propagate usage requirements yet link with INTERFACE or something along those lines, of course only usable for static libs). On Wed, Jul 30, 2014 at 4:51 PM, Brad King brad.k...@kitware.com wrote: On 07/30/2014 05:31 AM, Nick Overdijk wrote: https://github.com/NickNick/cmake-interface-includes/commits/master Thanks. For reference, the summary is: cmake_minimum_required(VERSION 2.8.12) project(FOO CXX) add_library(foo foo/foo.cpp) target_include_directories(foo INTERFACE foo) add_library(bar bar/bar.cpp) target_link_libraries(bar foo) # reduces parallel compilation #target_link_libraries(bar INTERFACE foo) # compiles bar without foo reqs With CMake 3.0 you might be able to hack something up with INTERFACE libraries, but that will increase complexity. The INTERFACE workaround commented out in the above example is really only good when no usage requirements need to be propagated. Otherwise, I think you're stuck with the reduced parallelism until CMake can be taught to detect when it is safe to drop such dependencies as I explained earlier. FWIW, I've been building large projects this way for years and rarely been bothered by this. Usually each library has so many sources that parallelism within each target is enough. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] adding command line flags for CMAKE_MAKE_PROGRAM
I was trying to get ExternalProjects generated with the Ninja generator to do a
better job of handling multiple CPUs and load, so I tried the naïve solution
below.
I needed to add flags to the program named in CMAKE_MAKE_PROGRAM. This is
difficult because CMAKE_MAKE_PROGRAM is a string; I can pass it as part of an
ExternalProjects’ CMAKE_ARGS, but then the resulting build tries to run
“/usr/bin/ninja –j 32” as the command, instead of adding –j 32 to ninja’s
command line.
Any ideas, or am I asking for a CMAKE_MAKE_PROGRAM_FLAGS command? Or to modify
the generator?
the only alternative is to explicitly set the BUILD_COMMAND for every
ExternalProject_add command.
#--
# For ninja generator, propagate ninja flags
#--
if(CMAKE_GENERATOR MATCHES .*Ninja.*)
if(NOT DEFINED PROCESSOR_COUNT)
# Unknown:
set(PROCESSOR_COUNT 1)
# Linux:
if(CMAKE_SYSTEM_NAME MATCHES .*Linux.*)
set(cpuinfo_file /proc/cpuinfo)
if(EXISTS ${cpuinfo_file})
file(STRINGS ${cpuinfo_file} procs REGEX ^processor.: [0-9]+$)
list(LENGTH procs PROCESSOR_COUNT)
endif()
# Mac:
elseif(APPLE)
find_program(cmd_sys_pro system_profiler)
if(cmd_sys_pro)
execute_process(COMMAND ${cmd_sys_pro} OUTPUT_VARIABLE info)
string(REGEX REPLACE ^.*Total Number Of Cores: ([0-9]+).*$ \\1
PROCESSOR_COUNT ${info})
endif()
# Windows:
elseif(WIN32)
set(PROCESSOR_COUNT $ENV{NUMBER_OF_PROCESSORS})
endif()
endif()
set(CMAKE_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM} -l ${PROCESSOR_COUNT})
endif()
Notice: This UI Health Care e-mail (including attachments) is covered by the
Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential and
may be legally privileged. If you are not the intended recipient, you are
hereby notified that any retention, dissemination, distribution, or copying of
this communication is strictly prohibited. Please reply to the sender that you
have received the message in error, then delete it. 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-developers
Re: [cmake-developers] ExternalProject: adding command line flags for CMAKE_MAKE_PROGRAM
On 07/30/2014 11:06 AM, Williams, Norman K wrote:
I was trying to get ExternalProjects generated with the Ninja
generator to do a better job of handling multiple CPUs and load,
so I tried the naïve solution below.
For reference in the archives, your previous post about this was here:
CMake, Ninja generator, and ExternalProjects
http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/10543
I needed to add flags to the program named in CMAKE_MAKE_PROGRAM.
The relevant part of the ExternalProject module source is the block
that constructs the default BUILD_COMMAND when not using a Makefile
generator:
# Drive the project with cmake --build.
get_target_property(cmake_command ${name} _EP_CMAKE_COMMAND)
if(cmake_command)
set(cmd ${cmake_command})
else()
set(cmd ${CMAKE_COMMAND})
endif()
set(args --build ${binary_dir} --config ${CMAKE_CFG_INTDIR})
At build time, cmake --build loads the CMAKE_MAKE_PROGRAM from the
CMakeCache.txt of the build tree, at least for the Ninja generator.
When running cmake --build by hand one can specify additional args:
cmake --build . -- $ExtraArgs
Everything after the -- option will be given to the native tool.
Perhaps one could add a special-case here when cmake_generator is
Ninja to extend the cmake --build command with th needed options
to ninja.
the only alternative is to explicitly set the BUILD_COMMAND for
every ExternalProject_add command.
That would also work with existing CMake releases, but would have
to be conditional on the generator in use.
-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
Hello Brad, On 30/07/14 15:32, Brad King wrote: Thanks. While reviewing the commits in 'next' again I realized that assuming paths are relative to CMAKE_BINARY_DIR may not be correct. Some projects may be nested inside others, and the CMAKE_BINARY_DIR may not be the proper location for a nested project. Instead the BUILD_TREE option should be followed by another argument specifying the base for relative paths, i.e. the in-build-tree prefix. Ok, looks reasonable but I have a few questions... I never used multiple project calls, so I don't know how it works, would PROJECT_BINARY_DIR be an appropriate replacement for CMAKE_BINARY_DIR? configure_package_config_file has an INSTALL_DESTINATION argument, I was assuming that one would pass that if the destination isn't of the config file isn't CMAKE_BINARY_DIR. In this way if INSTALL_DESTINATION is a relative path, it will consider it relative to CMAKE_BINARY_DIR, like other places in CMake. How would you like me to handle this argument? Should INSTALL_DESTINATION always be relative to CMAKE_BINARY_DIR or should it be relative to BUILD_TREE? Maybe BUILD_TREE is no longer an appropriate name if you can set it to any folder, maybe RELATIVE_DIR or something similar would be more appropriate? Cheers, 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
Re: [cmake-developers] [Review Request] Topic CMakePackageConfigHelpers_build_tree
On 07/30/2014 11:57 AM, Daniele E. Domenichelli wrote:
I never used multiple project calls, so I don't know how it works, would
PROJECT_BINARY_DIR be an appropriate replacement for CMAKE_BINARY_DIR?
No, because we don't know if the most-nested project() call is the
right one either.
Should INSTALL_DESTINATION always be relative to CMAKE_BINARY_DIR or
should it be relative to BUILD_TREE?
The purpose of INSTALL_DESTINATION is to help the generated file
compute the installation prefix relative to itself. Therefore it
needs to be treated relative to the same place all other paths
will be treated relative to. This is BUILD_TREE when the option
is specified.
Maybe BUILD_TREE is no longer an appropriate name if you can set it to
any folder, maybe RELATIVE_DIR or something similar would be more
appropriate?
The purpose of the BUILD_TREE option is now to specify a different
value to be used anywhere ${CMAKE_INSTALL_PREFIX} is now. I think
the name INSTALL_PREFIX may be best. This approach generalizes
the feature even to the case of preparing a package config file
for a prefix besides the current value of CMAKE_INSTALL_PREFIX
even when it really will be installed.
Basically in the implementation you can replace any occurence of
${CMAKE_INSTALL_PREFIX} with a ${installPrefix} local that is set
to either CMAKE_INSTALL_PREFIX or the value of the INSTALL_PREFIX
option.
-Brad
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015047]: BundleUtilities' fixup_bundle does not check to see if two libs are the same up to symlinks
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=15047 == Reported By:Jordi Gutiérrez Hermoso Assigned To: == Project:CMake Issue ID: 15047 Category: Modules Reproducibility:have not tried Severity: minor Priority: normal Status: new == Date Submitted: 2014-07-30 13:30 EDT Last Modified: 2014-07-30 13:30 EDT == Summary:BundleUtilities' fixup_bundle does not check to see if two libs are the same up to symlinks Description: I'm using cmake's BundleUtilities to create an app bundle. I am using homebrew's wxmac package to create an application of my own. With wxmac, my binary links (amongst other things) to /usr/local/lib/libwx_baseu-3.0.dylib /usr/local/lib/libwx_osx_cocoau_core-3.0.dylib But /usr/local/lib/libwx_osx_cocoau_core-3.0.dylib itself also links to libwx_baseu-3.0.dylib, but not to the symlink in /usr/local/lib but to the original in /usr/local/Cellar which actually has a longer but compatible version name: libwx_baseu-3.0.0.1.0.dylib (note the extra dots in the version number). Of course, the 3.0.0.1.0 library is the same as the 3.0 library, as the latter is jus a symlink to the former. Thus BundleUtilities thinks that there is a dependency of a dependency and copies the libwx_baseu library twice, once for 3.0 and again for 3.0.0.1.0 and sets the path twice in my binary. This creates a segfaulty executable. :-( Steps to Reproduce: It's a bit complicated to easily reproduce this. Basically, use fixup_bundle, create a library that links both to foo.dylib and bar.dylib, and make sure that bar.dylib is a symlink to baz.dylib and that foo.dylib itself links to baz. In ASCII art: binary | \ | \ foo bar . baz | | \_/ where the dots indicate a filesystem symlink and the solid lines indicate dynamic library linking. Additional Information: (aside: homebrew sets up symlinks in /usr/local/lib that point to the actual wxmac libraries in /usr/local/Cellar/wxmac/3.0.1, similar to how most GNU/Linux systems handle /usr/lib and /usr/local/lib ) == Issue History Date ModifiedUsername FieldChange == 2014-07-30 13:30 Jordi Gutiérrez HermosoNew 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 0015048]: Semicolon in AIX compiler warning FAIL_REFEX causes it to match other output
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=15048 == Reported By:Erik Lindahl Assigned To: == Project:CMake Issue ID: 15048 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-07-30 21:05 CEST Last Modified: 2014-07-30 21:05 CEST == Summary:Semicolon in AIX compiler warning FAIL_REFEX causes it to match other output Description: In CMakeCheckCompilerFlagCommonPatterns.cmake of CMake-3.0, the FAIL_REGEX string for AIX contains a semicolon. This appears to cause the string to be split in two entries (since CMake uses semicolon as a separator for lists). Since the part after the semicolon is merely the word ignored, any compiler producing that word in the output will have a failure triggered. Steps to Reproduce: We found this when using the Intel 12.1.0 compiler on Windows HPC 2008 since that emits the linker warning LINK : warning LNK4224: /INCREMENTAL:YES is no longer supported; ignored, which caused the above test to trigger for the ignored word. Additional Information: Suggest to replace semicolon with a period to match any character in the regular expression. == Issue History Date ModifiedUsername FieldChange == 2014-07-30 21:05 Erik Lindahl New Issue == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] LZMA support
2014-07-30 15:58 GMT+02:00 Brad King brad.k...@kitware.com: On 07/23/2014 10:43 AM, Brad King wrote: I've merged the topic to 'next' for testing, but without the CPack or ExternalProject pieces. Likely some more portability fixes will be required after testing on the dashboard. Once that is clean I will add the other changes again on top of the revised topic. This is all now in master as of commit 6370c90f. I've updated issues 13072, 13515, 14504, and 14519 accordingly. Great! I think we should add packaging options like 'CPACK_BINARY_7Z' to 'Modules/CPack.cmake'. Maybe the options should be reordered alphabetically, to make it obvious where to add new package generators. By the way: CPACK_BINARY_IFW should be added to the 'mark_as_advanced' list too. cheers, Daniel diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index b58f944..8b07cea 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -426,6 +426,7 @@ if(NOT CPACK_GENERATOR) option(CPACK_BINARY_STGZ Enable to build STGZ packagesON) option(CPACK_BINARY_TGZ Enable to build TGZ packages ON) option(CPACK_BINARY_TBZ2 Enable to build TBZ2 packagesOFF) + option(CPACK_BINARY_TXZ Enable to build TXZ packages OFF) option(CPACK_BINARY_DEB Enable to build Debian packages OFF) option(CPACK_BINARY_RPM Enable to build RPM packages OFF) option(CPACK_BINARY_NSIS Enable to build NSIS packagesOFF) @@ -434,6 +435,7 @@ if(NOT CPACK_GENERATOR) option(CPACK_BINARY_NSIS Enable to build NSIS packages ON) option(CPACK_BINARY_WIX Enable to build WiX packages OFF) option(CPACK_BINARY_ZIP Enable to build ZIP packages OFF) +option(CPACK_BINARY_7Z Enable to build 7-Zip packages OFF) endif() option(CPACK_BINARY_IFW Enable to build IFW packages OFF) @@ -448,10 +450,12 @@ if(NOT CPACK_GENERATOR) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_STGZ STGZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TGZ TGZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TBZ2 TBZ2) + cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TXZ TXZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TZ TZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_WIX WIX) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_ZIP ZIP) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_IFW IFW) + cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_7Z 7Z) endif() @@ -463,26 +467,32 @@ if(NOT CPACK_SOURCE_GENERATOR) else() option(CPACK_SOURCE_TBZ2 Enable to build TBZ2 source packages ON) option(CPACK_SOURCE_TGZ Enable to build TGZ source packages ON) + option(CPACK_SOURCE_TXZ Enable to build TXZ source packages ON) option(CPACK_SOURCE_TZ Enable to build TZ source packages ON) option(CPACK_SOURCE_ZIP Enable to build ZIP source packages OFF) endif() else() option(CPACK_SOURCE_ZIP Enable to build ZIP source packages ON) +option(CPACK_SOURCE_7Z Enable to build 7-Zip source packages ON) endif() cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_CYGWIN CygwinSource) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TGZ TGZ) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TBZ2TBZ2) + cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TXZ TXZ) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TZ TZ) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_ZIP ZIP) + cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_7Z 7Z) endif() # mark the above options as advanced mark_as_advanced(CPACK_BINARY_CYGWIN CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_OSXX11 CPACK_BINARY_STGZ CPACK_BINARY_TGZ CPACK_BINARY_TBZ2 CPACK_BINARY_DEBCPACK_BINARY_RPM CPACK_BINARY_TZ + CPACK_BINARY_TXZCPACK_BINARY_7Z CPACK_BINARY_NSIS CPACK_BINARY_WIX CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ + CPACK_SOURCE_TXZCPACK_SOURCE_7Z CPACK_SOURCE_TZ CPACK_SOURCE_ZIP CPACK_BINARY_DRAGNDROP) # Set some other variables -- 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:
Re: [cmake-developers] LZMA support
On 07/30/2014 03:42 PM, Daniel Pfeifer wrote: I think we should add packaging options like 'CPACK_BINARY_7Z' to 'Modules/CPack.cmake'. Thanks. Patch applied: CPack: Add lzma-compressed package options http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d93e099 Maybe the options should be reordered alphabetically, to make it obvious where to add new package generators. Yes, this can be done as a follow-up to the other changes. By the way: CPACK_BINARY_IFW should be added to the 'mark_as_advanced' list too. Yes, thanks. CPack: Mark CPACK_BINARY_IFW option as advanced http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cabc2cd -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015049]: Add detection for Fujitsu compilers
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=15049 == Reported By:Erik Lindahl Assigned To: == Project:CMake Issue ID: 15049 Category: CMake Reproducibility:N/A Severity: feature Priority: normal Status: new == Date Submitted: 2014-07-30 22:53 CEST Last Modified: 2014-07-30 22:53 CEST == Summary:Add detection for Fujitsu compilers Description: Fujitsu users their own compilers (based on an old version of Clang) on K. By default the CMake compiler IDs are set to Unknown, but when using the GNU compatibility flags the Fujitsu compiler adds the _GNUC_ define (bad), although it is not really 100% compatible with GCC-4.1.2. To work around this we manually set the compiler IDs to Fujitsu, but it is probably a good idea to have this in the default distribution too, which the two attached patches accomplish (tested). Unfortunately the version cannot be extracted from the source level. If you want that, it can be detected from the output with the -V flag. Examples: klogin9$ fccpx -V fccpx: Fujitsu C/C++ Compiler Driver Version 1.2.0 P-id: L3-07 (Jul 30 2013 08:58:18) K-1.2.0-15 klogin9$ FCCpx -V FCCpx: Fujitsu C/C++ Compiler Driver Version 1.2.0 P-id: L3-07 (Jul 30 2013 08:58:18) K-1.2.0-15 klogin9$ frtpx -V frtpx: Fujitsu Fortran Driver Version 1.2.0 P-id: L3-07 (Jul 30 2013 08:57:22) K-1.2.0-15 == Issue History Date ModifiedUsername FieldChange == 2014-07-30 22:53 Erik Lindahl New Issue 2014-07-30 22:53 Erik Lindahl File Added: Fujitsu.patch == -- 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] scan-build of CMake
I am working on scan-build integration with ctest/CDash and did a build of CMake. The results show up in the warning section of the build: http://open.cdash.org/viewBuildError.php?type=1buildid=3429991 I excluded a few things in STL, but the rest of this might be worth looking at if anyone has the time. :) -Bill -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake
The problem as reported, is that you're trying to use add_custom_target with a target named test -- but you can't do that with CMake because test is a built-in well-known predefined target name. Other so-called well-known target names include all install package and package_source. And there may be others. If I can find a definitive documented list, I'll forward it... You can use any other name you like, but you should avoid the pre-defined target names that CMake already uses. HTH, David C. -Original Message- From: Ravi Raman ravi.ra...@xoriant.com To: cmake cmake@cmake.org Sent: Wed, Jul 30, 2014 12:35 am Subject: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake Hi all, We have reported an issue. It is regarding conversion of existing Visual Studio .targets files to cmake. The link for the reported issues is as follows. http://www.cmake.org/Bug/view.php?id=15044 Kindly let us know if this can be done in cmake. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.com| http://www.xoriant.com -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake
Hi David, Thanks for the response. Sorry to use the cmake pre-defined word test. My actual query was not this. I just used test as an example without realizing that it is actually a cmake pre-defined word. So, my actual query is as follows (2 points below): 1. In Microsoft Visual Studio project file module1.vcxproj, the targets file (target1.targets) gets included as follows: Import Project=module1.targets / In target1.targets, there are multiple entries of various targets as follows: Target Name=Target_1 .. /Target Target Name=Target_2 .. /Target To achieve the same thing in cmake, in the CMakeLists.txt file of module “module1” we are using the following command: add_custom_target() with the appropriate target names for the above i.e. we make 2 calls to add_custom_target() with target names Target_1 and Target_2 Is this the correct way to convert Visual Studio .targets file to cmake OR is there any other way ? 2. Also, if we take the above approach then for each call to add_custom_target(), a Visual Studio project file gets created under the module module1. So, in this case there will be 2 vcxproject files created i.e. Target_1.vcxproj and Target_2.vcxproj created for module module1. Please confirm if this is the expected behavior in cmake. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.com| http://www.xoriant.com -Original Message- From: David Cole [mailto:dlrd...@aol.com] Sent: Wednesday, July 30, 2014 3:37 PM To: Ravi Raman; cmake@cmake.org Subject: Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake The problem as reported, is that you're trying to use add_custom_target with a target named test -- but you can't do that with CMake because test is a built-in well-known predefined target name. Other so-called well-known target names include all install package and package_source. And there may be others. If I can find a definitive documented list, I'll forward it... You can use any other name you like, but you should avoid the pre-defined target names that CMake already uses. HTH, David C. -Original Message- From: Ravi Raman ravi.ra...@xoriant.com To: cmake cmake@cmake.org Sent: Wed, Jul 30, 2014 12:35 am Subject: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake Hi all, We have reported an issue. It is regarding conversion of existing Visual Studio .targets files to cmake. The link for the reported issues is as follows. http://www.cmake.org/Bug/view.php?id=15044 Kindly let us know if this can be done in cmake. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.com| http://www.xoriant.com -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake
Hi David, Note that the targets file name is target1.targets. So, please read it as Import Project=target1.targets / Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.commailto:ram.si...@xoriant.com| http://www.xoriant.comhttp://www.xoriant.com/ From: Ravi Raman Sent: Wednesday, July 30, 2014 4:06 PM To: 'David Cole' Cc: cmake@cmake.org Subject: RE: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake Hi David, Thanks for the response. Sorry to use the cmake pre-defined word test. My actual query was not this. I just used test as an example without realizing that it is actually a cmake pre-defined word. So, my actual query is as follows (2 points below): 1. In Microsoft Visual Studio project file module1.vcxproj, the targets file (target1.targets) gets included as follows: Import Project=module1.targets / In target1.targets, there are multiple entries of various targets as follows: Target Name=Target_1 .. /Target Target Name=Target_2 .. /Target To achieve the same thing in cmake, in the CMakeLists.txt file of module “module1” we are using the following command: add_custom_target() with the appropriate target names for the above i.e. we make 2 calls to add_custom_target() with target names Target_1 and Target_2 Is this the correct way to convert Visual Studio .targets file to cmake OR is there any other way ? 2. Also, if we take the above approach then for each call to add_custom_target(), a Visual Studio project file gets created under the module module1. So, in this case there will be 2 vcxproject files created i.e. Target_1.vcxproj and Target_2.vcxproj created for module module1. Please confirm if this is the expected behavior in cmake. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.com| http://www.xoriant.com -Original Message- From: David Cole [mailto:dlrd...@aol.com] Sent: Wednesday, July 30, 2014 3:37 PM To: Ravi Raman; cmake@cmake.org Subject: Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake The problem as reported, is that you're trying to use add_custom_target with a target named test -- but you can't do that with CMake because test is a built-in well-known predefined target name. Other so-called well-known target names include all install package and package_source. And there may be others. If I can find a definitive documented list, I'll forward it... You can use any other name you like, but you should avoid the pre-defined target names that CMake already uses. HTH, David C. -Original Message- From: Ravi Raman ravi.ra...@xoriant.com To: cmake cmake@cmake.org Sent: Wed, Jul 30, 2014 12:35 am Subject: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake Hi all, We have reported an issue. It is regarding conversion of existing Visual Studio .targets files to cmake. The link for the reported issues is as follows. http://www.cmake.org/Bug/view.php?id=15044 Kindly let us know if this can be done in cmake. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.com| http://www.xoriant.com -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- 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
Re: [CMake] Ctest and custom measurements
Unfortunately, I always have to resort to source code analysis to figure this stuff out... NamedMeasurement is only mentioned in the file Source/CTest/cmCTestTestHandler.cxx : http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/CTest/cmCTestTestHandler.cxx;hb=refs/heads/master (search the page for NamedMeasurement, and see the function cmCTestTestHandler::GenerateRegressionImages in particular...) Transform your output (if you can) into using DartMeasurement style XML tags as shown in this post from 4 years ago: http://www.cmake.org/pipermail/cmake/2010-April/036574.html Quoting from that 4-year-old post: To send a number (for example, 42) as a measurement named Simple, try printing output like this on stdout: DartMeasurement name=Simple type=numeric/integer42/DartMeasurement DartMeasurement name=pi type=numeric/double3.14159/DartMeasurement CTest should parse the DartMeasurement tags from the output and generate the NamedMeasurement XML that CDash is expecting. It is a little bit ridiculous to use the legacy format in the output, which ctest recognizes, and then transforms into what CDash needs, but it is what is necessary at the moment. You are trying to send what CDash needs directly, but it gets encoded into the output of the test, rather than recognized like the legacy format One of these days, perhaps an easier way will find its way into the source code. For now, try the legacy technique and let us know if it works out for you. HTH, David C. -Original Message- From: ycollette.nospam ycollette.nos...@free.fr To: cmake cmake@cmake.org Sent: Tue, Jul 29, 2014 10:44 am Subject: [CMake] Ctest and custom measurements Hello, I've got an executable built using cmake. I use ctest to test my executable. Each time the executable is executed, a log file on std::cout is produced. I the log file, I added the following XML tags: NamedMeasurement name=my measure type=numeric/doubleValue0.33/Value/NamedMeasurement I don't see these named measurements in the xml file produced by ctest -D NighlyStart ; ctest -D NighlyTest I use cmake-2.8.12.2 under Fedora 20 64 bits. Is it possible to add custom measurements in the xml file generated by ctest ? Best regards, YC -- 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] Ctest and custom measurements
Thanks for the answer. After some trial, I found that I must use DartMeasurement and not NamedMeasurement. I also found that to build a correct measurement, the opening tag must be at the beginning of the line, not in the middle: Log message - date - DartMeasurement ...0.1/DartMeasurement - DOESN'T WORK DartMeasurement ...0.1/DartMeasurement - WORK (I just removed the Log message - date - part) YC - Mail original - De: David Cole dlrd...@aol.com À: ycollette nospam ycollette.nos...@free.fr, cmake@cmake.org Envoyé: Mercredi 30 Juillet 2014 12:48:23 Objet: Re: [CMake] Ctest and custom measurements Unfortunately, I always have to resort to source code analysis to figure this stuff out... NamedMeasurement is only mentioned in the file Source/CTest/cmCTestTestHandler.cxx : http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/CTest/cmCTestTestHandler.cxx;hb=refs/heads/master (search the page for NamedMeasurement, and see the function cmCTestTestHandler::GenerateRegressionImages in particular...) Transform your output (if you can) into using DartMeasurement style XML tags as shown in this post from 4 years ago: http://www.cmake.org/pipermail/cmake/2010-April/036574.html Quoting from that 4-year-old post: To send a number (for example, 42) as a measurement named Simple, try printing output like this on stdout: DartMeasurement name=Simple type=numeric/integer42/DartMeasurement DartMeasurement name=pi type=numeric/double3.14159/DartMeasurement CTest should parse the DartMeasurement tags from the output and generate the NamedMeasurement XML that CDash is expecting. It is a little bit ridiculous to use the legacy format in the output, which ctest recognizes, and then transforms into what CDash needs, but it is what is necessary at the moment. You are trying to send what CDash needs directly, but it gets encoded into the output of the test, rather than recognized like the legacy format One of these days, perhaps an easier way will find its way into the source code. For now, try the legacy technique and let us know if it works out for you. HTH, David C. -Original Message- From: ycollette.nospam ycollette.nos...@free.fr To: cmake cmake@cmake.org Sent: Tue, Jul 29, 2014 10:44 am Subject: [CMake] Ctest and custom measurements Hello, I've got an executable built using cmake. I use ctest to test my executable. Each time the executable is executed, a log file on std::cout is produced. I the log file, I added the following XML tags: NamedMeasurement name=my measure type=numeric/doubleValue0.33/Value/NamedMeasurement I don't see these named measurements in the xml file produced by ctest -D NighlyStart ; ctest -D NighlyTest I use cmake-2.8.12.2 under Fedora 20 64 bits. Is it possible to add custom measurements in the xml file generated by ctest ? Best regards, YC -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake
Hi David, Can you refer to the query in the mails below (2 points are mentioned). Please let us know your comments when you get time. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.commailto:ram.si...@xoriant.com| http://www.xoriant.comhttp://www.xoriant.com/ From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of Ravi Raman Sent: Wednesday, July 30, 2014 4:13 PM To: David Cole Cc: cmake@cmake.org Subject: Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake Hi David, Note that the targets file name is target1.targets. So, please read it as Import Project=target1.targets / Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.commailto:ram.si...@xoriant.com| http://www.xoriant.comhttp://www.xoriant.com/ From: Ravi Raman Sent: Wednesday, July 30, 2014 4:06 PM To: 'David Cole' Cc: cmake@cmake.org Subject: RE: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake Hi David, Thanks for the response. Sorry to use the cmake pre-defined word test. My actual query was not this. I just used test as an example without realizing that it is actually a cmake pre-defined word. So, my actual query is as follows (2 points below): 1. In Microsoft Visual Studio project file module1.vcxproj, the targets file (target1.targets) gets included as follows: Import Project=module1.targets / In target1.targets, there are multiple entries of various targets as follows: Target Name=Target_1 .. /Target Target Name=Target_2 .. /Target To achieve the same thing in cmake, in the CMakeLists.txt file of module “module1” we are using the following command: add_custom_target() with the appropriate target names for the above i.e. we make 2 calls to add_custom_target() with target names Target_1 and Target_2 Is this the correct way to convert Visual Studio .targets file to cmake OR is there any other way ? 2. Also, if we take the above approach then for each call to add_custom_target(), a Visual Studio project file gets created under the module module1. So, in this case there will be 2 vcxproject files created i.e. Target_1.vcxproj and Target_2.vcxproj created for module module1. Please confirm if this is the expected behavior in cmake. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.com| http://www.xoriant.com -Original Message- From: David Cole [mailto:dlrd...@aol.com] Sent: Wednesday, July 30, 2014 3:37 PM To: Ravi Raman; cmake@cmake.org Subject: Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake The problem as reported, is that you're trying to use add_custom_target with a target named test -- but you can't do that with CMake because test is a built-in well-known predefined target name. Other so-called well-known target names include all install package and package_source. And there may be others. If I can find a definitive documented list, I'll forward it... You can use any other name you like, but you should avoid the pre-defined target names that CMake already uses. HTH, David C. -Original Message- From: Ravi Raman ravi.ra...@xoriant.com To: cmake cmake@cmake.org Sent: Wed, Jul 30, 2014 12:35 am Subject: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake Hi all, We have reported an issue. It is regarding conversion of existing Visual Studio .targets files to cmake. The link for the reported issues is as follows. http://www.cmake.org/Bug/view.php?id=15044 Kindly let us know if this can be done in cmake. Thanks Regards Ravi Raman Xoriant Solutions Pvt. Ltd 4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA. Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip Extn:1178| Fax: +91 22 3051 ravi.ra...@xoriant.com| http://www.xoriant.com -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html
Re: [CMake] Ctest and custom measurements
By the way, this should be better documented in the cmake / ctest documentation. And we should be allowed to add measurements like these in the log: Log message - date - DartMeasurement ...0.1/DartMeasurement Do I fill a bug report for this ? YC - Mail original - De: ycollette nospam ycollette.nos...@free.fr À: David Cole dlrd...@aol.com Cc: cmake@cmake.org Envoyé: Mercredi 30 Juillet 2014 13:01:31 Objet: Re: [CMake] Ctest and custom measurements Thanks for the answer. After some trial, I found that I must use DartMeasurement and not NamedMeasurement. I also found that to build a correct measurement, the opening tag must be at the beginning of the line, not in the middle: Log message - date - DartMeasurement ...0.1/DartMeasurement - DOESN'T WORK DartMeasurement ...0.1/DartMeasurement - WORK (I just removed the Log message - date - part) YC - Mail original - De: David Cole dlrd...@aol.com À: ycollette nospam ycollette.nos...@free.fr, cmake@cmake.org Envoyé: Mercredi 30 Juillet 2014 12:48:23 Objet: Re: [CMake] Ctest and custom measurements Unfortunately, I always have to resort to source code analysis to figure this stuff out... NamedMeasurement is only mentioned in the file Source/CTest/cmCTestTestHandler.cxx : http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/CTest/cmCTestTestHandler.cxx;hb=refs/heads/master (search the page for NamedMeasurement, and see the function cmCTestTestHandler::GenerateRegressionImages in particular...) Transform your output (if you can) into using DartMeasurement style XML tags as shown in this post from 4 years ago: http://www.cmake.org/pipermail/cmake/2010-April/036574.html Quoting from that 4-year-old post: To send a number (for example, 42) as a measurement named Simple, try printing output like this on stdout: DartMeasurement name=Simple type=numeric/integer42/DartMeasurement DartMeasurement name=pi type=numeric/double3.14159/DartMeasurement CTest should parse the DartMeasurement tags from the output and generate the NamedMeasurement XML that CDash is expecting. It is a little bit ridiculous to use the legacy format in the output, which ctest recognizes, and then transforms into what CDash needs, but it is what is necessary at the moment. You are trying to send what CDash needs directly, but it gets encoded into the output of the test, rather than recognized like the legacy format One of these days, perhaps an easier way will find its way into the source code. For now, try the legacy technique and let us know if it works out for you. HTH, David C. -Original Message- From: ycollette.nospam ycollette.nos...@free.fr To: cmake cmake@cmake.org Sent: Tue, Jul 29, 2014 10:44 am Subject: [CMake] Ctest and custom measurements Hello, I've got an executable built using cmake. I use ctest to test my executable. Each time the executable is executed, a log file on std::cout is produced. I the log file, I added the following XML tags: NamedMeasurement name=my measure type=numeric/doubleValue0.33/Value/NamedMeasurement I don't see these named measurements in the xml file produced by ctest -D NighlyStart ; ctest -D NighlyTest I use cmake-2.8.12.2 under Fedora 20 64 bits. Is it possible to add custom measurements in the xml file generated by ctest ? Best regards, YC -- 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] adding command line flags for CMAKE_MAKE_PROGRAM
I was trying to get ExternalProjects generated with the Ninja generator to do a
better job of handling multiple CPUs and load, so I tried the naïve solution
below.
I needed to add flags to the program named in CMAKE_MAKE_PROGRAM. This is
difficult because CMAKE_MAKE_PROGRAM is a string; I can pass it as part of an
ExternalProjects’ CMAKE_ARGS, but then the resulting build tries to run
“/usr/bin/ninja –j 32” as the command, instead of adding –j 32 to ninja’s
command line.
Any ideas, or am I asking for a CMAKE_MAKE_PROGRAM_FLAGS command? Or to modify
the generator?
the only alternative is to explicitly set the BUILD_COMMAND for every
ExternalProject_add command.
#--
# For ninja generator, propagate ninja flags
#--
if(CMAKE_GENERATOR MATCHES .*Ninja.*)
if(NOT DEFINED PROCESSOR_COUNT)
# Unknown:
set(PROCESSOR_COUNT 1)
# Linux:
if(CMAKE_SYSTEM_NAME MATCHES .*Linux.*)
set(cpuinfo_file /proc/cpuinfo)
if(EXISTS ${cpuinfo_file})
file(STRINGS ${cpuinfo_file} procs REGEX ^processor.: [0-9]+$)
list(LENGTH procs PROCESSOR_COUNT)
endif()
# Mac:
elseif(APPLE)
find_program(cmd_sys_pro system_profiler)
if(cmd_sys_pro)
execute_process(COMMAND ${cmd_sys_pro} OUTPUT_VARIABLE info)
string(REGEX REPLACE ^.*Total Number Of Cores: ([0-9]+).*$ \\1
PROCESSOR_COUNT ${info})
endif()
# Windows:
elseif(WIN32)
set(PROCESSOR_COUNT $ENV{NUMBER_OF_PROCESSORS})
endif()
endif()
set(CMAKE_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM} -l ${PROCESSOR_COUNT})
endif()
Notice: This UI Health Care e-mail (including attachments) is covered by the
Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential and
may be legally privileged. If you are not the intended recipient, you are
hereby notified that any retention, dissemination, distribution, or copying of
this communication is strictly prohibited. Please reply to the sender that you
have received the message in error, then delete it. 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] ExternalProject: adding command line flags for CMAKE_MAKE_PROGRAM
On 07/30/2014 11:06 AM, Williams, Norman K wrote:
I was trying to get ExternalProjects generated with the Ninja
generator to do a better job of handling multiple CPUs and load,
so I tried the naïve solution below.
For reference in the archives, your previous post about this was here:
CMake, Ninja generator, and ExternalProjects
http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/10543
I needed to add flags to the program named in CMAKE_MAKE_PROGRAM.
The relevant part of the ExternalProject module source is the block
that constructs the default BUILD_COMMAND when not using a Makefile
generator:
# Drive the project with cmake --build.
get_target_property(cmake_command ${name} _EP_CMAKE_COMMAND)
if(cmake_command)
set(cmd ${cmake_command})
else()
set(cmd ${CMAKE_COMMAND})
endif()
set(args --build ${binary_dir} --config ${CMAKE_CFG_INTDIR})
At build time, cmake --build loads the CMAKE_MAKE_PROGRAM from the
CMakeCache.txt of the build tree, at least for the Ninja generator.
When running cmake --build by hand one can specify additional args:
cmake --build . -- $ExtraArgs
Everything after the -- option will be given to the native tool.
Perhaps one could add a special-case here when cmake_generator is
Ninja to extend the cmake --build command with th needed options
to ninja.
the only alternative is to explicitly set the BUILD_COMMAND for
every ExternalProject_add command.
That would also work with existing CMake releases, but would have
to be conditional on the generator in use.
-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
Re: [CMake] Ctest and custom measurements
By the way, this should be better documented in the cmake / ctest documentation. And we should be allowed to add measurements like these in the log: Log message - date - DartMeasurement ...0.1/DartMeasurement I agree on both points. I would go even farther and say what you were trying to do originally should have just worked... Do I fill a bug report for this ? You can. Although it would be more effective if you could contribute a patch to improve the docs, or to implement the code required to improve the DartMeasurement parsing so it's not necessarily at the beginning of the line, or even to accept NamedMeasurement values directly from the output... Are you able to submit patches that do any of this? Do you have the time or the inclination? :-) David C. -- 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] How to find a work arround with CMP0026 policy
Hi,
I'm not able to find a good way to modify my cmake files to consider
CMP0026 policy introduced in cmake 3.0.0.
I have a project that create a library libfoo and FooConfig.cmake file
that allows to use my library as a 3rd party.
In FooConfig.cmake updated during configuration time, I need to set
FOO_LIBRARIES with the full path and name of the library in debug and
release. To get the library names, I use the target location property.
Since cmake 3.0.0 this seems a bad idea.
CMake Warning (dev) at CMakeLists.txt:8 (get_target_property):
Policy CMP0026 is not set: Disallow use of the LOCATION target property.
CMake Warning (dev) at CMakeLists.txt:9 (get_target_property):
Policy CMP0026 is not set: Disallow use of the LOCATION target property.
Here is a small example that reproduces the behavior.
-- Begin CMakeLists.txt --
project(test)
cmake_minimum_required(VERSION 2.6)
add_library(foo foo.cpp)
get_target_property(FOO_LIBNAME_DBG foo LOCATION_Debug)
get_target_property(FOO_LIBNAME_OPT foo LOCATION_Release)
get_filename_component(FOO_LIBNAME_DBG ${FOO_LIBNAME_DBG} NAME)
get_filename_component(FOO_LIBNAME_OPT ${FOO_LIBNAME_OPT} NAME)
configure_file(FooConfig.cmake.in FooConfig.cmake)
-- End CMakeLists.txt --
-- Begin FooConfig.cmake.in --
set(FOO_SOURCE_DIR @CMAKE_SOURCE_DIR@)
set(FOO_LIBNAME_DBG @FOO_LIBNAME_DBG@)
set(FOO_LIBNAME_OPT @FOO_LIBNAME_OPT@)
set(FOO_LIBRARIES debug @CMAKE_INSTALL_PREFIX@/lib/${FOO_LIBNAME_DBG}
optimized @CMAKE_INSTALL_PREFIX@/lib/${FOO_LIBNAME_OPT})
-- End FooConfig.cmake.in --
Adding the following lines in my CMakeLists.txt seems not the best way
to ensure compat with future versions of CMake.
if(POLICY CMP0026)
cmake_policy(SET CMP0026 OLD)
endif()
I tried also to play with add_custom_command() using
$TARGET_PROPERTY:foo,LOCATION_Debug
But I cand find any command that set a variable
Any idea ?
Thanks
Fabien
--
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] Is it possible for a dependee to use the dependency LINKER_FLAGS ?
Hi, Is it possible to attach a property on a target, and that property to be used whenever the target is used ? ex: add_library(A a.cpp) somehow_attach_LINK_FLAGS(A --custom-flags) # in a different directory add_executable(E e.cpp) target_link_libraries(E A) # ^--- this would do something similiar to set_target_properties(E PROPERTIES LINK_FLAGS --custom-flags) For example, to use A:LINK_FLAGS Thanks -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake
To the best of my knowledge, CMake does not do anything with .targets files. It doesn't know what they are, and it doesn't generate any of them... What is the function of the .targets files in your non-CMake build system? Perhaps somebody else who is more familiar with .targets files is listening and can chime in. I'm not sure what to recommend for you. add_custom_target and add_custom_command are commands you can use to organize and execute custom build steps (as opposed to compiling source files as part of an add_library or add_executable) Maybe with the build system you can generate using CMake, you won't even need the .targets files anymore. If you do need them, I'd be curious to learn what it is your .targets file do and why you still need them. HTH, David C. -- 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] Ctest and custom measurements
OK, I will try to make a patch. YC - Mail original - De: David Cole dlrd...@aol.com À: ycollette nospam ycollette.nos...@free.fr Cc: cmake@cmake.org Envoyé: Mercredi 30 Juillet 2014 17:42:07 Objet: Re: [CMake] Ctest and custom measurements By the way, this should be better documented in the cmake / ctest documentation. And we should be allowed to add measurements like these in the log: Log message - date - DartMeasurement ...0.1/DartMeasurement I agree on both points. I would go even farther and say what you were trying to do originally should have just worked... Do I fill a bug report for this ? You can. Although it would be more effective if you could contribute a patch to improve the docs, or to implement the code required to improve the DartMeasurement parsing so it's not necessarily at the beginning of the line, or even to accept NamedMeasurement values directly from the output... Are you able to submit patches that do any of this? Do you have the time or the inclination? :-) David C. -- 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] Variable shadowing between scope, cache and command line argument
Hello, First post here. Sorry if its too long. Simply trying to be as clear as I can be. I am trying to make sense of the various ways to set a variable and how one can shadow the other. Long story short, I am trying to get the following behaviour for a variable in a script: 1 - check if MYVAR exists 1.1 - If it does, test its validity and set a second variable named MYVAR_VALID to TRUE or FALSE 2 - if MYVAR does not exist or if MYVAR_VALID is FALSE, inspect system for information and set MYVAR (with FORCE in the cache) and MYVAR_VALID (not in cache, but does not seem to make a difference). Hope this is written clearly enough to be understood. Sorry, english is not my first language. Anyhow, I get the following behaviour easily except in one case, which is the reason for my question. These are the cases I have tested : - Start with empty cache and call ccmake. Then, MYVAR does not exist. My script inspects the system, sets the value, sets MYVAR_VALID to TRUE and stops. On successive runs, the variable is defined and valid, so the system is not inspected again. Everything is fine. - Start with empty cache. Run it once, but can’t find a valid entry (or find a wrong one somehow, but that’s practically impossible since the code in my script to inspect the system and to test the variable are basically the same. I digress, sorry). Set MYVAR_VALID to FALSE. User can set the value to a valid one and on next run, the script will set MYVAR_VALID to TRUE and then, we are back to variable defined and valid. Everything is fine. - Start with non-empty cache because ccmake (or cmake) is called with -DMYVAR:PATH=/Users/“, for instance. If the value set on command line is fine, then MYVAR_VALID will be set to TRUE on the first run and no system inspection is necessary. The value is now set and valid. Everything is fine. Now, for my problem : - Start with non-empty cache because ccmake (or cmake) is called with -DMYVAR:PATH=/Users/“, for instance. But this time, the value is not a valid one. Then, the variable is defined but not valid. So on the first run, the script will inspect the system. If it can find a valid value, I would like my script to override the variable with the valid one. Then, set to valid and so on and so forth... I have not been able to do this. I can find the correct value, I can set the new value, but it is not used. I mean by that that I have inspected the CMakeCache.txt file and when I call ccmake, the cache contains the value set on the command line. Then, I launch my cmake script and output the values of MYVAR and MYVAR_VALID and they are respectively the one of the command line and FALSE. Then, I find the correct value for MYVAR and try and set it. When I inspect the cache, it seems the value has effectively been overwritten. But when I try to output the new variables, it seems to remain stuck at the value provided on the command line. I have tried using unset( MYVAR ) in scope, in the parent scope and in the CACHE before setting the new value. Still, the old value is outputted. The only way to get the new value is to close ccmake and launch it again. Now if you’re still following (I am sorry, a bit complicated to follow I’m afraid, trying to be thourough), I guess my question is: Is this normal behaviour ? Is there something I am missing or is it simply how CMake works and I should simply tell my users to either initially set the right value or restart their ccmake. I haven’t tested this on Windows with CMake-GUI yet. I might have time to do it a little later. Anyhow, if anybody has the courage to read through my mail and try and help me, thanks a million. Ghyslain -- 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 find a work arround with CMP0026 policy
On 30.07.2014 17:41, Fabien Spindler wrote:
Hi,
I'm not able to find a good way to modify my cmake files to consider
CMP0026 policy introduced in cmake 3.0.0.
I have a project that create a library libfoo and FooConfig.cmake file
that allows to use my library as a 3rd party.
In FooConfig.cmake updated during configuration time, I need to set
FOO_LIBRARIES with the full path and name of the library in debug and
release. To get the library names, I use the target location property.
Since cmake 3.0.0 this seems a bad idea.
CMake Warning (dev) at CMakeLists.txt:8 (get_target_property):
Policy CMP0026 is not set: Disallow use of the LOCATION target property.
CMake Warning (dev) at CMakeLists.txt:9 (get_target_property):
Policy CMP0026 is not set: Disallow use of the LOCATION target property.
Here is a small example that reproduces the behavior.
-- Begin CMakeLists.txt --
project(test)
cmake_minimum_required(VERSION 2.6)
add_library(foo foo.cpp)
get_target_property(FOO_LIBNAME_DBG foo LOCATION_Debug)
get_target_property(FOO_LIBNAME_OPT foo LOCATION_Release)
get_filename_component(FOO_LIBNAME_DBG ${FOO_LIBNAME_DBG} NAME)
get_filename_component(FOO_LIBNAME_OPT ${FOO_LIBNAME_OPT} NAME)
configure_file(FooConfig.cmake.in FooConfig.cmake)
-- End CMakeLists.txt --
-- Begin FooConfig.cmake.in --
set(FOO_SOURCE_DIR @CMAKE_SOURCE_DIR@)
set(FOO_LIBNAME_DBG @FOO_LIBNAME_DBG@)
set(FOO_LIBNAME_OPT @FOO_LIBNAME_OPT@)
set(FOO_LIBRARIES debug @CMAKE_INSTALL_PREFIX@/lib/${FOO_LIBNAME_DBG}
optimized @CMAKE_INSTALL_PREFIX@/lib/${FOO_LIBNAME_OPT})
-- End FooConfig.cmake.in --
Adding the following lines in my CMakeLists.txt seems not the best way
to ensure compat with future versions of CMake.
if(POLICY CMP0026)
cmake_policy(SET CMP0026 OLD)
endif()
I tried also to play with add_custom_command() using
$TARGET_PROPERTY:foo,LOCATION_Debug
But I cand find any command that set a variable
Any idea ?
Thanks
Fabien
You could use file(GENERATE) [1] with the TARGET_FILE (_NAME, _DIR) [2]
generator expressions (one file per configuration).
Or use export() [3] to export your targets for use in your build
directory package configuration file.
You could then add those targets to FOO_LIBRARIES instead of the full paths.
[1] http://www.cmake.org/cmake/help/v3.0/command/file.html
[2]
http://www.cmake.org/cmake/help/v3.0/manual/cmake-generator-expressions.7.html#informational-expressions
[3] http://www.cmake.org/cmake/help/v3.0/command/export.html
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] CMAKE changing Visual Studio Settings
Thanks for all the help on this topic. The user file generation worked like a charm. Really helped out a lot. Thanks to Nils as well for the great advice. This makes my MSVC projects much more manageable. Thanks! On Tue, Jul 22, 2014 at 2:12 PM, Eric Clark ecl...@ara.com wrote: -Original Message- From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of John Drescher Sent: Monday, July 21, 2014 3:55 PM To: Joseph Rosensweig Cc: CMake ML Subject: Re: [CMake] CMAKE changing Visual Studio Settings So CMAKE can't control the options int he *.user files I guess :-\? Would a potential workaround be to find a command line tool that can edit these and run it as a post-build script? CMake gives you the functionality needed to edit these via your own script. I mean reading and writing files replacing text. In our CMake system, we wanted to be able to set the program to execute when Start Debugging was clicked in Visual Studio. This option is stored in the *.user file and thus you cannot change it via CMake directly. However, you CAN build a template of the *.user file and put some CMake variables inside of it. Then, when you build the project files with CMake, you can use the configure_file command to create the user's *.user file from the template and the values you have for each variable in the template. This option works beautifully and it is very easy to setup. Hope this helps... Eric John -- 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] CMAKE changing Visual Studio Settings
No problem at all Joseph! I am glad to hear that you got it working! Thanks - Eric From: anoneiron...@gmail.com [mailto:anoneiron...@gmail.com] On Behalf Of Joseph Rosensweig Sent: Wednesday, July 30, 2014 2:42 PM To: Eric Clark Cc: John Drescher; CMake ML Subject: Re: [CMake] CMAKE changing Visual Studio Settings Thanks for all the help on this topic. The user file generation worked like a charm. Really helped out a lot. Thanks to Nils as well for the great advice. This makes my MSVC projects much more manageable. Thanks! On Tue, Jul 22, 2014 at 2:12 PM, Eric Clark ecl...@ara.com wrote: -Original Message- From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of John Drescher Sent: Monday, July 21, 2014 3:55 PM To: Joseph Rosensweig Cc: CMake ML Subject: Re: [CMake] CMAKE changing Visual Studio Settings So CMAKE can't control the options int he *.user files I guess :-\? Would a potential workaround be to find a command line tool that can edit these and run it as a post-build script? CMake gives you the functionality needed to edit these via your own script. I mean reading and writing files replacing text. In our CMake system, we wanted to be able to set the program to execute when Start Debugging was clicked in Visual Studio. This option is stored in the *.user file and thus you cannot change it via CMake directly. However, you CAN build a template of the *.user file and put some CMake variables inside of it. Then, when you build the project files with CMake, you can use the configure_file command to create the user's *.user file from the template and the values you have for each variable in the template. This option works beautifully and it is very easy to setup. Hope this helps... Eric John -- 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] setup enviroment for all tests
I recently converted my project to configure with cmake, and am now trying to
get the tests to run under ctest. I may be doing this completely incorrectly,
so let me know if anything you see below looks like a bad idea.
All my tests use a particular program to check the output of the tests against
the correct output. The tests output in a particular format, so I have to use
a particular 'diff' program to compare them. This program was not developed by
me, and is not part of the project. So, I wrote a Find.cmake file to find
the program and supply the location.
So, I have the path to the diff program as _BINDIR.
My tests are all driven by a generic script. This script takes a couple of
command line arguments to get the important paths for running the test and
checking the results. Like this:
add_test (test1 ${TEST_SCRIPT_DIR}/test.sh
${PROJECT_BINARY_DIR}/bin/meos ${CMAKE_CURRENT_SOURCE_DIR} test1.input)
If it's not obvious, test.sh is the test script. The first argument is the
path to the binary I'm testing, the second is the directory where both the
input files and expected output files can be found, and the last is the name of
the input for this test.
So, I could pass the path to the 'diff' program as another command line
argument, but that's already beginning to become cumbersome. It's seems more
reasonable just to stick it in the system PATH variable.
I can do that like this:
set_property(TEST test1 PROPERTY ENVIRONMENT PATH=${_BINDIR}:$ENV{PATH})
The only annoying thing is, I have to have that line for EVERY test. I have
lots of tests. I would rather set that path for ALL the tests. But I can't
seem to find a way to do that. This doesn't work:
set_property(GLOBAL PROPERTY ENVIRONMENT PATH=${_BINDIR}:$ENV{PATH})
Is there a way to set up the environment for all the tests in one line?
Thanks,
Jim
--
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] [CPack] rpm and installing scripts and creating folders
hi community,
i need to install init.d script along in my rpm. as I see in spec file
simple:
install(FILES ${CMAKE_SOURCE_DIR}/scripts/${PROJECT_NAME} DESTINATION
/etc/init.d PERMISSIONS
OWNER_WRITE OWNER_READ OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
works fine.
but it adds %config for some unknown reason in spec:
%config /etc/init.d/cacheproxyd
I install my config file similar way:
install(FILES ${CMAKE_SOURCE_DIR}/conf/static.conf DESTINATION conf PERMISSIONS
OWNER_WRITE OWNER_READ OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
but it results differently in spec:
%dir /box/services/cacheproxyd/conf
/box/services/cacheproxyd/conf/static.conf
why is this difference?
also, i want to precreate some folders, like
install(DIRECTORY DESTINATION /var/run/cacheproxyd DIRECTORY_PERMISSIONS
OWNER_WRITE OWNER_READ
GROUP_WRITE GROUP_READ
WORLD_WRITE WORLD_READ WORLD_EXECUTE)
but it also for some unknown reason results as %config:
%config /var/run/cacheproxyd/
i would expect just:
%dir /box/services/cacheproxyd
my cmake is 2.8.12, CentOS
Any insight will be appreciated.
-denis
--
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-4622-gee75b00
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 ee75b00eadb9b6edb840873c6056bc66c70dc3e4 (commit)
via e7511b7fbe09a4007269992edcde2dc98144da47 (commit)
via b234000184bbf314bf0a7380a1d4ebb54f7c8f69 (commit)
from 7d5a57c48614053a182eb46c3badd5886adcb894 (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=ee75b00eadb9b6edb840873c6056bc66c70dc3e4
commit ee75b00eadb9b6edb840873c6056bc66c70dc3e4
Merge: 7d5a57c e7511b7
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 09:14:06 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 09:14:06 2014 -0400
Merge topic 'cpack-ifw-generator' into next
e7511b7f CPackIFW: Add package configuration variables
b2340001 CPackIFW: Document cpack_ifw_configure_component DEPENDS option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7511b7fbe09a4007269992edcde2dc98144da47
commit e7511b7fbe09a4007269992edcde2dc98144da47
Author: Konstantin Podsvirov konstan...@podsvirov.pro
AuthorDate: Tue Jul 29 01:58:37 2014 +0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jul 29 15:55:19 2014 -0400
CPackIFW: Add package configuration variables
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 5b096ad..b27cd69 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -74,6 +74,7 @@ if(EXISTS ${CMAKE_ROOT}/Modules/CPack.cmake)
string(TOUPPER ${_CPACK_IFW_COMPONENT_NAME} _CPACK_IFW_COMPONENT_UNAME)
if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
+set(_CPACK_IFW_PACKAGE_ICON set(CPACK_IFW_PACKAGE_ICON
\${CMake_SOURCE_DIR}/Source/QtDialog/CMakeSetup.ico\))
if(BUILD_QtDialog)
set(_CPACK_IFW_SHORTCUT_OPTIONAL
${_CPACK_IFW_SHORTCUT_OPTIONAL}component.addOperation(\CreateShortcut\,
\@TargetDir@/bin/cmake-gui.exe\, \@StartMenuDir@/CMake
(cmake-gui).lnk\);\n)
endif()
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 135c07d..5127220 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -34,12 +34,17 @@ include(@QT_DIALOG_CPACK_OPTIONS_FILE@ OPTIONAL)
if(CPACK_GENERATOR MATCHES IFW)
# Version with QtIFW limitations
set(CPACK_PACKAGE_VERSION @_CPACK_IFW_PACKAGE_VERSION@)
+ # Installer configuration
+ set(CPACK_IFW_PACKAGE_TITLE CMake Build Tool)
+ set(CPACK_IFW_PRODUCT_URL http://www.cmake.org;)
+ @_CPACK_IFW_PACKAGE_ICON@
+ set(CPACK_IFW_PACKAGE_WINDOW_ICON
@CMake_SOURCE_DIR@/Source/QtDialog/CMakeSetup128.png)
# Enable install default component
set(CPACK_COMPONENTS_ALL @_CPACK_IFW_COMPONENT_NAME@)
- # Configuration
+ # Component configuration
set(CPACK_COMPONENT_@_CPACK_IFW_COMPONENT_UNAME@_DISPLAY_NAME
@CPACK_PACKAGE_NAME@)
set(CPACK_COMPONENT_@_CPACK_IFW_COMPONENT_UNAME@_DESCRIPTION
@CPACK_PACKAGE_DESCRIPTION_SUMMARY@)
- # IFW Configuration
+ # IFW component onfiguration
set(CPACK_IFW_COMPONENT_@_CPACK_IFW_COMPONENT_UNAME@_NAME
@CPACK_PACKAGE_NAME@)
set(CPACK_IFW_COMPONENT_@_CPACK_IFW_COMPONENT_UNAME@_LICENSES
@CPACK_PACKAGE_NAME@ Copyright @CPACK_RESOURCE_FILE_LICENSE@)
@_CPACK_IFW_COMPONENT_SCRIPT@
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 8207b5e..1f6de8f 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -29,8 +29,37 @@
# Variables
# ^
#
-# Variables that Change Behavior
-#
+# You can use the following variables to change behavior of CPack ``IFW``
generator.
+#
+# Package
+#
+#
+# .. variable:: CPACK_IFW_PACKAGE_TITLE
+#
+# Name of the installer as displayed on the title bar.
+# By default used :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
+#
+# .. variable:: CPACK_IFW_PACKAGE_PUBLISHER
+#
+# Publisher of the software (as shown in the Windows Control Panel).
+# By default used :variable:`CPACK_PACKAGE_VENDOR`
+#
+# .. variable:: CPACK_IFW_PRODUCT_URL
+#
+# URL to a page that contains product information on your web site.
+#
+# .. variable:: CPACK_IFW_PACKAGE_ICON
+#
+# Filename for a custom installer icon. The actual file is '.icns' (Mac OS X),
+# '.ico' (Windows). No functionality on Unix.
+#
+# .. variable:: CPACK_IFW_PACKAGE_WINDOW_ICON
+#
+# Filename for a custom window icon in PNG format for the Installer
application.
+#
+# .. variable:: CPACK_IFW_PACKAGE_LOGO
+#
+# Filename for a logo used as QWizard::LogoPixmap.
#
# .. variable:: CPACK_IFW_TARGET_DIRECTORY
#
@@ -45,6 +74,9 @@
#
# You can use predefined variables.
#
+# Components
+#
+#
# .. variable:: CPACK_IFW_RESOLVE_DUPLICATE_NAMES
#
# Resolve duplicate names when installing components with groups.
@@ -54,8 +86,8 @@
# Additional prepared
[Cmake-commits] CMake branch, master, updated. v3.0.0-1573-g128a0c3
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 128a0c36eca74f6faab25342b76266f20c2b10e4 (commit) via 250ad08a085f54c1445369cdf3bf278613c6c0e5 (commit) from 82a1b4fe513ea23c30ec107a1c86bc274de385d9 (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=128a0c36eca74f6faab25342b76266f20c2b10e4 commit 128a0c36eca74f6faab25342b76266f20c2b10e4 Merge: 82a1b4f 250ad08 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:31:50 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 09:31:50 2014 -0400 Merge topic 'remove-link-remnants' 250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants --- Summary of changes: Modules/Platform/Windows-df.cmake |1 - Source/cmNinjaNormalTargetGenerator.cxx |7 +-- 2 files changed, 1 insertion(+), 7 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-1563-g6370c90
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 6370c90f95bfccd3c432919642237d764ce3ea08 (commit) via 56e6975ce98660c86690c5fb97e443402f4885a3 (commit) via 98ea03443bea81188cfe55a885ac64c3ddd93b40 (commit) from 2d4312a160b67f962d28cfe24871c256cd3b53da (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=6370c90f95bfccd3c432919642237d764ce3ea08 commit 6370c90f95bfccd3c432919642237d764ce3ea08 Merge: 2d4312a 56e6975 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:31:47 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 09:31:47 2014 -0400 Merge topic 'ExternalProject-add-lzma' 56e6975c ExternalProject: Recognize lzma-compressed files (#13515) 98ea0344 ExternalProject: Recognize .tbz2 extension --- Summary of changes: Help/release/dev/ExternalProject-add-lzma.rst |5 + Modules/ExternalProject.cmake | 10 +- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 Help/release/dev/ExternalProject-add-lzma.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1560-g2d4312a
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 2d4312a160b67f962d28cfe24871c256cd3b53da (commit)
via f931a18c334bd471c22f7af4e580b2433ba14a69 (commit)
from b801754d1ec8740146ea76047d241b9ff331e069 (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=2d4312a160b67f962d28cfe24871c256cd3b53da
commit 2d4312a160b67f962d28cfe24871c256cd3b53da
Merge: b801754 f931a18
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 09:31:45 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 09:31:45 2014 -0400
Merge topic 'cpack-add-lzma'
f931a18c CPack: add generators for .7z and .tar.xz (#13072, #14519)
---
Summary of changes:
Help/release/dev/cpack-add-lzma.rst |5 +
Source/CMakeLists.txt|2 ++
...mCPackZIPGenerator.cxx = cmCPack7zGenerator.cxx} |9 -
.../{cmCPackZIPGenerator.h = cmCPack7zGenerator.h} | 18 +-
Source/CPack/cmCPackGeneratorFactory.cxx | 12
...CPackTGZGenerator.cxx = cmCPackTXZGenerator.cxx} |9 -
.../{cmCPackTGZGenerator.h = cmCPackTXZGenerator.h} | 18 +-
Source/cmArchiveWrite.cxx| 10 +-
Source/cmArchiveWrite.h |3 ++-
9 files changed, 56 insertions(+), 30 deletions(-)
create mode 100644 Help/release/dev/cpack-add-lzma.rst
copy Source/CPack/{cmCPackZIPGenerator.cxx = cmCPack7zGenerator.cxx} (81%)
copy Source/CPack/{cmCPackZIPGenerator.h = cmCPack7zGenerator.h} (63%)
copy Source/CPack/{cmCPackTGZGenerator.cxx = cmCPackTXZGenerator.cxx} (81%)
copy Source/CPack/{cmCPackTGZGenerator.h = cmCPackTXZGenerator.h} (63%)
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-1571-g82a1b4f
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 82a1b4fe513ea23c30ec107a1c86bc274de385d9 (commit) via 0ac28adc01c68bb9c11a34af122bac0071733965 (commit) via 58bb14d4ac64686923d69bf515e8700f095c4ff5 (commit) via 972cf1d7afd1476c550ca0503d75ec93bd764124 (commit) via 15fb102278c1cf9141e42174d89bbfe5ef26f634 (commit) via c2ef6d238a5e30234756a38943436e326b986b58 (commit) via 2df389115e7636756cd1f1d6c422651b4899522d (commit) via 143b40051a71c2f53e487be69069f1932ccc25d1 (commit) from 6370c90f95bfccd3c432919642237d764ce3ea08 (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=82a1b4fe513ea23c30ec107a1c86bc274de385d9 commit 82a1b4fe513ea23c30ec107a1c86bc274de385d9 Merge: 6370c90 0ac28ad Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:31:49 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 09:31:49 2014 -0400 Merge topic 'vs-refactor-source-tools' 0ac28adc VS: Map .jpg and .png sources to Image tool 58bb14d4 VS: Map .xml to XML tool 972cf1d7 VS: Map .appxmanifest sources to AppxManifest tool 15fb1022 VS: Refactor handling of resx headers c2ef6d23 VS: Refactor handling of header sources in VS = 10 2df38911 VS: Refactor handling of extra sources in VS = 10 143b4005 VS: Convert 'WriteSource' tool argument to std::string --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 69 Source/cmVisualStudio10TargetGenerator.h |6 ++- 2 files changed, 54 insertions(+), 21 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-4632-g5f7bbf3
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 5f7bbf3f6a0a444093de69eb8ededcd2ad43c666 (commit) via 8d1306cd1b2ab7af0360387bfbdd9beff29b480c (commit) via 931bd59e68b386e6002c37dd1673964a255eca31 (commit) via cfd71996608c86b907fafb1f23b6e4abfaad8d96 (commit) from ca6e626fde52e83d8dc1cd3782a8df890f664227 (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=5f7bbf3f6a0a444093de69eb8ededcd2ad43c666 commit 5f7bbf3f6a0a444093de69eb8ededcd2ad43c666 Merge: ca6e626 8d1306c Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:42:45 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 09:42:45 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-1576-g8d1306c
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 8d1306cd1b2ab7af0360387bfbdd9beff29b480c (commit) via 931bd59e68b386e6002c37dd1673964a255eca31 (commit) via cfd71996608c86b907fafb1f23b6e4abfaad8d96 (commit) from 128a0c36eca74f6faab25342b76266f20c2b10e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.0.0-27-g931bd59
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 931bd59e68b386e6002c37dd1673964a255eca31 (commit) via cfd71996608c86b907fafb1f23b6e4abfaad8d96 (commit) via 608cf8149ccbf8954926ab7c86fd658099a52f7b (commit) via 4b5052b0cd37e8896966ee2ce3040e1a8ded64e4 (commit) from ce7a5ca895d0669b33d213c6fc94f484611d6e24 (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/FindQt4.cmake |6 +++--- Source/cmGlobalXCodeGenerator.cxx | 28 +++- Source/cmGlobalXCodeGenerator.h |1 + 3 files changed, 27 insertions(+), 8 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4628-gca6e626
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 ca6e626fde52e83d8dc1cd3782a8df890f664227 (commit) via 128a0c36eca74f6faab25342b76266f20c2b10e4 (commit) via 82a1b4fe513ea23c30ec107a1c86bc274de385d9 (commit) via 6370c90f95bfccd3c432919642237d764ce3ea08 (commit) via 2d4312a160b67f962d28cfe24871c256cd3b53da (commit) via b801754d1ec8740146ea76047d241b9ff331e069 (commit) from ee75b00eadb9b6edb840873c6056bc66c70dc3e4 (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=ca6e626fde52e83d8dc1cd3782a8df890f664227 commit ca6e626fde52e83d8dc1cd3782a8df890f664227 Merge: ee75b00 128a0c3 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:35:07 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 09:35:07 2014 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4635-g00fafe4
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 00fafe4493dc3a2226e76fa502e93991440151b8 (commit) via ab3cec67a4daff8e0955a848798b059ea09ca63d (commit) via 8a94cef7048004fab0a28eb850dd1e3dc76a6d2d (commit) from 5f7bbf3f6a0a444093de69eb8ededcd2ad43c666 (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=00fafe4493dc3a2226e76fa502e93991440151b8 commit 00fafe4493dc3a2226e76fa502e93991440151b8 Merge: 5f7bbf3 ab3cec6 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:53:15 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 09:53:15 2014 -0400 Merge topic 'test-release' into next ab3cec67 Merge branch 'release' into test-release 8a94cef7 CMake 3.0.1 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab3cec67a4daff8e0955a848798b059ea09ca63d commit ab3cec67a4daff8e0955a848798b059ea09ca63d Merge: 8d1306c 8a94cef Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:54:11 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 09:54:11 2014 -0400 Merge branch 'release' into test-release http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a94cef7048004fab0a28eb850dd1e3dc76a6d2d commit 8a94cef7048004fab0a28eb850dd1e3dc76a6d2d Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 09:47:32 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 09:47:32 2014 -0400 CMake 3.0.1 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1937ad4..4caa608 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 0) +set(CMake_VERSION_PATCH 1) #set(CMake_VERSION_RC 0) --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4637-g5902f23
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 5902f23edabbf41b8bed31c2e9927d2c7c33c2ef (commit)
via d38b9f3e3e7708895ed8ddc2eea208eb5bc4dd34 (commit)
from 00fafe4493dc3a2226e76fa502e93991440151b8 (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=5902f23edabbf41b8bed31c2e9927d2c7c33c2ef
commit 5902f23edabbf41b8bed31c2e9927d2c7c33c2ef
Merge: 00fafe4 d38b9f3
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 10:17:36 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 10:17:36 2014 -0400
Merge topic 'pdb-genex' into next
d38b9f3e Tests/RunCMake: On Windows both MSVC and Intel support PDB
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d38b9f3e3e7708895ed8ddc2eea208eb5bc4dd34
commit d38b9f3e3e7708895ed8ddc2eea208eb5bc4dd34
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 10:04:24 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 30 10:04:24 2014 -0400
Tests/RunCMake: On Windows both MSVC and Intel support PDB
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2375ba6..772378e 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -21,7 +21,7 @@ if(XCODE_VERSION AND ${XCODE_VERSION} VERSION_LESS 2)
set(File_Generate_ARGS -DXCODE_BELOW_2=1)
endif()
-if(MSVC)
+if(WIN32 AND CMAKE_C_COMPILER_ID MATCHES MSVC|Intel)
set(GeneratorExpression_ARGS -DLINKER_SUPPORTS_PDB=1)
endif()
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |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-4639-g2a78767
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 2a78767e5e25fea144b70a4c611faaf160452da0 (commit)
via 9fd04f874c0a046736436b53b9a049a29b536165 (commit)
from 5902f23edabbf41b8bed31c2e9927d2c7c33c2ef (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=2a78767e5e25fea144b70a4c611faaf160452da0
commit 2a78767e5e25fea144b70a4c611faaf160452da0
Merge: 5902f23 9fd04f8
Author: Joe Snyder joe.sny...@kitware.com
AuthorDate: Wed Jul 30 11:26:29 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 11:26:29 2014 -0400
Merge topic 'update_jacoco_search_paths' into next
9fd04f87 CTEST: Update Jacoco Coverage search paths
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fd04f874c0a046736436b53b9a049a29b536165
commit 9fd04f874c0a046736436b53b9a049a29b536165
Author: Joseph Snyder joe.sny...@kitware.com
AuthorDate: Wed Jul 30 10:26:56 2014 -0400
Commit: Joseph Snyder joe.sny...@kitware.com
CommitDate: Wed Jul 30 11:22:55 2014 -0400
CTEST: Update Jacoco Coverage search paths
Add a new additional entry to the FilePaths array when a
package tag has been found. This path should consist of the package
information found appended to the projects source directory.
This change will allow code held in a /src/main/java/* directory off of the
projects source directory to be found, unlike now which assumes a
subdirectory
contains the code.
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx
b/Source/CTest/cmParseJacocoCoverage.cxx
index 4723dd3..f270adb 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -42,6 +42,9 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
/ + this-ModuleName + /src/main/java/ +
this-PackageName;
this-FilePaths.push_back(FilePath);
+FilePath = this-Coverage.SourceDir +
+ /src/main/java/ + this-PackageName;
+this-FilePaths.push_back(FilePath);
}
else if(name == sourcefile)
{
---
Summary of changes:
Source/CTest/cmParseJacocoCoverage.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, next, updated. v3.0.0-4643-g93cb9ad
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 93cb9ad1d12e5d2b5ce64dda69eac7abf12506ca (commit) via ccec6df85f604429a905d664d8a6e8c9e0d835e1 (commit) from 0f95e197ce91094440411992424ce2052d468dcc (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=93cb9ad1d12e5d2b5ce64dda69eac7abf12506ca commit 93cb9ad1d12e5d2b5ce64dda69eac7abf12506ca Merge: 0f95e19 ccec6df Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 11:40:14 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 11:40:14 2014 -0400 Merge topic 'link-line-dedup' into next ccec6df8 Help: Add notes for topic 'link-line-dedup' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccec6df85f604429a905d664d8a6e8c9e0d835e1 commit ccec6df85f604429a905d664d8a6e8c9e0d835e1 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 11:41:05 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 11:41:05 2014 -0400 Help: Add notes for topic 'link-line-dedup' diff --git a/Help/release/dev/link-line-dedup.rst b/Help/release/dev/link-line-dedup.rst new file mode 100644 index 000..6ce31e3 --- /dev/null +++ b/Help/release/dev/link-line-dedup.rst @@ -0,0 +1,5 @@ +link-line-dedup +--- + +* When generating linker command-lines, CMake now avoids repeating + items corresponding to SHARED library targets. --- Summary of changes: Help/release/dev/link-line-dedup.rst |5 + 1 file changed, 5 insertions(+) create mode 100644 Help/release/dev/link-line-dedup.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4645-g886d33e
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 886d33ef24971c5cbb8934f6c180ea5b3c037f3b (commit)
via 8669a33ee8f445598b177a079989e5bd2b3ea224 (commit)
from 93cb9ad1d12e5d2b5ce64dda69eac7abf12506ca (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=886d33ef24971c5cbb8934f6c180ea5b3c037f3b
commit 886d33ef24971c5cbb8934f6c180ea5b3c037f3b
Merge: 93cb9ad 8669a33
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 13:45:20 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 13:45:20 2014 -0400
Merge topic 'fix-CMP0049-extra-error' into next
8669a33e cmTarget: Do not mistake a preceding error for a CMP0049 failure
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8669a33ee8f445598b177a079989e5bd2b3ea224
commit 8669a33ee8f445598b177a079989e5bd2b3ea224
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 13:39:27 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 30 13:40:10 2014 -0400
cmTarget: Do not mistake a preceding error for a CMP0049 failure
After calls to ProcessSourceItemCMP0049, check for an empty return
string to detect a failure instead of trusting GetErrorOccuredFlag.
The latter could have been left from a preceding non-fatal error.
Extend the RunCMake.Configure test to cover a case that exposed this
problem.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ca24d2d..acae0b3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -927,10 +927,13 @@ void cmTarget::AddSources(std::vectorstd::string const
srcs)
if(!(src[0] == '$' src[1] == ''))
{
- filename = this-ProcessSourceItemCMP0049(filename);
- if (cmSystemTools::GetErrorOccuredFlag())
+ if(!filename.empty())
{
-return;
+filename = this-ProcessSourceItemCMP0049(filename);
+if(filename.empty())
+ {
+ return;
+ }
}
this-Makefile-GetOrCreateSource(filename);
}
@@ -998,8 +1001,7 @@ std::string cmTarget::ProcessSourceItemCMP0049(const
std::string s)
cmSourceFile* cmTarget::AddSourceCMP0049(const std::string s)
{
std::string src = this-ProcessSourceItemCMP0049(s);
-
- if (cmSystemTools::GetErrorOccuredFlag())
+ if(!s.empty() src.empty())
{
return 0;
}
diff --git a/Tests/RunCMake/Configure/CustomTargetAfterError-result.txt
b/Tests/RunCMake/Configure/CustomTargetAfterError-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Configure/CustomTargetAfterError-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt
b/Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt
new file mode 100644
index 000..7ce7daf
--- /dev/null
+++ b/Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt
@@ -0,0 +1,9 @@
+^CMake Error at CustomTargetAfterError.cmake:1 \(message\):
+ Error before add_custom_target
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
++
+CMake Error at CustomTargetAfterError.cmake:3 \(message\):
+ Error after add_custom_target
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Configure/CustomTargetAfterError.cmake
b/Tests/RunCMake/Configure/CustomTargetAfterError.cmake
new file mode 100644
index 000..3e26455
--- /dev/null
+++ b/Tests/RunCMake/Configure/CustomTargetAfterError.cmake
@@ -0,0 +1,3 @@
+message(SEND_ERROR Error before add_custom_target)
+add_custom_target(foo COMMAND echo)
+message(SEND_ERROR Error after add_custom_target)
diff --git a/Tests/RunCMake/Configure/RunCMakeTest.cmake
b/Tests/RunCMake/Configure/RunCMakeTest.cmake
index 5ef0384..1628d82 100644
--- a/Tests/RunCMake/Configure/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Configure/RunCMakeTest.cmake
@@ -2,6 +2,7 @@ include(RunCMake)
run_cmake(ErrorLogs)
run_cmake(FailCopyFileABI)
+run_cmake(CustomTargetAfterError)
# Use a single build tree for a few tests without cleaning.
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/RerunCMake-build)
---
Summary of changes:
Source/cmTarget.cxx| 12 +++-
.../CustomTargetAfterError-result.txt} |0
Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt |9 +
Tests/RunCMake/Configure/CustomTargetAfterError.cmake |3 +++
Tests/RunCMake/Configure/RunCMakeTest.cmake|1 +
5 files changed, 20
[Cmake-commits] CMake branch, next, updated. v3.0.0-4647-g735af7a
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 735af7aad76fca25251b0ed41d4d36c5c0d3af2a (commit)
via ab44c8c316308e0da3eb73876ed0271722d6afdc (commit)
from 886d33ef24971c5cbb8934f6c180ea5b3c037f3b (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=735af7aad76fca25251b0ed41d4d36c5c0d3af2a
commit 735af7aad76fca25251b0ed41d4d36c5c0d3af2a
Merge: 886d33e ab44c8c
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 13:47:03 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 13:47:03 2014 -0400
Merge topic 'fix-CMP0049-extra-error' into next
ab44c8c3 Tests/RunCMake/Configure: Order tests alphabetically
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab44c8c316308e0da3eb73876ed0271722d6afdc
commit ab44c8c316308e0da3eb73876ed0271722d6afdc
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 13:48:19 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 30 13:48:19 2014 -0400
Tests/RunCMake/Configure: Order tests alphabetically
diff --git a/Tests/RunCMake/Configure/RunCMakeTest.cmake
b/Tests/RunCMake/Configure/RunCMakeTest.cmake
index 1628d82..58e1a2a 100644
--- a/Tests/RunCMake/Configure/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Configure/RunCMakeTest.cmake
@@ -1,8 +1,8 @@
include(RunCMake)
+run_cmake(CustomTargetAfterError)
run_cmake(ErrorLogs)
run_cmake(FailCopyFileABI)
-run_cmake(CustomTargetAfterError)
# Use a single build tree for a few tests without cleaning.
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/RerunCMake-build)
---
Summary of changes:
Tests/RunCMake/Configure/RunCMakeTest.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4649-g8d02eeb
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 8d02eebed87f7fab1d1c10aa180a76e995cee028 (commit)
via b2282631f61361fe5f103fa7479073f2693eafcb (commit)
from 735af7aad76fca25251b0ed41d4d36c5c0d3af2a (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=8d02eebed87f7fab1d1c10aa180a76e995cee028
commit 8d02eebed87f7fab1d1c10aa180a76e995cee028
Merge: 735af7a b228263
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 13:47:18 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 13:47:18 2014 -0400
Merge topic 'fix-CMP0049-extra-error' into next
b2282631 cmTarget: Do not mistake a preceding error for a CMP0049 failure
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2282631f61361fe5f103fa7479073f2693eafcb
commit b2282631f61361fe5f103fa7479073f2693eafcb
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 13:39:27 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 30 13:48:33 2014 -0400
cmTarget: Do not mistake a preceding error for a CMP0049 failure
After calls to ProcessSourceItemCMP0049, check for an empty return
string to detect a failure instead of trusting GetErrorOccuredFlag.
The latter could have been left from a preceding non-fatal error.
Extend the RunCMake.Configure test to cover a case that exposed this
problem.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ca24d2d..acae0b3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -927,10 +927,13 @@ void cmTarget::AddSources(std::vectorstd::string const
srcs)
if(!(src[0] == '$' src[1] == ''))
{
- filename = this-ProcessSourceItemCMP0049(filename);
- if (cmSystemTools::GetErrorOccuredFlag())
+ if(!filename.empty())
{
-return;
+filename = this-ProcessSourceItemCMP0049(filename);
+if(filename.empty())
+ {
+ return;
+ }
}
this-Makefile-GetOrCreateSource(filename);
}
@@ -998,8 +1001,7 @@ std::string cmTarget::ProcessSourceItemCMP0049(const
std::string s)
cmSourceFile* cmTarget::AddSourceCMP0049(const std::string s)
{
std::string src = this-ProcessSourceItemCMP0049(s);
-
- if (cmSystemTools::GetErrorOccuredFlag())
+ if(!s.empty() src.empty())
{
return 0;
}
diff --git a/Tests/RunCMake/Configure/CustomTargetAfterError-result.txt
b/Tests/RunCMake/Configure/CustomTargetAfterError-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Configure/CustomTargetAfterError-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt
b/Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt
new file mode 100644
index 000..7ce7daf
--- /dev/null
+++ b/Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt
@@ -0,0 +1,9 @@
+^CMake Error at CustomTargetAfterError.cmake:1 \(message\):
+ Error before add_custom_target
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
++
+CMake Error at CustomTargetAfterError.cmake:3 \(message\):
+ Error after add_custom_target
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Configure/CustomTargetAfterError.cmake
b/Tests/RunCMake/Configure/CustomTargetAfterError.cmake
new file mode 100644
index 000..3e26455
--- /dev/null
+++ b/Tests/RunCMake/Configure/CustomTargetAfterError.cmake
@@ -0,0 +1,3 @@
+message(SEND_ERROR Error before add_custom_target)
+add_custom_target(foo COMMAND echo)
+message(SEND_ERROR Error after add_custom_target)
diff --git a/Tests/RunCMake/Configure/RunCMakeTest.cmake
b/Tests/RunCMake/Configure/RunCMakeTest.cmake
index 5ef0384..58e1a2a 100644
--- a/Tests/RunCMake/Configure/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Configure/RunCMakeTest.cmake
@@ -1,5 +1,6 @@
include(RunCMake)
+run_cmake(CustomTargetAfterError)
run_cmake(ErrorLogs)
run_cmake(FailCopyFileABI)
---
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-4651-g51cedfa
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 51cedfa05f875d31ba4abd362ea1c00e68e09e54 (commit)
via 693c4471e0728f246e96524b844d4c018674f91f (commit)
from 8d02eebed87f7fab1d1c10aa180a76e995cee028 (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=51cedfa05f875d31ba4abd362ea1c00e68e09e54
commit 51cedfa05f875d31ba4abd362ea1c00e68e09e54
Merge: 8d02eeb 693c447
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 14:32:46 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 30 14:32:46 2014 -0400
Merge topic 'pdb-genex' into next
693c4471 Tests/RunCMake: No VS CMAKE_C_COMPILER_ID in older CMake versions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=693c4471e0728f246e96524b844d4c018674f91f
commit 693c4471e0728f246e96524b844d4c018674f91f
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 30 14:32:32 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 30 14:33:57 2014 -0400
Tests/RunCMake: No VS CMAKE_C_COMPILER_ID in older CMake versions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 772378e..b6e392b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -21,7 +21,9 @@ if(XCODE_VERSION AND ${XCODE_VERSION} VERSION_LESS 2)
set(File_Generate_ARGS -DXCODE_BELOW_2=1)
endif()
-if(WIN32 AND CMAKE_C_COMPILER_ID MATCHES MSVC|Intel)
+# Test MSVC for older host CMake versions, and test
+# WIN32/CMAKE_C_COMPILER_ID to fix check on Intel for Windows.
+if(MSVC OR WIN32 AND CMAKE_C_COMPILER_ID MATCHES MSVC|Intel)
set(GeneratorExpression_ARGS -DLINKER_SUPPORTS_PDB=1)
endif()
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |4 +++-
1 file 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-4653-gea27d5a
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 ea27d5ac34e10842b04cb8533d6688f93e736b9d (commit) via cac91206b3193823d0b8ca3fdb620f7ac32f8a32 (commit) from 51cedfa05f875d31ba4abd362ea1c00e68e09e54 (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=ea27d5ac34e10842b04cb8533d6688f93e736b9d commit ea27d5ac34e10842b04cb8533d6688f93e736b9d Merge: 51cedfa cac9120 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 15:23:08 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 15:23:08 2014 -0400 Merge topic 'check-flag-avoid-semicolon' into next cac91206 Check*CompilerFlag: Avoid ';' in common pattern (#15048) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cac91206b3193823d0b8ca3fdb620f7ac32f8a32 commit cac91206b3193823d0b8ca3fdb620f7ac32f8a32 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 15:19:48 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 15:21:44 2014 -0400 Check*CompilerFlag: Avoid ';' in common pattern (#15048) In commit v3.0.0-rc1~551^2~1 (Check*CompilerFlag: make C and CXX modules share most error patterns, 2013-08-08) a pattern containing a ';' was moved out of a -quoted argument and into a variable. CMake flattens the containing list and breaks the pattern. Use a '.' to match ';'. diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake index 9d8ba9e..abbcda4 100644 --- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake +++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake @@ -32,7 +32,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR) FAIL_REGEX [Ww]arning: [Oo]ption # SunPro FAIL_REGEX command option .* is not recognized # XL FAIL_REGEX command option .* contains an incorrect subargument # XL - FAIL_REGEX not supported in this configuration; ignored # AIX + FAIL_REGEX not supported in this configuration. ignored # AIX FAIL_REGEX File with unknown suffix passed to linker # PGI FAIL_REGEX WARNING: unknown flag:# Open64 FAIL_REGEX Incorrect command line option:# Borland --- Summary of changes: Modules/CMakeCheckCompilerFlagCommonPatterns.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4655-gf41d04e
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 f41d04eceea40e9f35802338a5e0e129c31a83a8 (commit) via 9d93e099e65a01dd9c2e4c560c334dd4f09e2b63 (commit) from ea27d5ac34e10842b04cb8533d6688f93e736b9d (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=f41d04eceea40e9f35802338a5e0e129c31a83a8 commit f41d04eceea40e9f35802338a5e0e129c31a83a8 Merge: ea27d5a 9d93e09 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 15:57:05 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 15:57:05 2014 -0400 Merge topic 'cpack-add-lzma-package-options' into next 9d93e099 CPack: Add lzma-compressed package options http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d93e099e65a01dd9c2e4c560c334dd4f09e2b63 commit 9d93e099e65a01dd9c2e4c560c334dd4f09e2b63 Author: Daniel Pfeifer dan...@pfeifer-mail.de AuthorDate: Wed Jul 30 21:42:56 2014 +0200 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 15:56:34 2014 -0400 CPack: Add lzma-compressed package options Add options to package binary and source tarballs: CPACK_BINARY_7Z CPACK_BINARY_TXZ CPACK_SOURCE_7Z CPACK_SOURCE_TXZ diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index b58f944..8b07cea 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -426,6 +426,7 @@ if(NOT CPACK_GENERATOR) option(CPACK_BINARY_STGZ Enable to build STGZ packagesON) option(CPACK_BINARY_TGZ Enable to build TGZ packages ON) option(CPACK_BINARY_TBZ2 Enable to build TBZ2 packagesOFF) + option(CPACK_BINARY_TXZ Enable to build TXZ packages OFF) option(CPACK_BINARY_DEB Enable to build Debian packages OFF) option(CPACK_BINARY_RPM Enable to build RPM packages OFF) option(CPACK_BINARY_NSIS Enable to build NSIS packagesOFF) @@ -434,6 +435,7 @@ if(NOT CPACK_GENERATOR) option(CPACK_BINARY_NSIS Enable to build NSIS packages ON) option(CPACK_BINARY_WIX Enable to build WiX packages OFF) option(CPACK_BINARY_ZIP Enable to build ZIP packages OFF) +option(CPACK_BINARY_7Z Enable to build 7-Zip packages OFF) endif() option(CPACK_BINARY_IFW Enable to build IFW packages OFF) @@ -448,10 +450,12 @@ if(NOT CPACK_GENERATOR) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_STGZ STGZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TGZ TGZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TBZ2 TBZ2) + cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TXZ TXZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TZ TZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_WIX WIX) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_ZIP ZIP) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_IFW IFW) + cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_7Z 7Z) endif() @@ -463,26 +467,32 @@ if(NOT CPACK_SOURCE_GENERATOR) else() option(CPACK_SOURCE_TBZ2 Enable to build TBZ2 source packages ON) option(CPACK_SOURCE_TGZ Enable to build TGZ source packages ON) + option(CPACK_SOURCE_TXZ Enable to build TXZ source packages ON) option(CPACK_SOURCE_TZ Enable to build TZ source packages ON) option(CPACK_SOURCE_ZIP Enable to build ZIP source packages OFF) endif() else() option(CPACK_SOURCE_ZIP Enable to build ZIP source packages ON) +option(CPACK_SOURCE_7Z Enable to build 7-Zip source packages ON) endif() cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_CYGWIN CygwinSource) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TGZ TGZ) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TBZ2TBZ2) + cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TXZ TXZ) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TZ TZ) cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_ZIP ZIP) + cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_7Z 7Z) endif() # mark the above options as advanced mark_as_advanced(CPACK_BINARY_CYGWIN CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_OSXX11 CPACK_BINARY_STGZ CPACK_BINARY_TGZ CPACK_BINARY_TBZ2 CPACK_BINARY_DEBCPACK_BINARY_RPM CPACK_BINARY_TZ + CPACK_BINARY_TXZCPACK_BINARY_7Z CPACK_BINARY_NSIS CPACK_BINARY_WIX CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE CPACK_SOURCE_CYGWIN
[Cmake-commits] CMake branch, next, updated. v3.0.0-4657-g801dfae
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 801dfae43d0f419a0d4015e34ebd1b52710f9c35 (commit) via 5cabc2cd4352f37aae023ba584c15353f6a8ea95 (commit) from f41d04eceea40e9f35802338a5e0e129c31a83a8 (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=801dfae43d0f419a0d4015e34ebd1b52710f9c35 commit 801dfae43d0f419a0d4015e34ebd1b52710f9c35 Merge: f41d04e 5cabc2c Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 15:59:20 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 15:59:20 2014 -0400 Merge topic 'cpack-mark-ifw-advanced' into next 5cabc2cd CPack: Mark CPACK_BINARY_IFW option as advanced http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cabc2cd4352f37aae023ba584c15353f6a8ea95 commit 5cabc2cd4352f37aae023ba584c15353f6a8ea95 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 15:59:36 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 16:00:06 2014 -0400 CPack: Mark CPACK_BINARY_IFW option as advanced All similar options are already marked. Suggested-by: Daniel Pfeifer dan...@pfeifer-mail.de diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 8b07cea..d9e1694 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -491,6 +491,7 @@ mark_as_advanced(CPACK_BINARY_CYGWIN CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_OSXX CPACK_BINARY_DEBCPACK_BINARY_RPM CPACK_BINARY_TZ CPACK_BINARY_TXZCPACK_BINARY_7Z CPACK_BINARY_NSIS CPACK_BINARY_WIX CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE + CPACK_BINARY_IFW CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ CPACK_SOURCE_TXZCPACK_SOURCE_7Z CPACK_SOURCE_TZ CPACK_SOURCE_ZIP CPACK_BINARY_DRAGNDROP) --- Summary of changes: Modules/CPack.cmake |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4659-g65800e9
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 65800e99476e54d6cec2151f6873a56676821698 (commit) via b0431b961a41ad0af05ab5afd911967ad23bfcae (commit) from 801dfae43d0f419a0d4015e34ebd1b52710f9c35 (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=65800e99476e54d6cec2151f6873a56676821698 commit 65800e99476e54d6cec2151f6873a56676821698 Merge: 801dfae b0431b9 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 16:12:02 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 30 16:12:02 2014 -0400 Merge topic 'pdb-genex' into next b0431b96 Tests/RunCMake: Fix condition precedence http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0431b961a41ad0af05ab5afd911967ad23bfcae commit b0431b961a41ad0af05ab5afd911967ad23bfcae Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 30 16:12:52 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 30 16:12:52 2014 -0400 Tests/RunCMake: Fix condition precedence diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index b6e392b..3cd9947 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -23,7 +23,7 @@ endif() # Test MSVC for older host CMake versions, and test # WIN32/CMAKE_C_COMPILER_ID to fix check on Intel for Windows. -if(MSVC OR WIN32 AND CMAKE_C_COMPILER_ID MATCHES MSVC|Intel) +if(MSVC OR (WIN32 AND CMAKE_C_COMPILER_ID MATCHES MSVC|Intel)) set(GeneratorExpression_ARGS -DLINKER_SUPPORTS_PDB=1) endif() --- Summary of changes: Tests/RunCMake/CMakeLists.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1577-g202b7d1
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 202b7d12eb0609f1a2dd7f587c0ed17d45bec1c5 (commit) from 8d1306cd1b2ab7af0360387bfbdd9beff29b480c (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=202b7d12eb0609f1a2dd7f587c0ed17d45bec1c5 commit 202b7d12eb0609f1a2dd7f587c0ed17d45bec1c5 Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Jul 31 00:01:24 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Jul 31 00:01:24 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1208b8a..ea892aa 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 20140730) +set(CMake_VERSION_PATCH 20140731) #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
