Re: [cmake-developers] cmake_cxx_link_executable issue
On 06/24/2014 09:15 AM, Piotr Bialek wrote: This might have been more appropriate for the user's mailing list since it does not involve development of CMake itself. I'm trying to cross compile with clang. I set cmake_compiler, cmake_linker, etc. During the linking CXX executable all flags, libs, files, etc. are getting from somehow created file ./Main/CMakeFiles/Build.dir/link.txt. The problem is, that when I change linker by setting CMAKE_CXX_LINK_EXECUTABLE, no files or flags are generated in link.txt and I get message like: x86_64-pc-linux-gnu-ld: no input files. The CMAKE_CXX_LINK_EXECUTABLE variable does not refer to the linker executable. It contains the rule used to link executables: http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_LANG_LINK_EXECUTABLE.html You shouldn't have to modify it. For a link CMake calls the compiler (and the compiler invokes the linker). To set the compiler you can use: http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_LANG_COMPILER.html Or the CC and CXX environment variables. The compilers have to be set on the initial CMake run. For a native build with clang on GNU/Linux this can be as simple as e.g.: CC=clang CXX=clang++ cmake [...] Nils -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 4/5] FindGLUT.cmake: Add imported targets and documentation
On 06/10/2014 05:55 AM, Philipp Möller wrote: The APPLE part works, but definitely could be improved upon. [snip] +if(APPLE) + # Using the hardcoded paths is certainly not the best thing to + # do, but it is done the include path already. + set_target_properties(GLUT::GLUT PROPERTIES +IMPORTED_LOCATION /System/Library/Frameworks/GLUT.framework/GLUT) + if(NOT TARGET GLUT::Cocoa) +add_library(GLUT::Cocoa UNKNOWN IMPORTED) +set_target_properties(GLUT::Cocoa PROPERTIES + IMPORTED_LOCATION /System/Library/Frameworks/Cocoa.framework/Cocoa) + endif() + set_target_properties(GLUT::GLUT PROPERTIES +INTERFACE_LINK_LIBRARIES GLUT::Cocoa) +else() The path to the framework is hard-coded for the include path only as a possible search location, not as a result. The above code hard-codes it as a result. FindGLUT is one of the only modules left that hard-codes -framework XYZ as a result on OS X instead of allowing find_library to locate the framework. That needs to be fixed first, and then the framework path can be handled here the same way as it is in FindOpenGL. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 5/5] FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation
On 06/20/2014 01:09 PM, Philipp Möller wrote: +# Boost::boost - interface target containing the include +# directory Nice. + if(Boost_USE_STATIC_LIBS) +add_library(Boost::${COMPONENT} STATIC IMPORTED) + else() +add_library(Boost::${COMPONENT} SHARED IMPORTED) + endif() IIRC, Boost_USE_STATIC_LIBS asks for static libraries, but when it is OFF we might still get static libraries. Therefore the else() case still needs to mark it as UNKNOWN. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 0/5] IMPORTED targets for some Find modules
On 06/20/2014 05:00 PM, Philipp Möller wrote: To simplify exporting targets I added IMPORTED targets to some of the Find modules. Thanks! I've applied the first three: FindZLIB: Add imported target and documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a7ff421 FindGLEW: Add imported target and documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d82a223 FindX11: fix documentation formatting error http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c90c7fca I will respond to the individual patch messages for the other two. Unfortunately targets behave differently than variables and can give different results when multiple find_package calls with different hints or options are made. That is not really supported anyway because we have only one CMakeCache.txt so there is only one FOO_LIBRARY variable. A project can achieve it with careful handling and typically by keeping the find_package calls in separate directories where imported targets are scoped apart anyway. -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] Weird build error against libc++ on OS X 10.7 (cutting at 1024 characters)
Dear CMake developers, I tried to compile CMake against libc++ on OS X 10.7. For a weird reason it fails: Built target cmsysTestsC [ 25%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/frm_scale.c.o [ 25%] Building CXX object Source/kwsys/CMakeFiles/cmsys.dir/IOStream.cxx.o [ 25%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/frm_sub.c.o [ 25%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/frm_user.c.o [ 26%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/frm_win.c.o [ 26%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/fty_alnum.c.o [ 26%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/fty_alpha.c.o [ 27%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/fty_enum.c.o [ 27%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/fty_int.c.o [ 27%] [ 27%] Building CXX object Source/kwsys/CMakeFiles/cmsys.dir/SystemInformation.cxx.o Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/fty_ipv4.c.o [ 28%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/fty_num.c.o [ 28%] Building C object Source/CursesDialog/form/CMakeFiles/cmForm.dir/fty_regex.c.o Linking C static library libcmForm.a ar: C: No such file or directory make[2]: *** [Source/CursesDialog/form/libcmForm.a] Error 1 make[2]: Leaving directory `/path/to/cmake-3.0.0' make[1]: *** [Source/CursesDialog/form/CMakeFiles/cmForm.dir/all] Error 2 make[1]: *** Waiting for unfinished jobs Linking CXX static library libcmsys.a make[2]: Leaving directory `/path/to/cmake-3.0.0' [ 28%] Built target cmsys make[1]: Leaving directory `/path/to/cmake-3.0.0' make: *** [all] Error 2 When I use make again and a single core, it fails with [ 66%] Building CXX object Source/CMakeFiles/CMakeLib.dir/cmNinjaUtilityTargetGenerator.cxx.o cd /path/to/cmake-3.0.0/Source /usr/bin/clang++ -DCMAKE_BUILD_WITH_CMAKE -pipe -Os -arch x86_64 -stdlib=libc++ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -mmacosx-version-min=10.7 -I/path/to/cmake-3.0.0/Utilities -I/path/to/cmake-3.0.0/Source -I/opt/libcxxlocal/include -I/path/to/cmake-3.0.0/Utilities/cmcompress -I/path/to/cmake-3.0.0/Source/CTest -I/path/to/cmake-3.0.0/Source/CursesDialog/form-o CMakeFiles/CMakeLib.dir/cmNinjaUtilityTargetGenerator.cxx.o -c /path/to/cmake-3.0.0/Source/cmNinjaUtilityTargetGenerator.cxx Linking CXX static library libCMakeLib.a cd /path/to/cmake-3.0.0/Source /path/to/cmake-3.0.0/Bootstrap.cmk/cmake -P CMakeFiles/CMakeLib.dir/cmake_clean_target.cmake cd /path/to/cmake-3.0.0/Source /path/to/cmake-3.0.0/Bootstrap.cmk/cmake -E cmake_link_script CMakeFiles/CMakeLib.dir/link.txt --verbose=1 /usr/bin/ar cr libCMakeLib.a CMakeFiles/CMakeLib.dir/cmStandardIncludes.cxx.o CMakeFiles/CMakeLib.dir/cmArchiveWrite.cxx.o CMakeFiles/CMakeLib.dir/cmBootstrapCommands1.cxx.o CMakeFiles/CMakeLib.dir/cmBootstrapCommands2.cxx.o CMakeFiles/CMakeLib.dir/cmCacheManager.cxx.o CMakeFiles/CMakeLib.dir/cmCommands.cxx.o CMakeFiles/CMakeLib.dir/cmCommandArgumentLexer.cxx.o CMakeFiles/CMakeLib.dir/cmCommandArgumentParser.cxx.o CMakeFiles/CMakeLib.dir/cmCommandArgumentParserHelper.cxx.o CMakeFiles/CMakeLib.dir/cmComputeComponentGraph.cxx.o CMakeFiles/CMakeLib.dir/cmComputeLinkDepends.cxx.o CMakeFiles/CMakeLib.dir/cmComputeLinkInformation.cxx.o CMakeFiles/CMakeLib.dir/cmComputeTargetDepends.cxx.o CMakeFiles/CMakeLib.dir/cmCryptoHash.cxx.o CMakeFiles/CMakeLib.dir/cmCustomCommand.cxx.o CMakeFiles/CMakeLib.dir/cmCustomCommandGenerator.cxx.o CMakeFiles/CMakeLib.dir/cmDefinitions.cxx.o CMakeFiles/CMakeLib.dir/cmDepends.cxx.o CMakeFiles/CMakeLib.dir/cmDependsC.cxx.o CMakeFiles/CMakeLib.dir/cmDependsFortran.cxx.o CMakeFiles/CMak ar: CMakeFiles/CMak: No such file or directory make[2]: *** [Source/libCMakeLib.a] Error 1 make[1]: *** [Source/CMakeFiles/CMakeLib.dir/all] Error 2 make: *** [all] Error 2 The weird part is that part of the command is simply cut off: CMakeFiles/CMakeLib.dir/cmDependsFortran.cxx.o CMakeFiles/CMakcut I looked into Source/CMakeFiles/CMakeLib.dir/link.txt. The first line in that file contains 5356 characters, but the line gets cut off at exactly 1024 when printed on the screen and fails with ar: CMakeFiles/CMak: No such file or directory For some reason the command /path/to/cmake-3.0.0/Bootstrap.cmk/cmake -E cmake_link_script CMakeFiles/CMakeLib.dir/link.txt --verbose=1 isn't outputting the whole command, but cutting it in the middle instead. If I execute that command from link.txt manually, it works ok and the build continues. It then fails again with cd /path/to/cmake-3.0.0/Source /path/to/cmake-3.0.0/Bootstrap.cmk/cmake -E cmake_link_script CMakeFiles/ccmake.dir/link.txt --verbose=1 /usr/bin/clang++ -pipe -Os -arch x86_64 -stdlib=libc++ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -mmacosx-version-min=10.7
Re: [cmake-developers] [PATCH 5/5] FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation
Brad King wrote: On 06/20/2014 01:09 PM, Philipp Möller wrote: +# Boost::boost - interface target containing the include +# directory Nice. Note that Boost upstream is modularizing and may provide CMake config files in the future: https://github.com/boost-cmake/boost-cmake https://svn.boost.org/trac/boost/wiki/CMakeModularizationStatus The wiki page is out of date, and so is the repo, because boost is trying to make a release before finishing the modularization work and it is all on- hold for several more months. This means: 1) Creating a Boost::boost monolithic target may not be appropriate 2) If FindBoost creates imported targets named Boost::*, then config files provided by boost upstream probably can't use that namespace (currently it uses boost::, but you might consider whether imported targets provided by files shipped with cmake should use CMake::). Thanks, Steve. -- 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] Ninja order-only dependency makes inefficient ninja DAG
On 06/24/2014 07:11 AM, Kristofer Tingdahl wrote: CMake adds order-only dependencies in build.ninja between libraries and subsequent object-files, and I cannot see why this is needed. The object files of consuming targets might use headers generated by custom commands in earlier targets. The order-only dependencies ensure a safe build for such cases. They are not always needed, and the extra dependencies could be removed with sufficient work on the generator. See these issues: Optionally disable build order dependency target_link_libraries http://www.cmake.org/Bug/view.php?id=13799 target_link_libraries may have option not to add dependencies, for archive target http://www.cmake.org/Bug/view.php?id=14726 Generalize LINK_ONLY http://www.cmake.org/Bug/view.php?id=14751 and a workaround mentioned here: http://www.cmake.org/Bug/view.php?id=14726#c35023 -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 5/5] FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation
On 06/24/2014 08:42 AM, Stephen Kelly wrote: Note that Boost upstream is modularizing and may provide CMake config files in the future: This would be greatly preferred over FindBoost. As Qt5 demonstrates, it is possible to provide package configuration files for CMake even for a project that does not build with CMake. -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 5/5] FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation
Stephen Kelly steve...@gmail.com writes: Brad King wrote: On 06/20/2014 01:09 PM, Philipp Möller wrote: +# Boost::boost - interface target containing the include +# directory Nice. Note that Boost upstream is modularizing and may provide CMake config files in the future: https://github.com/boost-cmake/boost-cmake https://svn.boost.org/trac/boost/wiki/CMakeModularizationStatus The wiki page is out of date, and so is the repo, because boost is trying to make a release before finishing the modularization work and it is all on- hold for several more months. This project has been going on for ages and considering how long it took Boost to change their SCM or the (stalled?) ryppl and 0install efforts I don't see this happening anytime soon. I'm of course not belittling any of those efforts or the people behind them. Huge organizations are hard to move and those that try deserve respect. It would certainly make my life easier if they succeeded. Exporting targets with proper dependencies is a problem now and lots of projects depend on Boost. Improving the process now and even supporting older versions of Boost is, IMO, worthwhile. This means: 1) Creating a Boost::boost monolithic target may not be appropriate IMO, even a modularized boost build should provide a target that just gives you all of the includes for convenience in addition to more fine-grained access, but I see why one would think otherwise. 2) If FindBoost creates imported targets named Boost::*, then config files provided by boost upstream probably can't use that namespace (currently it uses boost::, but you might consider whether imported targets provided by files shipped with cmake should use CMake::). Yes, I was thinking about that. So far I have only applied those changes for packages which are highly unlikely to ever provide package configs and so giving them their own namespace made sense to me. Their is also a problem that some find-modules don't use other find-modules even where they should (e.g. FindGLUT which is using Xmu and Xi, which could be provided by FindX11). This could lead to inconsistencies between targets, thus the encapsulation in the GLUT namespace. Boost is a bit of a special case and changing the namespace to indicate that one is using the CMake provided targets might be a good idea. What about FindBoost::? -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 5/5] FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation
Brad King brad.k...@kitware.com writes: On 06/20/2014 01:09 PM, Philipp Möller wrote: +# Boost::boost - interface target containing the include +# directory Nice. + if(Boost_USE_STATIC_LIBS) +add_library(Boost::${COMPONENT} STATIC IMPORTED) + else() +add_library(Boost::${COMPONENT} SHARED IMPORTED) + endif() IIRC, Boost_USE_STATIC_LIBS asks for static libraries, but when it is OFF we might still get static libraries. Therefore the else() case still needs to mark it as UNKNOWN. You are right. Attached is a fixed patch. commit 240cfd47a4980965f18068f6f35c6b7071497d32 Author: Philipp Möller bootsare...@googlemail.com Date: Fri Jun 20 19:09:28 2014 +0200 FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index dfd4460..705b250 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -53,6 +53,24 @@ # Boost_C_LIBRARY_DEBUG - Component C library debug variant # Boost_C_LIBRARY_RELEASE - Component C library release variant # +# In addition to the above variables this module creates the following +# :prop_tgt:`IMPORTED` targets:: +# +# Boost::boost - interface target containing the include +# directory +# Boost::C- shared or static library target for a +# component (C is lower-case) +# Boost::diagnostic_definitions - interface target to enable diagnostic +# information about Boost's automatic linking +# during compilation +# +# Component targets never depend on each even though they might +# require each other. It is important to note that the imported +# targets behave differently than variables created by this module: +# multiple calls to find_package(Boost) in the same directory or +# sub-directories with different options (e.g. static or shared) will +# not override the values of the targets created by the first call. +# # Users may set these hints or results as cache entries. Projects # should not read these entries directly but instead use the above # result variables. Note that some hint names start in upper-case @@ -524,6 +542,13 @@ if(Boost_DEBUG) Boost_NO_SYSTEM_PATHS = ${Boost_NO_SYSTEM_PATHS}) endif() +# Supply Boost_LIB_DIAGNOSTIC_DEFINITIONS as a convenience target. It +# will only contain any interface definitions on WIN32, but is created +# on all platforms to keep end user code free from platform dependent +# code. +if(NOT TARGET Boost::diagnostic_definitions) + add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) +endif() if(WIN32) # In windows, automatic linking is performed, so you do not have # to specify the libraries. If you are linking to a dynamic @@ -543,6 +568,8 @@ if(WIN32) # code to emit a #pragma message each time a library is selected # for linking. set(Boost_LIB_DIAGNOSTIC_DEFINITIONS -DBOOST_LIB_DIAGNOSTIC) + set_target_properties(Boost::diagnostic_definitions PROPERTIES +INTERFACE_COMPILE_DEFINITIONS BOOST_LIB_DIAGNOSTIC) endif() _Boost_CHECK_SPELLING(Boost_ROOT) @@ -1155,11 +1182,36 @@ else() endif() # -# Notification to end user about what was found +# Notification to end user about what was found and creation of targets. # set(Boost_LIBRARIES ) if(Boost_FOUND) + if(NOT TARGET Boost::boost) +add_library(Boost::boost INTERFACE IMPORTED) +set_target_properties(Boost::boost PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR}) + endif() + + foreach(COMPONENT ${Boost_FIND_COMPONENTS}) +string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + +if(NOT TARGET Boost::${COMPONENT}) + if(Boost_USE_STATIC_LIBS) +add_library(Boost::${COMPONENT} STATIC IMPORTED) + else() +# Even if Boost_USE_STATIC_LIBS is OFF, we might have static +# libraries as a result. +add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) + endif() + + set_target_properties(Boost::${COMPONENT} PROPERTIES +IMPORTED_LOCATION ${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE} +IMPORTED_LOCATION_RELEASE ${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE} +IMPORTED_LOCATION_DEBUG ${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}) +endif() + endforeach() + if(NOT Boost_FIND_QUIETLY) message(STATUS Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}) if(Boost_FIND_COMPONENTS) -- 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
Re: [cmake-developers] [PATCH 5/5] FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation
Philipp Moeller wrote: Stephen Kelly steve...@gmail.com writes: The wiki page is out of date, and so is the repo, because boost is trying to make a release before finishing the modularization work and it is all on- hold for several more months. This project has been going on for ages and considering how long it took Boost to change their SCM or the (stalled?) ryppl and 0install efforts I don't see this happening anytime soon. Indeed. Until a few weeks ago I believed the effort was permanently aborted. Then some Boost people starting doing the modularization work, but were asked to stop until after the next release (I don't know the details of that reasoning). After the major part of the modularization TODO is done, it would be viable to start talking about whether they want to use cmake, and if not, teaching bjam to create cmake config packages. As you note, this is several months away. As far as I know, they want to make their release in early August, but I have no idea what blocks that or if it is likely that they will reach that target. I'm just noting all of this for informational purposes :). This means: 1) Creating a Boost::boost monolithic target may not be appropriate IMO, even a modularized boost build should provide a target that just gives you all of the includes for convenience in addition to more fine-grained access, but I see why one would think otherwise. In a modularized system, all of boost might not be there, and the parts that are might be in different places. Thanks, Steve. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 4/5] FindGLUT.cmake: Add imported targets and documentation
Brad King brad.k...@kitware.com writes: On 06/10/2014 05:55 AM, Philipp Möller wrote: The APPLE part works, but definitely could be improved upon. [snip] +if(APPLE) + # Using the hardcoded paths is certainly not the best thing to + # do, but it is done the include path already. + set_target_properties(GLUT::GLUT PROPERTIES +IMPORTED_LOCATION /System/Library/Frameworks/GLUT.framework/GLUT) + if(NOT TARGET GLUT::Cocoa) +add_library(GLUT::Cocoa UNKNOWN IMPORTED) +set_target_properties(GLUT::Cocoa PROPERTIES + IMPORTED_LOCATION /System/Library/Frameworks/Cocoa.framework/Cocoa) + endif() + set_target_properties(GLUT::GLUT PROPERTIES +INTERFACE_LINK_LIBRARIES GLUT::Cocoa) +else() The path to the framework is hard-coded for the include path only as a possible search location, not as a result. The above code hard-codes it as a result. FindGLUT is one of the only modules left that hard-codes -framework XYZ as a result on OS X instead of allowing find_library to locate the framework. That needs to be fixed first, and then the framework path can be handled here the same way as it is in FindOpenGL. I removed the -framework part and the code now checks if find_library returned a path to a framework. I also removed the hard-coded path from the find_library call so this now behaves like most other Find Modules. diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index be7c0cd..9fe8aa0 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -2,7 +2,20 @@ # FindGLUT # # -# try to find glut library and include files +# try to find glut library and include files. +# +# IMPORTED Targets +# +# +# This module defines the :prop_tgt:`IMPORTED` targets: +# +# ``GLUT::GLUT`` +# Defined if the system has GLUT. +# +# Result Variables +# +# +# This module sets the following variables: # # :: # @@ -42,13 +55,21 @@ if (WIN32) else () if (APPLE) -# These values for Apple could probably do with improvement. -find_path( GLUT_INCLUDE_DIR glut.h - /System/Library/Frameworks/GLUT.framework/Versions/A/Headers - ${OPENGL_LIBRARY_DIR} - ) -set(GLUT_glut_LIBRARY -framework GLUT CACHE STRING GLUT library for OSX) -set(GLUT_cocoa_LIBRARY -framework Cocoa CACHE STRING Cocoa framework for OSX) +find_path(GLUT_INCLUDE_DIR glut.h ${OPENGL_LIBRARY_DIR}) +find_library(GLUT_glut_LIBRARY GLUT DOC GLUT library for OSX) +find_library(GLUT_cocoa_LIBRARY Cocoa DOC Cocoa framework for OSX) + +if(GLUT_cocoa_LIBRARY AND NOT TARGET GLUT::Cocoa) + add_library(GLUT::Cocoa UNKNOWN IMPORTED) + # Cocoa should always be a Framework, but we check to make sure. + if(GLUT_cocoa_LIBRARY MATCHES /([^/]+)\\.framework$) +set_target_properties(GLUT::Cocoa PROPERTIES + IMPORTED_LOCATION ${GLUT_cocoa_LIBRARY}/${CMAKE_MATCH_1}) + else() +set_target_properties(GLUT::Cocoa PROPERTIES + IMPORTED_LOCATION ${GLUT_cocoa_LIBRARY}) + endif() +endif() else () if (BEOS) @@ -66,6 +87,18 @@ else () /usr/openwin/lib ) + if(GLUT_Xi_LIBRARY AND NOT TARGET GLUT::Xi) +add_library(GLUT::Xi UNKNOWN IMPORTED) +set_target_properties(GLUT::Xi PROPERTIES + IMPORTED_LOCATION ${GLUT_Xi_LIBRARY}) + endif() + + if(GLUT_Xmu_LIBRARY AND NOT TARGET GLUT::Xmu) +add_library(GLUT::Xmu UNKNOWN IMPORTED) +set_target_properties(GLUT::Xmu PROPERTIES + IMPORTED_LOCATION ${GLUT_Xmu_LIBRARY}) + endif() + endif () find_path( GLUT_INCLUDE_DIR GL/glut.h @@ -102,6 +135,34 @@ if (GLUT_FOUND) ${GLUT_cocoa_LIBRARY} ) + if(NOT TARGET GLUT::GLUT) +add_library(GLUT::GLUT UNKNOWN IMPORTED) +set_target_properties(GLUT::GLUT PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${GLUT_INCLUDE_DIR}) +if(GLUT_glut_LIBRARY MATCHES /([^/]+)\\.framework$) + set_target_properties(GLUT::GLUT PROPERTIES +IMPORTED_LOCATION ${GLUT_glut_LIBRARY}/${CMAKE_MATCH_1}) +else() + set_target_properties(GLUT::GLUT PROPERTIES +IMPORTED_LOCATION ${GLUT_glut_LIBRARY}) +endif() + +if(TARGET GLUT::Xmu) + set_property(TARGET GLUT::GLUT APPEND +PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Xmu) +endif() + +if(TARGET GLUT::Xi) + set_property(TARGET GLUT::GLUT APPEND +PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Xi) +endif() + +if(TARGET GLUT::Cocoa) + set_property(TARGET GLUT::GLUT APPEND +PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Cocoa) +endif() + endif() + #The following deprecated settings are for backwards compatibility with CMake1.4 set (GLUT_LIBRARY ${GLUT_LIBRARIES}) set (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR}) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at:
Re: [cmake-developers] [PATCH 5/5] FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation
Stephen Kelly steve...@gmail.com writes: Philipp Moeller wrote: Stephen Kelly steve...@gmail.com writes: The wiki page is out of date, and so is the repo, because boost is trying to make a release before finishing the modularization work and it is all on- hold for several more months. This project has been going on for ages and considering how long it took Boost to change their SCM or the (stalled?) ryppl and 0install efforts I don't see this happening anytime soon. Indeed. Until a few weeks ago I believed the effort was permanently aborted. Then some Boost people starting doing the modularization work, but were asked to stop until after the next release (I don't know the details of that reasoning). After the major part of the modularization TODO is done, it would be viable to start talking about whether they want to use cmake, and if not, teaching bjam to create cmake config packages. As you note, this is several months away. As far as I know, they want to make their release in early August, but I have no idea what blocks that or if it is likely that they will reach that target. I'm just noting all of this for informational purposes :). This means: 1) Creating a Boost::boost monolithic target may not be appropriate IMO, even a modularized boost build should provide a target that just gives you all of the includes for convenience in addition to more fine-grained access, but I see why one would think otherwise. In a modularized system, all of boost might not be there, and the parts that are might be in different places. Sorry, poor wording on my part. I meant to say a target for all of boost that is available. It should be easy to support includes in different locations by just having the Boost::includes target consist of dependencies on Boost::component_includes targets. This is of course contrary to what modularization is supposed to achieve, but sometimes a little convenience helps adoption a lot. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 0/5] IMPORTED targets for some Find modules
On 06/24/2014 08:32 AM, Brad King wrote: I will respond to the individual patch messages for the other two. Thanks for the revisions. I've applied them now as: FindGLUT.cmake: Add imported targets and documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=144b255b FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38da974d The transition to a modularized Boost will be tricky and hard to predict so I do not want it to hold back this support now. We can introduce a policy for compatibility later if needed. 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] Weird build error against libc++ on OS X 10.7 (cutting at 1024 characters)
On 06/24/2014 08:31 AM, Mojca Miklavec wrote: /path/to/cmake-3.0.0/Bootstrap.cmk/cmake -E cmake_link_script CMakeFiles/CMakeLib.dir/link.txt --verbose=1 isn't outputting the whole command, but cutting it in the middle instead. The lines are read here: http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/cmcmd.cxx;hb=v3.0.0#l988 using the GetLineFromStream helper: http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/kwsys/SystemTools.cxx;hb=v3.0.0#l4157 Note the buffer size is 1024. Something must go wrong with the stream state to make it look like EOL or EOF to this code. -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] Weird build error against libc++ on OS X 10.7 (cutting at 1024 characters)
On Tue, Jun 24, 2014 at 14:21:37 -0400, Brad King wrote: On 06/24/2014 08:31 AM, Mojca Miklavec wrote: /path/to/cmake-3.0.0/Bootstrap.cmk/cmake -E cmake_link_script CMakeFiles/CMakeLib.dir/link.txt --verbose=1 isn't outputting the whole command, but cutting it in the middle instead. The lines are read here: http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/cmcmd.cxx;hb=v3.0.0#l988 using the GetLineFromStream helper: http://cmake.org/gitweb?p=cmake.git;a=blob;f=Source/kwsys/SystemTools.cxx;hb=v3.0.0#l4157 Note the buffer size is 1024. Something must go wrong with the stream state to make it look like EOL or EOF to this code. The proper way to read lines from a file using iostream is: std::string line; while (std::getline(istr, line)) { // use line } Unfortunately, it looks like there's unavoidable extra logic in there. Maybe we could do: #ifdef BROKEN_STREAMS // crutch code #else // sanity #endif --Ben -- 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] Weird build error against libc++ on OS X 10.7 (cutting at 1024 characters)
On Tue, Jun 24, 2014 at 15:23:32 -0400, Brad King wrote: If that actually worked on all old stream libraries then we would not need GetLineFromStream. Also GetLineFromStream has a separate output argument for indicating whether the line ended in a newline. The newline parameter isn't hard to reproduce (just use istr.eof() right after the getline() succeeds), but the sizeLimit parameter is harder :( . We could hack it up with a custom max_size() method on a custom std::basic_string subclass, but that sounds awful. Yes, please try this. Mojca, how did you bootstrap cmake to use libc++ and clang? CXX=clang++ -stdlib=libc++? I probably won't get to it until Thursday though. --Ben -- 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 0014989]: cannot build targets 'test' or 'package' after bootstrapping
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14989 == Reported By:Daniel Pfeifer Assigned To: == Project:CMake Issue ID: 14989 Category: CMake Reproducibility:always Severity: major Priority: normal Status: new == Date Submitted: 2014-06-24 16:55 EDT Last Modified: 2014-06-24 16:55 EDT == Summary:cannot build targets 'test' or 'package' after bootstrapping Description: After calling './bootstrap', building the targets 'test' or 'package' fails to find 'ctest' and 'cpack' binaries in directory 'Bootstrap.cmk'. Steps to Reproduce: $ ./bootstrap make $ make test Running tests... make: Bootstrap.cmk/ctest: Command not found Makefile:137: recipe for target 'test' failed make: *** [test] Error 127 $ make package Run CPack packaging tool... make: Bootstrap.cmk/cpack: Command not found Makefile:107: recipe for target 'package' failed make: *** [package] Error 127 == Issue History Date ModifiedUsername FieldChange == 2014-06-24 16:55 Daniel Pfeifer 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] IMPORTED targets for some Find modules
Philipp Möller wrote: To simplify exporting targets I added IMPORTED targets to some of the Find modules. Thanks for working on this. Just a few minor comments: In the FindX11 documentation commit, one of the changes is to replace use of two spaces between sentences with one. That's counter to the prevailing style in CMake. cmExportFileGenerator marks frameworks with a FRAMEWORK target property, and Qt 5 emulates that. It could be done with these files too (I notice in FindGLUT at least). I don't know if it has any effect on IMPORTED targets, but it may in the future even if it does not currently. Is there any reason to make the boost components not depend on each other? Or is that just left for future development? The Boost module documents that component imported targets have lower-case names, but that is not the case (haha). The names depend on the arguments to find_package currently: find_package(Boost REQUIRED Thread) if (TARGET Boost::Thread) message(YES) else() message(NO) endif() It looks like a good idea to add Boost::boost to the INTERFACE_LINK_LIBRARIES of each component imported target, or to similarly populate the INTERFACE_INCLUDE_DIRECTORIES of each component imported target. I would say something similar about the GLUT imported targets, but it seems that only GLUT::GLUT is documented, so presumably it is the only one intended for users to use. Is it verified that the other libraries are really interface dependencies and not runtime requirements? If they are really interface usage requirements, where are the headers of the other libraries located? Multiple IMPORTED_LOCATION_CONFIG are populated on the boost targets, but the IMPORTED_CONFIGURATIONS target property is not populated. Is there a need to populate the IMPORTED_IMPLIB_CONFIG target properties on Windows for any of the targets? cmExportFileGenerator populates the IMPORTED_LINK_INTERFACE_LANGUAGES target property, and Qt 5 emulates that. The same could be set to CXX at least for the Boost targets. One of the reasons Qt imported targets are called Qt4::Foo and Qt5::Foo is to avoid accidental combination of, say, Qt::Core and Qt::Gui from different major versions. They also encode a INTERFACE_QT_MAJOR_VERSION and add QT_MAJOR_VERSION to the COMPATIBLE_INTERFACE_STRING target property. Something similar could be added for these imported targets. In the case of Boost, because they don't provide binary compatibility or promise source compatibility, it might make sense to encode the full version, not only the major version, in a similar way to ensure that only boost libraries from the same boost release are used together. In the future, post modularization, boost may attempt to release some modules on a separate release schedule and with disparate version numbers. They may still release 'boost foobar 1.3' with 'Boost 1.58' though, so '1.58' would still be the appropriate 'distribution version' to encode. [Aside: Some people want to release Qt modules with disparate version schemes too, which has already caused problems: http://thread.gmane.org/gmane.comp.lib.qt.devel/17144 One of the remaining unsolved problems is that Qt5 packages find their dependencies with the same version as themselves, so find_package(Qt5Gui) which finds a version 5.3.1 Qt5Gui package will call find_package(Qt5Core 5.3.1) This obviously would either require mappings to be maintained ('what version of Qt5 was Enginio 1.0.5/1.2.3 released with?'), or would need to be dropped. That would be unfortunate because only combinations in the same 'distribution version' (which corresponds to the QtCore version) are tested together. But I digress... ] In the case of boost, it would also make sense to add INTERFACE_MULTITHREADED to the targets and COMPATIBLE_INTERFACE_BOOL. I'm assuming that a multithreaded Boost::system can't be used with a non- multithreaded Boost::filesystem for example. Currently I have the debian package libboost-thread1.54-dev installed on my system but not the package libboost-system1.54-dev, so FindBoost will find the thread component but not the system component (in that prefix at least). Depending on the build/package of boost it might be possible to conflict on things like that. Others to consider for this compatibility requirement are the Boost_COMPILER, Boost_NAMESPACE, Boost_THREADAPI etc. Thanks, Steve. -- 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
[CMake] how to use the cmake functions get_prerequisites and get_filename_component for target dependency installation?
Dear list members, we have set up a cmake project with external shared library dependencies. We want to package the binaries and dependencies of our project using CPack. However we are getting different results on windows and linux systems when trying to find dependencies of our targets. We had a look at the GetPrerequisites Module of CMake (2.8.12).We have successfully used the following CMake code to get the full path of a CMake target (BINARY) dependency (_libFile) on linux, however we don't get a the full path of the dependency on windows. On Windows the variable dependency_realpath holds something like ${CMAKE_SOURCE_DIR}/DEPENDENCY_FILE, which is not the correct path to the dependency. string(TOUPPER ${CMAKE_BUILD_TYPE} CONFIG) GET_TARGET_PROPERTY(MY_BINARY_LOCATION ${BINARY} LOCATION_${CONFIG} ) GET_PREREQUISITES(${MY_BINARY_LOCATION} DEPENDENCIES 0 0 ) foreach( DEPENDENCY_FILE ${DEPENDENCIES}) get_filename_component( dependency_realpath ${DEPENDENCY_FILE} REALPATH) So the question would be: Why are we getting different results for the dependency locations on windows and linux? Disclaimer: this is a clone question also asked on http://stackoverflow.com/questions/24367033/how-to-use-the-cmake-functions-get-prerequisites-and-get-filename-component-for Regards, Stefan -- 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] In-process COM server with type library - canonical example?
Hi Is there a canonical example of using CMake to drive IDL compilation, and resource compiling and the conversion to object, for an in-process COM server? Ideally, I'd like to be able to use the free equivalents and gcc as an alternative and switch between them (as well as the Windows SDK tools). And I guess really ideal would be to be able to target Windows from a Linux build, though that is not a necessity by any means. James -- 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 know the location of build directory
Hi folks, I have such problem: I build different C/C++ programs with gcc and use -fprofile-arcs -ftest-coverage options to generate .gcno files (to use them with gcov) So this files are created in directory there object files are created and I have to include them to distib. But I can't correctly define the path of this directory. So how can I know this path or can I change it to another known directory? -- View this message in context: http://cmake.3232098.n2.nabble.com/How-to-know-the-location-of-build-directory-tp7587766.html Sent from the CMake mailing list archive at Nabble.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
Re: [CMake] How to know the location of build directory
Hi Haster, Maybe CMAKE_CURRENT_BINARY_DIR could help you? Look at its description here: http://www.cmake.org/Wiki/CMake_Useful_Variables Cheers! Angeliki On Tue, Jun 24, 2014 at 1:51 PM, Haster haster2...@yandex.ru wrote: Hi folks, I have such problem: I build different C/C++ programs with gcc and use -fprofile-arcs -ftest-coverage options to generate .gcno files (to use them with gcov) So this files are created in directory there object files are created and I have to include them to distib. But I can't correctly define the path of this directory. So how can I know this path or can I change it to another known directory? -- View this message in context: http://cmake.3232098.n2.nabble.com/How-to-know-the-location-of-build-directory-tp7587766.html Sent from the CMake mailing list archive at Nabble.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] how to use the cmake functions get_prerequisites and get_filename_component for target dependency installation?
Answered on stack overflow. Copied/pasted here for mailing list archives: The references that get_prerequisites returns are not absolute full path references, and they are also not resolve-able to absolute references via a simple get_filename_component call. (On Mac, they may contain @executable_path, for instance.) However, there is another function in the GetPrerequisites.cmake module called gp_resolve_item that can help you here. Try this: get_prerequisites(${MY_BINARY_LOCATION} DEPENDENCIES 0 0 ) foreach(DEPENDENCY_FILE ${DEPENDENCIES}) gp_resolve_item(${MY_BINARY_LOCATION} ${DEPENDENCY_FILE} resolved_file) message(resolved_file='${resolved_file}') endforeach() That should convert DLL names into full path locations of the DLLs, assuming they are in your PATH. If they are in some other directories, you may need to provide those as the dirs arguments to get_prerequisites and gp_resolve_item. The documentation for the GetPrerequisites.cmake module is here: http://www.cmake.org/cmake/help/v3.0/module/GetPrerequisites.html Also, possibly dig into the BundleUtilities.cmake module to see how it uses GetPrerequisites. HTH, David C. -Original Message- From: Stefan Dänzer stefan.daen...@gmail.com To: cmake cmake@cmake.org Sent: Tue, Jun 24, 2014 4:43 am Subject: [CMake] how to use the cmake functions get_prerequisites and get_filename_component for target dependency installation? Dear list members, we have set up a cmake project with external shared library dependencies. We want to package the binaries and dependencies of our project using CPack. However we are getting different results on windows and linux systems when trying to find dependencies of our targets. We had a look at the GetPrerequisites Module of CMake (2.8.12).We have successfully used the following CMake code to get the full path of a CMake target (BINARY) dependency (_libFile) on linux, however we don't get a the full path of the dependency on windows. On Windows the variable dependency_realpath holds something like ${CMAKE_SOURCE_DIR}/DEPENDENCY_FILE, which is not the correct path to the dependency. string(TOUPPER ${CMAKE_BUILD_TYPE} CONFIG) GET_TARGET_PROPERTY(MY_BINARY_LOCATION ${BINARY} LOCATION_${CONFIG} ) GET_PREREQUISITES(${MY_BINARY_LOCATION} DEPENDENCIES 0 0 ) foreach( DEPENDENCY_FILE ${DEPENDENCIES}) get_filename_component( dependency_realpath ${DEPENDENCY_FILE} REALPATH) So the question would be: Why are we getting different results for the dependency locations on windows and linux? Disclaimer: this is a clone question also asked on http://stackoverflow.com/questions/24367033/how-to-use-the-cmake-funct ions-get-prerequisites-and-get-filename-component-for Regards, Stefan -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] How to know the location of build directory
Hi Angeliki, CMAKE_CURRENT_BINARY_DIR in my case is /import/home/yury.alioshinov/linux_i686/lua_libs/Source/__build__/engine/ but object files are located in /import/home/yury.alioshinov/linux_i686/lua_libs/Source/__build__/engine/CMakeFiles/lua_engine.dir Now I use construction: ${CMAKE_CURRENT_BINARY_DIR}/${SUB_DIR}${CMAKE_FILES_DIRECTORY}/${project_name}.dir/ but I think it is hardcoding and I'm not sure that it will work in all cases -- View this message in context: http://cmake.3232098.n2.nabble.com/How-to-know-the-location-of-build-directory-tp7587766p7587769.html Sent from the CMake mailing list archive at Nabble.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
[CMake] How to get find_package(ZLIB) to set ZLIB_LIBRARIES to 32-bit version ?
This seems to be the recommended way to link against the zlib library: find_package(ZLIB)if (ZLIB_FOUND) include_directories(${ZLIB_INCLUDE_DIRS}) target_link_libraries(MyProg ${ZLIB_LIBRARIES}) endif() When I run this on linux I see that ZLIB_LIBRARIES has the value /usr/lib64/libz.so. On this machine gcc creates 64-bit binaries by default. In my CMakeLists.txt I have an option for building 32-bit which adds -m32 to the compiler and linker command lines. However the ZLIB_LIBRARIES variable is still returning the 64-bit version (/usr/lib64/libz.so) instead of the 32-bit version (/usr/lib/libz.so). Is there some way for me to let cmake know that I'm building 32-bit so that the find_package(ZLIB) command sets ZLIB_LIBRARIES to the correct 32-bit version of the library ? -- Glenn -- 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-3869-g503b2d3
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 503b2d3a44de5aa58c2fbc35a943c035b80da2ed (commit) via c90c7fca6e68607bae5f22542169df6fcd9bdb34 (commit) via 3d82a2234a6fb6dfc523264acb12b033e93b0830 (commit) via 5a7ff42100dfec3e9b84f531153842198f59cd2e (commit) from c0648b0ca7a74d8ee2e6380ba510c7629f6ad8fe (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=503b2d3a44de5aa58c2fbc35a943c035b80da2ed commit 503b2d3a44de5aa58c2fbc35a943c035b80da2ed Merge: c0648b0 c90c7fc Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 08:23:40 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 08:23:40 2014 -0400 Merge topic 'find-module-targets' into next c90c7fca FindX11: fix documentation formatting error 3d82a223 FindGLEW: Add imported target and documentation 5a7ff421 FindZLIB: Add imported target and documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c90c7fca6e68607bae5f22542169df6fcd9bdb34 commit c90c7fca6e68607bae5f22542169df6fcd9bdb34 Author: Philipp Möller bootsare...@gmail.com AuthorDate: Tue Jun 10 11:08:56 2014 +0200 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 08:24:33 2014 -0400 FindX11: fix documentation formatting error While at it, remove excess indentation. diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index 3a31cf0..90c1499 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -4,7 +4,7 @@ # # Find X11 installation # -# Try to find X11 on UNIX systems. The following values are defined +# Try to find X11 on UNIX systems. The following values are defined # # :: # @@ -12,47 +12,44 @@ # X11_INCLUDE_DIR - include directories to use X11 # X11_LIBRARIES- link against these to use X11 # -# -# -# and also the following more fine grained variables: Include paths: -# X11_ICE_INCLUDE_PATH, X11_ICE_LIB, X11_ICE_FOUND +# and also the following more fine grained variables: # # :: # -# X11_SM_INCLUDE_PATH, X11_SM_LIB, X11_SM_FOUND -# X11_X11_INCLUDE_PATH, X11_X11_LIB -# X11_Xaccessrules_INCLUDE_PATH, X11_Xaccess_FOUND -# X11_Xaccessstr_INCLUDE_PATH, X11_Xaccess_FOUND -# X11_Xau_INCLUDE_PATH, X11_Xau_LIB, X11_Xau_FOUND -# X11_Xcomposite_INCLUDE_PATH, X11_Xcomposite_LIB, X11_Xcomposite_FOUND -# X11_Xcursor_INCLUDE_PATH, X11_Xcursor_LIB, X11_Xcursor_FOUND -# X11_Xdamage_INCLUDE_PATH, X11_Xdamage_LIB, X11_Xdamage_FOUND -# X11_Xdmcp_INCLUDE_PATH,X11_Xdmcp_LIB, X11_Xdmcp_FOUND -#X11_Xext_LIB, X11_Xext_FOUND -# X11_dpms_INCLUDE_PATH, (in X11_Xext_LIB), X11_dpms_FOUND -# X11_XShm_INCLUDE_PATH, (in X11_Xext_LIB), X11_XShm_FOUND -# X11_Xshape_INCLUDE_PATH, (in X11_Xext_LIB), X11_Xshape_FOUND -# X11_xf86misc_INCLUDE_PATH, X11_Xxf86misc_LIB, X11_xf86misc_FOUND -# X11_xf86vmode_INCLUDE_PATH,X11_Xxf86vm_LIB X11_xf86vmode_FOUND -# X11_Xfixes_INCLUDE_PATH, X11_Xfixes_LIB, X11_Xfixes_FOUND -# X11_Xft_INCLUDE_PATH, X11_Xft_LIB, X11_Xft_FOUND -# X11_Xi_INCLUDE_PATH, X11_Xi_LIB, X11_Xi_FOUND -# X11_Xinerama_INCLUDE_PATH, X11_Xinerama_LIB, X11_Xinerama_FOUND -# X11_Xinput_INCLUDE_PATH, X11_Xinput_LIB, X11_Xinput_FOUND -# X11_Xkb_INCLUDE_PATH, X11_Xkb_FOUND -# X11_Xkblib_INCLUDE_PATH, X11_Xkb_FOUND -# X11_Xkbfile_INCLUDE_PATH, X11_Xkbfile_LIB, X11_Xkbfile_FOUND -# X11_Xmu_INCLUDE_PATH, X11_Xmu_LIB, X11_Xmu_FOUND -# X11_Xpm_INCLUDE_PATH, X11_Xpm_LIB, X11_Xpm_FOUND -# X11_XTest_INCLUDE_PATH,X11_XTest_LIB, X11_XTest_FOUND -# X11_Xrandr_INCLUDE_PATH, X11_Xrandr_LIB, X11_Xrandr_FOUND -# X11_Xrender_INCLUDE_PATH, X11_Xrender_LIB, X11_Xrender_FOUND -# X11_Xscreensaver_INCLUDE_PATH, X11_Xscreensaver_LIB, X11_Xscreensaver_FOUND -# X11_Xt_INCLUDE_PATH, X11_Xt_LIB,
[Cmake-commits] CMake branch, master, updated. v3.0.0-1177-gc196b3c
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 c196b3ca023aeddfa8851477fc34a068bdd7d26f (commit) via d90be200ecdfd35395f7fdd1f82ddcd4006a256e (commit) from 24853afa87f88a307f1d3c871a30661b812e83bc (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=c196b3ca023aeddfa8851477fc34a068bdd7d26f commit c196b3ca023aeddfa8851477fc34a068bdd7d26f Merge: 24853af d90be20 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:05:10 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:05:10 2014 -0400 Merge topic 'gfortran-compressed-modules' d90be200 Fortran: Add support for GNU = 4.9 compressed modules (#14975) --- Summary of changes: Source/cmDependsFortran.cxx | 41 +++-- 1 file changed, 27 insertions(+), 14 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-1173-g8766f8e
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 8766f8ef4732e8dc4b2b585adddfda38ad23ea43 (commit) via 7abd574798f9900abfe502f3941cffaa774062b1 (commit) from f9cfbedef6adb24f67f8de32b48ea934386a5beb (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=8766f8ef4732e8dc4b2b585adddfda38ad23ea43 commit 8766f8ef4732e8dc4b2b585adddfda38ad23ea43 Merge: f9cfbed 7abd574 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:05:05 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:05:05 2014 -0400 Merge topic 'cmake-E-env' 7abd5747 cmake: Add '-E env' command-line tool --- Summary of changes: Help/manual/cmake.1.rst|2 +- Help/release/dev/cmake-E-env.rst |4 ++ Source/cmcmd.cxx | 51 .../E_env-bad-arg1-result.txt} |0 .../RunCMake/CommandLine/E_env-bad-arg1-stderr.txt |1 + .../E_env-no-command0-result.txt} |0 .../CommandLine/E_env-no-command0-stderr.txt |1 + .../E_env-no-command1-result.txt} |0 .../CommandLine/E_env-no-command1-stderr.txt |1 + Tests/RunCMake/CommandLine/E_env-set-stdout.txt|1 + Tests/RunCMake/CommandLine/E_env-set.cmake |5 ++ Tests/RunCMake/CommandLine/E_env-unset-stdout.txt |1 + Tests/RunCMake/CommandLine/E_env-unset.cmake |5 ++ Tests/RunCMake/CommandLine/RunCMakeTest.cmake |6 +++ 14 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 Help/release/dev/cmake-E-env.rst copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt = CommandLine/E_env-bad-arg1-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_env-bad-arg1-stderr.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt = CommandLine/E_env-no-command0-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_env-no-command0-stderr.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt = CommandLine/E_env-no-command1-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_env-no-command1-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/E_env-set-stdout.txt create mode 100644 Tests/RunCMake/CommandLine/E_env-set.cmake create mode 100644 Tests/RunCMake/CommandLine/E_env-unset-stdout.txt create mode 100644 Tests/RunCMake/CommandLine/E_env-unset.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-1175-g24853af
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 24853afa87f88a307f1d3c871a30661b812e83bc (commit) via c491cb1eb4030d70e7a04bcda5021ebd0e5ca88d (commit) from 8766f8ef4732e8dc4b2b585adddfda38ad23ea43 (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=24853afa87f88a307f1d3c871a30661b812e83bc commit 24853afa87f88a307f1d3c871a30661b812e83bc Merge: 8766f8e c491cb1 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:05:08 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:05:08 2014 -0400 Merge topic 'stringapi-crash-cleanup' c491cb1e Fix some generator crashes on undefined CMAKE_BUILD_TYPE --- Summary of changes: Source/cmExtraCodeBlocksGenerator.cxx |2 +- Source/cmExtraEclipseCDT4Generator.cxx |2 +- Source/cmLocalGenerator.cxx|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-3885-gc0508c4
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 c0508c48707236c275d13a07f92cfd53227ce915 (commit) via 87e4c556131c94e594498442985e5e9416dd3ea3 (commit) from 8b15ddf5df05dfcb11d92e49f29ce0fa9cdfcbf1 (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=c0508c48707236c275d13a07f92cfd53227ce915 commit c0508c48707236c275d13a07f92cfd53227ce915 Merge: 8b15ddf 87e4c55 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:34:47 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:34:47 2014 -0400 Merge topic 'CTestConfig-update-cdash-location' into next 87e4c556 CTestConfig: Update CDash server URL http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87e4c556131c94e594498442985e5e9416dd3ea3 commit 87e4c556131c94e594498442985e5e9416dd3ea3 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:35:33 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 13:35:33 2014 -0400 CTestConfig: Update CDash server URL It is now at open.cdash.org and does not start in /CDash. diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 819f9ba..df2f94c 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -13,8 +13,8 @@ set(CTEST_PROJECT_NAME CMake) set(CTEST_NIGHTLY_START_TIME 1:00:00 UTC) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=CMake) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=CMake) set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_CDASH_VERSION 1.6) set(CTEST_CDASH_QUERY_VERSION TRUE) --- Summary of changes: CTestConfig.cmake |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-3887-g22cd130
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 22cd13005088eae3fbec2cee413113f614c70c9f (commit) via 99381423f6411f73d798354d13ef1584ec24cf8c (commit) from c0508c48707236c275d13a07f92cfd53227ce915 (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=22cd13005088eae3fbec2cee413113f614c70c9f commit 22cd13005088eae3fbec2cee413113f614c70c9f Merge: c0508c4 9938142 Author: Bill Hoffman bill.hoff...@kitware.com AuthorDate: Tue Jun 24 13:38:12 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:38:12 2014 -0400 Merge topic 'launcher-limit-warnings-errors' into next 99381423 Teach the launcher code to honer the max warnings and errors. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99381423f6411f73d798354d13ef1584ec24cf8c commit 99381423f6411f73d798354d13ef1584ec24cf8c Author: Bill Hoffman bill.hoff...@kitware.com AuthorDate: Tue Jun 24 13:35:35 2014 -0400 Commit: Bill Hoffman bill.hoff...@kitware.com CommitDate: Tue Jun 24 13:35:35 2014 -0400 Teach the launcher code to honer the max warnings and errors. The ctest launcher code did not respect the number of errors and warnings limits. This patch fixes that. diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 7922c9a..2ec1365 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -605,6 +605,9 @@ void cmCTestBuildHandler::GenerateXMLLaunched(std::ostream os) typedef std::setstd::string, FragmentCompare Fragments; Fragments fragments(fragmentCompare); + // only report the first 50 warnings and first 50 errors + int numErrorsAllowed = this-MaxErrors; + int numWarningsAllowed = this-MaxWarnings; // Identify fragments on disk. cmsys::Directory launchDir; launchDir.Load(this-CTestLaunchDir.c_str()); @@ -612,13 +615,15 @@ void cmCTestBuildHandler::GenerateXMLLaunched(std::ostream os) for(unsigned long i=0; i n; ++i) { const char* fname = launchDir.GetFile(i); -if(this-IsLaunchedErrorFile(fname)) +if(this-IsLaunchedErrorFile(fname) numErrorsAllowed) { + numErrorsAllowed--; fragments.insert(this-CTestLaunchDir + / + fname); ++this-TotalErrors; } -else if(this-IsLaunchedWarningFile(fname)) +else if(this-IsLaunchedWarningFile(fname) numWarningsAllowed) { + numWarningsAllowed--; fragments.insert(this-CTestLaunchDir + / + fname); ++this-TotalWarnings; } --- Summary of changes: Source/CTest/cmCTestBuildHandler.cxx |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-3889-gf07e914
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 f07e91418496f78c1b5a4cf6f737902ec5cb (commit) via b7a08ab9c62dacacd66e0be759537e0c7c6b195d (commit) from 22cd13005088eae3fbec2cee413113f614c70c9f (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=f07e91418496f78c1b5a4cf6f737902ec5cb commit f07e91418496f78c1b5a4cf6f737902ec5cb Merge: 22cd130 b7a08ab Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:41:31 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:41:31 2014 -0400 Merge topic 'update-cdash-location' into next b7a08ab9 Update CDash server location URLs http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7a08ab9c62dacacd66e0be759537e0c7c6b195d commit b7a08ab9c62dacacd66e0be759537e0c7c6b195d Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:39:43 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 13:41:46 2014 -0400 Update CDash server location URLs Our CDash server is now at open.cdash.org. diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e4cd15..41ff4a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,7 +451,7 @@ endif() # CMAKE_TESTS_CDASH_SERVER: CDash server used by CMake/Tests. # # If not defined or , this variable defaults to the server at -# http://www.cdash.org/CDash. +# http://open.cdash.org;. # # If set explicitly to NOTFOUND, curl tests and ctest tests that use # the network are skipped. @@ -462,7 +462,7 @@ endif() # should be run first. # if(x${CMAKE_TESTS_CDASH_SERVER} STREQUAL x) - set(CMAKE_TESTS_CDASH_SERVER http://www.cdash.org/CDash;) + set(CMAKE_TESTS_CDASH_SERVER http://open.cdash.org;) endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) diff --git a/DartConfig.cmake b/DartConfig.cmake index 37f66c7..92dffca 100644 --- a/DartConfig.cmake +++ b/DartConfig.cmake @@ -13,6 +13,6 @@ set(CTEST_PROJECT_NAME CMake) set(CTEST_NIGHTLY_START_TIME 21:00:00 EDT) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=CMake) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=CMake) set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index f83f992..66d300a 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -213,7 +213,6 @@ macro(_test_compiler_hidden_visibility) # Exclude XL here because it misinterprets -fvisibility=hidden even though # the check_cxx_compiler_flag passes - # http://www.cdash.org/CDash/testDetails.php?test=109109951build=1419259 if(NOT GCC_TOO_OLD AND NOT _INTEL_TOO_OLD AND NOT WIN32 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 273a541..075205e 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2557,8 +2557,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set(path ${CMAKE_MATCH_3}) else () set(protocol http) - set(server www.cdash.org) - set(path /CDash) + set(server open.cdash.org) + set(path ) message(warning: CMAKE_TESTS_CDASH_SERVER does not match expected regex...) message( ...using default url='${protocol}://${server}${path}' for CTestTest[23]) endif () diff --git a/Tests/CTestTestBadExe/CTestConfig.cmake b/Tests/CTestTestBadExe/CTestConfig.cmake index 1d46ea3..c7286e2 100644 --- a/Tests/CTestTestBadExe/CTestConfig.cmake +++ b/Tests/CTestTestBadExe/CTestConfig.cmake @@ -2,6 +2,6 @@ set (CTEST_PROJECT_NAME CTestTestBadExe) set (CTEST_NIGHTLY_START_TIME 21:00:00 EDT) set (CTEST_DART_SERVER_VERSION 2) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=PublicDashboard) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=PublicDashboard) set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Tests/CTestTestBadGenerator/CTestConfig.cmake b/Tests/CTestTestBadGenerator/CTestConfig.cmake index ef98189..1e61bf4 100644 --- a/Tests/CTestTestBadGenerator/CTestConfig.cmake +++ b/Tests/CTestTestBadGenerator/CTestConfig.cmake @@ -2,6 +2,6 @@ set (CTEST_PROJECT_NAME CTestTestBadGenerator) set (CTEST_NIGHTLY_START_TIME 21:00:00 EDT) set (CTEST_DART_SERVER_VERSION 2) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=PublicDashboard) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION
[Cmake-commits] CMake branch, next, updated. v3.0.0-3891-g8b30169
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 8b3016971d4f574fb8a0a09bfcc288fa0a9b3c60 (commit) via f4492635b643772398cc84b7be1b9dc5226f73ae (commit) from f07e91418496f78c1b5a4cf6f737902ec5cb (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=8b3016971d4f574fb8a0a09bfcc288fa0a9b3c60 commit 8b3016971d4f574fb8a0a09bfcc288fa0a9b3c60 Merge: f07e914 f449263 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:41:55 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:41:55 2014 -0400 Merge topic 'update-cdash-location' into next f4492635 Update CDash server URL http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4492635b643772398cc84b7be1b9dc5226f73ae commit f4492635b643772398cc84b7be1b9dc5226f73ae Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:35:33 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 13:42:52 2014 -0400 Update CDash server URL It is now at open.cdash.org and does not start in /CDash. diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e4cd15..41ff4a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,7 +451,7 @@ endif() # CMAKE_TESTS_CDASH_SERVER: CDash server used by CMake/Tests. # # If not defined or , this variable defaults to the server at -# http://www.cdash.org/CDash. +# http://open.cdash.org;. # # If set explicitly to NOTFOUND, curl tests and ctest tests that use # the network are skipped. @@ -462,7 +462,7 @@ endif() # should be run first. # if(x${CMAKE_TESTS_CDASH_SERVER} STREQUAL x) - set(CMAKE_TESTS_CDASH_SERVER http://www.cdash.org/CDash;) + set(CMAKE_TESTS_CDASH_SERVER http://open.cdash.org;) endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 819f9ba..df2f94c 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -13,8 +13,8 @@ set(CTEST_PROJECT_NAME CMake) set(CTEST_NIGHTLY_START_TIME 1:00:00 UTC) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=CMake) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=CMake) set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_CDASH_VERSION 1.6) set(CTEST_CDASH_QUERY_VERSION TRUE) diff --git a/DartConfig.cmake b/DartConfig.cmake index 37f66c7..92dffca 100644 --- a/DartConfig.cmake +++ b/DartConfig.cmake @@ -13,6 +13,6 @@ set(CTEST_PROJECT_NAME CMake) set(CTEST_NIGHTLY_START_TIME 21:00:00 EDT) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=CMake) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=CMake) set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index f83f992..66d300a 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -213,7 +213,6 @@ macro(_test_compiler_hidden_visibility) # Exclude XL here because it misinterprets -fvisibility=hidden even though # the check_cxx_compiler_flag passes - # http://www.cdash.org/CDash/testDetails.php?test=109109951build=1419259 if(NOT GCC_TOO_OLD AND NOT _INTEL_TOO_OLD AND NOT WIN32 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 273a541..075205e 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2557,8 +2557,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set(path ${CMAKE_MATCH_3}) else () set(protocol http) - set(server www.cdash.org) - set(path /CDash) + set(server open.cdash.org) + set(path ) message(warning: CMAKE_TESTS_CDASH_SERVER does not match expected regex...) message( ...using default url='${protocol}://${server}${path}' for CTestTest[23]) endif () diff --git a/Tests/CTestTestBadExe/CTestConfig.cmake b/Tests/CTestTestBadExe/CTestConfig.cmake index 1d46ea3..c7286e2 100644 --- a/Tests/CTestTestBadExe/CTestConfig.cmake +++ b/Tests/CTestTestBadExe/CTestConfig.cmake @@ -2,6 +2,6 @@ set (CTEST_PROJECT_NAME CTestTestBadExe) set (CTEST_NIGHTLY_START_TIME 21:00:00 EDT) set (CTEST_DART_SERVER_VERSION 2) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=PublicDashboard) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=PublicDashboard) set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Tests/CTestTestBadGenerator/CTestConfig.cmake
[Cmake-commits] CMake branch, next, updated. v3.0.0-3895-gd4238f8
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 d4238f82ee5ae3c1c58131aa001e41915f740c0e (commit) via 65d8d04859bd31e9992d500a6fca59cdf53c9219 (commit) from 46c5c81d73cf288c85b0027422c89b840bcdb54d (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=d4238f82ee5ae3c1c58131aa001e41915f740c0e commit d4238f82ee5ae3c1c58131aa001e41915f740c0e Merge: 46c5c81 65d8d04 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:53:29 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:53:29 2014 -0400 Merge topic 'update-cdash-location' into next 65d8d048 Tests: Fix CMAKE_TESTS_CDASH_SERVER parsing http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65d8d04859bd31e9992d500a6fca59cdf53c9219 commit 65d8d04859bd31e9992d500a6fca59cdf53c9219 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:53:27 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 13:54:17 2014 -0400 Tests: Fix CMAKE_TESTS_CDASH_SERVER parsing Allow the value to end without a slash and have an empty server path component. This is needed to match http://open.cdash.org; correctly. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 075205e..cf7bd75 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2549,7 +2549,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release if (CMAKE_TESTS_CDASH_SERVER) -set(regex ^([^:]+)://([^/]+)(/.*)$) +set(regex ^([^:]+)://([^/]+)(.*)$) if (${CMAKE_TESTS_CDASH_SERVER} MATCHES ${regex}) set(protocol ${CMAKE_MATCH_1}) --- Summary of changes: Tests/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-3898-g773956f
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 773956f770919b1acd0cfd3e8d95fca6a186e7f5 (commit) via 57ddde524b959afb23715a40979f6099d19353cc (commit) via 1bd4e006aa8ae44d3dbcf7da56ed7be185fd (commit) from d4238f82ee5ae3c1c58131aa001e41915f740c0e (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=773956f770919b1acd0cfd3e8d95fca6a186e7f5 commit 773956f770919b1acd0cfd3e8d95fca6a186e7f5 Merge: d4238f8 57ddde5 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:53:48 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 13:53:48 2014 -0400 Merge topic 'update-cdash-location' into next 57ddde52 Update CDash server URL 1bd4e006 Tests: Fix CMAKE_TESTS_CDASH_SERVER parsing http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57ddde524b959afb23715a40979f6099d19353cc commit 57ddde524b959afb23715a40979f6099d19353cc Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 13:35:33 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 13:54:52 2014 -0400 Update CDash server URL It is now at open.cdash.org and does not start in /CDash. diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e4cd15..41ff4a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,7 +451,7 @@ endif() # CMAKE_TESTS_CDASH_SERVER: CDash server used by CMake/Tests. # # If not defined or , this variable defaults to the server at -# http://www.cdash.org/CDash. +# http://open.cdash.org;. # # If set explicitly to NOTFOUND, curl tests and ctest tests that use # the network are skipped. @@ -462,7 +462,7 @@ endif() # should be run first. # if(x${CMAKE_TESTS_CDASH_SERVER} STREQUAL x) - set(CMAKE_TESTS_CDASH_SERVER http://www.cdash.org/CDash;) + set(CMAKE_TESTS_CDASH_SERVER http://open.cdash.org;) endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 819f9ba..df2f94c 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -13,8 +13,8 @@ set(CTEST_PROJECT_NAME CMake) set(CTEST_NIGHTLY_START_TIME 1:00:00 UTC) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=CMake) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=CMake) set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_CDASH_VERSION 1.6) set(CTEST_CDASH_QUERY_VERSION TRUE) diff --git a/DartConfig.cmake b/DartConfig.cmake index 37f66c7..92dffca 100644 --- a/DartConfig.cmake +++ b/DartConfig.cmake @@ -13,6 +13,6 @@ set(CTEST_PROJECT_NAME CMake) set(CTEST_NIGHTLY_START_TIME 21:00:00 EDT) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=CMake) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION /submit.php?project=CMake) set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index f83f992..66d300a 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -213,7 +213,6 @@ macro(_test_compiler_hidden_visibility) # Exclude XL here because it misinterprets -fvisibility=hidden even though # the check_cxx_compiler_flag passes - # http://www.cdash.org/CDash/testDetails.php?test=109109951build=1419259 if(NOT GCC_TOO_OLD AND NOT _INTEL_TOO_OLD AND NOT WIN32 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index e443509..cf7bd75 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2557,8 +2557,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set(path ${CMAKE_MATCH_3}) else () set(protocol http) - set(server www.cdash.org) - set(path /CDash) + set(server open.cdash.org) + set(path ) message(warning: CMAKE_TESTS_CDASH_SERVER does not match expected regex...) message( ...using default url='${protocol}://${server}${path}' for CTestTest[23]) endif () diff --git a/Tests/CTestTestBadExe/CTestConfig.cmake b/Tests/CTestTestBadExe/CTestConfig.cmake index 1d46ea3..c7286e2 100644 --- a/Tests/CTestTestBadExe/CTestConfig.cmake +++ b/Tests/CTestTestBadExe/CTestConfig.cmake @@ -2,6 +2,6 @@ set (CTEST_PROJECT_NAME CTestTestBadExe) set (CTEST_NIGHTLY_START_TIME 21:00:00 EDT) set (CTEST_DART_SERVER_VERSION 2) set(CTEST_DROP_METHOD http) -set(CTEST_DROP_SITE www.cdash.org) -set(CTEST_DROP_LOCATION /CDash/submit.php?project=PublicDashboard) +set(CTEST_DROP_SITE open.cdash.org) +set(CTEST_DROP_LOCATION
[Cmake-commits] CMake branch, next, updated. v3.0.0-3902-g507e4bb
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 507e4bb43abfab9578ce6b019d5cd25c4cff55da (commit) via b5b524aac055db83cf22c28ac4d163d95b1ed5c2 (commit) via 38da974d3ba4edf3aa6d233275fac53b08147bbb (commit) via 144b255b085095fa396f483ad48c81c3e89cae60 (commit) from 773956f770919b1acd0cfd3e8d95fca6a186e7f5 (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=507e4bb43abfab9578ce6b019d5cd25c4cff55da commit 507e4bb43abfab9578ce6b019d5cd25c4cff55da Merge: 773956f b5b524a Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 14:12:35 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Jun 24 14:12:35 2014 -0400 Merge topic 'find-module-targets' into next b5b524aa Help: Add notes for topic 'find-module-targets' 38da974d FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation 144b255b FindGLUT.cmake: Add imported targets and documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5b524aac055db83cf22c28ac4d163d95b1ed5c2 commit b5b524aac055db83cf22c28ac4d163d95b1ed5c2 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Jun 24 14:12:03 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 14:12:03 2014 -0400 Help: Add notes for topic 'find-module-targets' diff --git a/Help/release/dev/find-module-targets.rst b/Help/release/dev/find-module-targets.rst new file mode 100644 index 000..3b3fb0a --- /dev/null +++ b/Help/release/dev/find-module-targets.rst @@ -0,0 +1,10 @@ +find-module-targets +--- + +* The :module:`FindBoost` module now provides imported targets. + +* The :module:`FindGLUT` module now provides imported targets. + +* The :module:`FindGLEW` module now provides imported targets. + +* The :module:`FindZLIB` module now provides imported targets. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38da974d3ba4edf3aa6d233275fac53b08147bbb commit 38da974d3ba4edf3aa6d233275fac53b08147bbb Author: Philipp Moeller bootsare...@gmail.com AuthorDate: Tue Jun 24 15:48:48 2014 +0200 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Jun 24 14:08:31 2014 -0400 FindBoost.cmake: Add Boost::boost and Boost::C targets and documentation diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index dfd4460..ceeb7e5 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -53,6 +53,24 @@ # Boost_C_LIBRARY_DEBUG - Component C library debug variant # Boost_C_LIBRARY_RELEASE - Component C library release variant # +# In addition to the above variables this module creates the following +# :prop_tgt:`IMPORTED` targets:: +# +# Boost::boost - interface target containing the include +# directory +# Boost::C- shared or static library target for a +# component (C is lower-case) +# Boost::diagnostic_definitions - interface target to enable diagnostic +# information about Boost's automatic linking +# during compilation +# +# Component targets never depend on each even though they might +# require each other. It is important to note that the imported +# targets behave differently than variables created by this module: +# multiple calls to find_package(Boost) in the same directory or +# sub-directories with different options (e.g. static or shared) will +# not override the values of the targets created by the first call. +# # Users may set these hints or results as cache entries. Projects # should not read these entries directly but instead use the above # result variables. Note that some hint names start in upper-case @@ -524,6 +542,13 @@ if(Boost_DEBUG) Boost_NO_SYSTEM_PATHS = ${Boost_NO_SYSTEM_PATHS}) endif() +# Supply Boost_LIB_DIAGNOSTIC_DEFINITIONS as a convenience target. It +# will only contain any interface definitions on WIN32, but is created +# on all platforms to keep end user code free from platform dependent +# code. +if(NOT TARGET Boost::diagnostic_definitions) + add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) +endif() if(WIN32) # In windows, automatic linking is performed, so you do not have # to specify the libraries. If you are linking to a dynamic @@ -543,6 +568,8 @@ if(WIN32) # code to emit a #pragma message each time a library is selected # for linking. set(Boost_LIB_DIAGNOSTIC_DEFINITIONS -DBOOST_LIB_DIAGNOSTIC) + set_target_properties(Boost::diagnostic_definitions
[Cmake-commits] CMake branch, master, updated. v3.0.0-1178-g6c383f8
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 6c383f89a1c773de631707c80396ef06cd650bdc (commit) from c196b3ca023aeddfa8851477fc34a068bdd7d26f (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=6c383f89a1c773de631707c80396ef06cd650bdc commit 6c383f89a1c773de631707c80396ef06cd650bdc Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Jun 25 00:01:10 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Jun 25 00:01:10 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 65dc320..f44b85e 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 20140624) +set(CMake_VERSION_PATCH 20140625) #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