[CMake] fixup bundle vs Qy 5.5.1 and rpaths
I have a project containing several applications (which are sub projects), each of which links against some Qt libraries which are built as dylibs, but are not part of the project. Qt libraries and headers are found using find-package which is working perfectly. I’m currently trying to switch from Qt 5.3.1 to Qt 5.5.1, but am experiencing problems with fixup_bundle on OS X (everything else seems to work fine). As far as I’ve gathered Qt has introduced support for rpaths between those two version and this seems to be the cause of my problems. Building a single application works and said application starts up correctly, but building the install target will give me the following output: -- fixup_bundle: preparing... -- warning: cannot resolve item 'libQt5Core_debug.5.dylib' possible problems: need more directories? need to use InstallRequiredSystemLibraries? run in install tree instead of build tree? -- warning: gp_resolved_file_type non-absolute file 'libQt5Core_debug.5.dylib' returning type 'other' -- possibly incorrect -- warning: cannot resolve item 'libQt5Core_debug.5.dylib' possible problems: need more directories? need to use InstallRequiredSystemLibraries? run in install tree instead of build tree? warning: target 'libQt5Core_debug.5.dylib' is not absolute... warning: target 'libQt5Core_debug.5.dylib' does not exist... CMake Error at /Applications/CMake.app/Contents/share/cmake-3.4/Modules/GetPrerequisites.cmake:800 (message): /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool failed: 1 error: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool: can't open file: libQt5Core_debug.5.dylib (No such file or directory) Call Stack (most recent call first): /Applications/CMake.app/Contents/share/cmake-3.4/Modules/GetPrerequisites.cmake:925 (get_prerequisites) /Applications/CMake.app/Contents/share/cmake-3.4/Modules/BundleUtilities.cmake:555 (get_prerequisites) /Applications/CMake.app/Contents/share/cmake-3.4/Modules/BundleUtilities.cmake:804 (get_bundle_keys) someApplication/someApplication/cmake_install.cmake:115 (fixup_bundle) I’ll try to provide sufficient yet minimal information to pinpoint the root cause of the problem. In my top CMakeLists.txt I have the following: set ( QT_REQUIRED_PACKAGES Core Gui Widgets ) set( QT_ROOT_PATH "/usr/local/Qt-5.5.1" ) set( QT_REQUIRED_PACKAGES ${QT_REQUIRED_PACKAGES} MacExtras ) set( QT_PLUGINS_DIR "${QT_ROOT_PATH}/plugins" ) set ( CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${QT_ROOT_PATH}/bin/" ) FOREACH(QT_PACKAGE ${QT_REQUIRED_PACKAGES}) set( QT_PACKAGE_WITH_PREFIX "Qt5${QT_PACKAGE}" ) set( "${QT_PACKAGE_WITH_PREFIX}_DIR" "${QT_ROOT_PATH}/lib/cmake/${QT_PACKAGE_WITH_PREFIX}" ) find_package( "${QT_PACKAGE_WITH_PREFIX}" REQUIRED ) include_directories( ${${QT_PACKAGE_WITH_PREFIX}_INCLUDE_DIRS} ) set_target_properties( "Qt5::${QT_PACKAGE}" PROPERTIES MAP_IMPORTED_CONFIG_DEBUG "DEBUG") set_target_properties( "Qt5::${QT_PACKAGE}" PROPERTIES MAP_IMPORTED_CONFIG_RELEASE "RELEASE") set_target_properties( "Qt5::${QT_PACKAGE}" PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RELEASE") ENDFOREACH(QT_PACKAGE) add_definitions( ${QT_DEFINITIONS} ) set( CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR} ) set( CMAKE_MACOSX_RPATH “" ) set_property( GLOBAL PROPERTY USE_FOLDERS ON ) add_subdirectory( someApplication ) in the someApplication CMakeLists.txt I have the following: set( someApplication_Qt_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ) set_target_properties( someApplication PROPERTIES INSTALL_RPATH "${QT_ROOT_PATH}/lib" ) foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) install( TARGETS someApplication DESTINATION bin/${OUTPUTCONFIG} CONFIGURATIONS ${OUTPUTCONFIG} ) endforeach() add_custom_command( TARGET someApplication POST_BUILD COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/LocalizationTools/someApplication/Debug/plugins/platforms/ ) add_custom_command( TARGET someApplication POST_BUILD COMMAND cp -Rf "${QT_PLUGINS_DIR}/platforms/libqcocoa_debug.dylib" ${CMAKE_INSTALL_PREFIX}/LocalizationTools/someApplication/Debug/plugins/platforms/ ) add_custom_command( TARGET someApplication POST_BUILD COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/LocalizationTools/someApplication/Release/plugins/platforms/ ) add_custom_command( TARGET someApplication POST_BUILD COMMAND cp -Rf "${QT_PLUGINS_DIR}/platforms/libqcocoa.dylib" ${CMAKE_INSTALL_PREFIX}/LocalizationTools/someApplication/Release/plugins/platforms/ ) add_custom_command( TARGET someApplication POST_BUILD COMMAND mkdir -p `dirname $`/../plugins ) add_custom_command( TARGET someApplication
[Cmake-commits] CMake branch, master, updated. v3.4.1-719-g4395190
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 4395190cd474f3e83139961d1271c766604e4a1c (commit) via ab8a280857da5cf8545bd2a6f69b7378f53449a5 (commit) via e8b148318f1fab26b2289cadc2d0c5e12201169d (commit) via cbbdfc2b6120e192b4248ce89af93cf34ea8a254 (commit) from 614c8a1c920083c3ae76ff035168f7096db6c510 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4395190cd474f3e83139961d1271c766604e4a1c commit 4395190cd474f3e83139961d1271c766604e4a1c Merge: 614c8a1 ab8a280 Author: Brad KingAuthorDate: Fri Dec 18 10:12:35 2015 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 18 10:12:35 2015 -0500 Merge topic 'CMakeParseArguments-native-impl' ab8a2808 cmake_parse_arguments: consider duplicate keyword as warning e8b14831 CMakeParseArguments: replace by native cmake_parse_arguments command cbbdfc2b CMakeParseArguments: add a RunCMake test suite --- Summary of changes: Help/command/cmake_parse_arguments.rst | 85 + Help/manual/cmake-commands.7.rst |1 + .../dev/CMakeParseArguments-native-impl.rst|6 + Modules/CMakeParseArguments.cmake | 148 +-- Source/cmBootstrapCommands1.cxx|2 + Source/cmParseArgumentsCommand.cxx | 192 ...riteFileCommand.h => cmParseArgumentsCommand.h} | 19 +- Tests/RunCMake/CMakeLists.txt |1 + .../CMakeLists.txt |0 .../cmake_parse_arguments/CornerCases.cmake| 15 ++ .../Errors-result.txt} |0 .../cmake_parse_arguments/Errors-stderr.txt| 44 + Tests/RunCMake/cmake_parse_arguments/Errors.cmake | 14 ++ .../cmake_parse_arguments/Initialization.cmake | 68 +++ Tests/RunCMake/cmake_parse_arguments/Mix.cmake | 24 +++ .../cmake_parse_arguments/RunCMakeTest.cmake |7 + Tests/RunCMake/cmake_parse_arguments/Utils.cmake | 20 ++ .../cmake_parse_arguments/test_utils.cmake | 20 ++ 18 files changed, 513 insertions(+), 153 deletions(-) create mode 100644 Help/command/cmake_parse_arguments.rst create mode 100644 Help/release/dev/CMakeParseArguments-native-impl.rst create mode 100644 Source/cmParseArgumentsCommand.cxx copy Source/{cmWriteFileCommand.h => cmParseArgumentsCommand.h} (74%) copy Tests/RunCMake/{Framework => cmake_parse_arguments}/CMakeLists.txt (100%) create mode 100644 Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => cmake_parse_arguments/Errors-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_parse_arguments/Errors-stderr.txt create mode 100644 Tests/RunCMake/cmake_parse_arguments/Errors.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/Initialization.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/Mix.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/Utils.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/test_utils.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, next, updated. v3.4.1-1794-g7dc60bb
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 7dc60bb47e942f702680217d4e5bf5ed34b06902 (commit) via 5ffdd37b7ff8279bf8cc5a007a541be0d7ff (commit) via 81e5bf2548f91adae813360aef8f7fa5cd2ef0b0 (commit) via 83a1f0a99b05d5f8d060d5777349a32d196be16d (commit) via 4395190cd474f3e83139961d1271c766604e4a1c (commit) via 614c8a1c920083c3ae76ff035168f7096db6c510 (commit) from 50e3373bfe154b3fd37d9e74f728552a1c012bfc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dc60bb47e942f702680217d4e5bf5ed34b06902 commit 7dc60bb47e942f702680217d4e5bf5ed34b06902 Merge: 50e3373 5ffdd37 Author: Brad KingAuthorDate: Fri Dec 18 10:12:54 2015 -0500 Commit: Brad King CommitDate: Fri Dec 18 10:12:54 2015 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.1-1788-g50e3373
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 50e3373bfe154b3fd37d9e74f728552a1c012bfc (commit) via a5dd0c9d427d66f7e361b0aa714a0a41b65ae4f0 (commit) from 22504521bd226abdb85db22fb036dea49d9816e0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50e3373bfe154b3fd37d9e74f728552a1c012bfc commit 50e3373bfe154b3fd37d9e74f728552a1c012bfc Merge: 2250452 a5dd0c9 Author: Brad KingAuthorDate: Fri Dec 18 10:07:37 2015 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 18 10:07:37 2015 -0500 Merge topic 'import-kwiml' into next a5dd0c9d Add option to use a system-installed KWIML https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5dd0c9d427d66f7e361b0aa714a0a41b65ae4f0 commit a5dd0c9d427d66f7e361b0aa714a0a41b65ae4f0 Author: Brad King AuthorDate: Fri Dec 18 09:57:55 2015 -0500 Commit: Brad King CommitDate: Fri Dec 18 10:02:28 2015 -0500 Add option to use a system-installed KWIML Do not activate it with the general use-system-libs options for now because KWIML is not commonly distributed or available. diff --git a/CMakeLists.txt b/CMakeLists.txt index 932d07e..9381f35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,8 +138,13 @@ macro(CMAKE_HANDLE_SYSTEM_LIBRARIES) option(CMAKE_USE_SYSTEM_FORM "Use system-installed libform" "${CMAKE_USE_SYSTEM_LIBRARY_FORM}") option(CMAKE_USE_SYSTEM_JSONCPP "Use system-installed jsoncpp" "${CMAKE_USE_SYSTEM_LIBRARY_JSONCPP}") + # For now use system KWIML only if explicitly requested rather + # than activating via the general system libs options. + option(CMAKE_USE_SYSTEM_KWIML "Use system-installed KWIML" OFF) + mark_as_advanced(CMAKE_USE_SYSTEM_KWIML) + # Mention to the user what system libraries are being used. - foreach(util ${UTILITIES}) + foreach(util ${UTILITIES} KWIML) if(CMAKE_USE_SYSTEM_${util}) message(STATUS "Using system-installed ${util}") endif() @@ -270,6 +275,20 @@ macro (CMAKE_BUILD_UTILITIES) # (a macro defined in this file) CMAKE_HANDLE_SYSTEM_LIBRARIES() + if(CMAKE_USE_SYSTEM_KWIML) +find_package(KWIML 1.0) +if(NOT KWIML_FOUND) + message(FATAL_ERROR "CMAKE_USE_SYSTEM_KWIML is ON but KWIML is not found!") +endif() +set(CMake_KWIML_LIBRARIES kwiml::kwiml) + else() +set(CMake_KWIML_LIBRARIES "") +if(BUILD_TESTING) + set(KWIML_TEST_ENABLE 1) +endif() +add_subdirectory(Utilities/KWIML) + endif() + #- # Build zlib library for Curl, CMake, and CTest. set(CMAKE_ZLIB_HEADER "cm_zlib.h") @@ -538,10 +557,10 @@ if("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x") set(CMAKE_TESTS_CDASH_SERVER "http://open.cdash.org;) endif() -if(BUILD_TESTING) +if(CMake_TEST_EXTERNAL_CMAKE) set(KWIML_TEST_ENABLE 1) + add_subdirectory(Utilities/KWIML) endif() -add_subdirectory(Utilities/KWIML) if(NOT CMake_TEST_EXTERNAL_CMAKE) # build the utilities (a macro defined in this file) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index f23331b..ab70568 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -566,6 +566,7 @@ target_link_libraries(CMakeLib cmsys ${CMAKE_TAR_LIBRARIES} ${CMAKE_COMPRESS_LIBRARIES} ${CMAKE_CURL_LIBRARIES} ${CMAKE_JSONCPP_LIBRARIES} + ${CMake_KWIML_LIBRARIES} ) # On Apple we need CoreFoundation diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in index 0cb6809..4c1177c 100644 --- a/Utilities/cmThirdParty.h.in +++ b/Utilities/cmThirdParty.h.in @@ -15,6 +15,7 @@ /* Whether CMake is using its own utility libraries. */ #cmakedefine CMAKE_USE_SYSTEM_CURL #cmakedefine CMAKE_USE_SYSTEM_EXPAT +#cmakedefine CMAKE_USE_SYSTEM_KWIML #cmakedefine CMAKE_USE_SYSTEM_ZLIB #cmakedefine CMAKE_USE_SYSTEM_BZIP2 #cmakedefine CMAKE_USE_SYSTEM_LIBARCHIVE diff --git a/Utilities/cm_kwiml.h b/Utilities/cm_kwiml.h index 2e1a108..ab2b80b 100644 --- a/Utilities/cm_kwiml.h +++ b/Utilities/cm_kwiml.h @@ -12,7 +12,14 @@ #ifndef cm_kwiml_h #define cm_kwiml_h -#include "KWIML/include/kwiml/abi.h" -#include "KWIML/include/kwiml/int.h" +/* Use the KWIML library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_KWIML +# include +# include +#else +# include "KWIML/include/kwiml/abi.h" +# include "KWIML/include/kwiml/int.h" +#endif #endif diff --git a/Utilities/cmjsoncpp/CMakeLists.txt b/Utilities/cmjsoncpp/CMakeLists.txt index 1c863f8..d0114e7 100644 ---
[Cmake-commits] CMake branch, master, updated. v3.4.1-734-gf9e3ca4
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 f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 (commit) via 24cdb9df598a1c10fffc718255527729595442a1 (commit) via de77d4a741c84e0b5774e79a0c84e945e25ad9f8 (commit) via 38d723b37e660223a9c8a125cf01ae5a6c9977ba (commit) from 5ffdd37b7ff8279bf8cc5a007a541be0d7ff (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 commit f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 Merge: 5ffdd37 24cdb9d Author: Brad KingAuthorDate: Fri Dec 18 10:55:35 2015 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 18 10:55:35 2015 -0500 Merge topic 'release-wix-config-ng' 24cdb9df CMake: Mimic NSIS options dialog in WiX installer de77d4a7 CPackWIX: Allow multiple patch files and diagnose if any are missing 38d723b3 CPackWIX: Allow patching of shortcut components --- Summary of changes: CMakeCPackOptions.cmake.in | 29 +- Modules/CPackWIX.cmake |3 +- Source/CPack/WiX/cmCPackWIXGenerator.cxx | 13 - Source/CPack/WiX/cmWIXPatch.cxx| 12 +++- Source/CPack/WiX/cmWIXPatch.h |2 +- {Modules => Utilities/Release/WiX}/WIX.template.in |5 +- Utilities/Release/WiX/cmake_extra_dialog.wxs | 36 Utilities/Release/WiX/install_dir.wxs | 61 Utilities/Release/WiX/patch_desktop_shortcut.xml |5 ++ Utilities/Release/WiX/patch_path_env.xml | 26 + .../{cpack_wix_ui_banner.jpg => WiX/ui_banner.jpg} | Bin 2607 -> 2607 bytes .../{cpack_wix_ui_dialog.jpg => WiX/ui_dialog.jpg} | Bin 13369 -> 13369 bytes 12 files changed, 182 insertions(+), 10 deletions(-) copy {Modules => Utilities/Release/WiX}/WIX.template.in (86%) create mode 100644 Utilities/Release/WiX/cmake_extra_dialog.wxs create mode 100644 Utilities/Release/WiX/install_dir.wxs create mode 100644 Utilities/Release/WiX/patch_desktop_shortcut.xml create mode 100644 Utilities/Release/WiX/patch_path_env.xml rename Utilities/Release/{cpack_wix_ui_banner.jpg => WiX/ui_banner.jpg} (100%) rename Utilities/Release/{cpack_wix_ui_dialog.jpg => WiX/ui_dialog.jpg} (100%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.1-1798-gb6883ac
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 b6883ac381657dd855dfe9a8cda76b040a225dcf (commit) via f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 (commit) from 9c8fbca2ea642d32ba3a6e4e0324c2d9874c0baa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6883ac381657dd855dfe9a8cda76b040a225dcf commit b6883ac381657dd855dfe9a8cda76b040a225dcf Merge: 9c8fbca f9e3ca4 Author: Brad KingAuthorDate: Fri Dec 18 10:55:45 2015 -0500 Commit: Brad King CommitDate: Fri Dec 18 10:55:45 2015 -0500 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [cmake-developers] parallel install of different cmake versions
On 12/17/2015 10:05 PM, Orion Poplawski wrote: > I'm not sure this would work. There seems to be many places in the code > (some of which the patch addresses) where it calls executes "cmake" or > "ctest" regardless of the name it was called with. AFAIK those all use an absolute path. We don't depend on finding ourself in the PATH. I frequently run "cmake" via an absolute path without any "cmake" in the PATH. I also frequently run "cmake" via an alias of a different name with a different version of "cmake" in the PATH. If you find places where this is not true then we can fix those, but I run cmake this way every day since I keep so many versions around for testing. -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] FindBoost: Boost 1.60 support
On 12/17/2015 06:05 PM, Roger Leigh wrote: > With the release of Boost 1.60, I've updated FindBoost to work with this > version. > > Pushed to > https://cmake.org/gitweb?p=stage/cmake.git;a=shortlog;h=refs/heads/boost-1.60 > and merged into next for review. Looks good, thanks! -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[Cmake-commits] CMake branch, master, updated. v3.4.1-730-g5ffdd37
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 5ffdd37b7ff8279bf8cc5a007a541be0d7ff (commit) via 0a31fdabecd2724d456aef0664ad7da1ca28f359 (commit) from 81e5bf2548f91adae813360aef8f7fa5cd2ef0b0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ffdd37b7ff8279bf8cc5a007a541be0d7ff commit 5ffdd37b7ff8279bf8cc5a007a541be0d7ff Merge: 81e5bf2 0a31fda Author: Brad KingAuthorDate: Fri Dec 18 10:12:44 2015 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 18 10:12:44 2015 -0500 Merge topic 'boost-1.60' 0a31fdab FindBoost: Add support for Boost 1.60 --- Summary of changes: Modules/FindBoost.cmake | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.1-1782-g46b3d79
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 46b3d791b50efad69db00959244b2f8f738776f5 (commit) via fa0cd33d066bd789e8c04f24547905c78dc2cc69 (commit) from 1d104f29c75e8cb264b94bd1fa916ae769e4cb18 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46b3d791b50efad69db00959244b2f8f738776f5 commit 46b3d791b50efad69db00959244b2f8f738776f5 Merge: 1d104f2 fa0cd33 Author: Brad KingAuthorDate: Fri Dec 18 09:16:04 2015 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 18 09:16:04 2015 -0500 Merge topic 'import-kwiml' into next fa0cd33d fixup! Port CMake from cmIML to KWIML https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa0cd33d066bd789e8c04f24547905c78dc2cc69 commit fa0cd33d066bd789e8c04f24547905c78dc2cc69 Author: Brad King AuthorDate: Fri Dec 18 08:24:10 2015 -0500 Commit: Brad King CommitDate: Fri Dec 18 09:13:44 2015 -0500 fixup! Port CMake from cmIML to KWIML diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index 2adf317..db64559 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -36,7 +36,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION "LINK : warning LNK4089: all references to.*SHELL32.dll.*discarded by /OPT:REF" "LINK : warning LNK4089: all references to.*USER32.dll.*discarded by /OPT:REF" "LINK : warning LNK4089: all references to.*ole32.dll.*discarded by /OPT:REF" - "Warning.*: .*/Utilities/KWIML/test/test_INT_format.h.* # Redundant preprocessing concatenation" + "Warning.*: .*/Utilities/KWIML/test/test_int_format.h.* # Redundant preprocessing concatenation" "Warning: library was too large for page size.*" "Warning: public.*_archive_.*in module.*archive_*clashes with prior module.*archive_.*" "Warning: public.*BZ2_bz.*in module.*bzlib.*clashes with prior module.*bzlib.*" diff --git a/bootstrap b/bootstrap index cb712c8..8b7a611 100755 --- a/bootstrap +++ b/bootstrap @@ -1282,13 +1282,8 @@ for a in ${KWSYS_FILES}; do "${cmake_bootstrap_dir}/cmsys/${a}" KWSYS_NAMESPACE cmsys done -cmake_generate_file "${cmake_bootstrap_dir}/cm_kwiml.h" " -#include \"${cmake_source_dir}/Utilities/KWIML/include/kwiml/abi.h\" -#include \"${cmake_source_dir}/Utilities/KWIML/include/kwiml/int.h\" -" - # Generate Makefile -dep="cmConfigure.h cm_kwiml.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h" +dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h" objs="" for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do objs="${objs} ${a}.o" @@ -1328,9 +1323,9 @@ cmake_cxx_flags_SystemTools=" -DKWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES} " cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \ - -I`cmake_escape \"${cmake_bootstrap_dir}\"`" + -I`cmake_escape \"${cmake_source_dir}/Utilities\"`" cmake_cxx_flags="${cmake_cxx_flags} -I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \ - -I`cmake_escape \"${cmake_bootstrap_dir}\"`" + -I`cmake_escape \"${cmake_source_dir}/Utilities\"`" echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile" echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" for a in ${CMAKE_CXX_SOURCES}; do --- Summary of changes: CTestCustom.cmake.in |2 +- bootstrap| 11 +++ 2 files changed, 4 insertions(+), 9 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[CMake] Is there a way to disable adding extra libraries at the end of a link line?
Working on a just delivered Cray I am again challenged by the way that CMake adds libraries to the end of the link line that I did not specify. The Cray requires use of the compiler wrappers. After adding the appropriate libraries (hdf5, z) to my target, the link line is /opt/cray/craype/2.4.2/bin/CC -DMPICH_IGNORE_CXX_SEEK -std=c++11 -O3 -DNDEBUG -msse2 CMakeFiles/io.dir/io.cxx.o -o io -L/opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib ../libtxio.a ../../txstreams/libtxstreams.a /opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib/libhdf5.a -Wl,-Bstatic -lz -Wl,-Bdynamic /opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib/libhdf5.a -Wl,-Bstatic -lz -Wl,-Bdynamic -Wl,-rpath,/opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib and the link fails with ld: dynamic STT_GNU_IFUNC symbol `strcmp' with pointer equality in `/usr/lib/../lib64/libc.a(strcmp.o)' can not be used when making an executable; recompile with -fPIE and relink with -pie Now I believe that Cray has the appropriate libraries in its compiler wrapper, because if I just link without all the additions: /opt/cray/craype/2.4.2/bin/CC -DMPICH_IGNORE_CXX_SEEK -std=c++11 -O3 -DNDEBUG -msse2 CMakeFiles/io.dir/io.cxx.o -o io -L/opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib ../libtxio.a ../../txstreams/libtxstreams.a /opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib/libhdf5.a -lz it all just works. Is there a way to tell cmake not to append "-Wl,-Bdynamic /opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib/libhdf5.a -Wl,-Bstatic -lz -Wl,-Bdynamic -Wl,-rpath,/opt/cray/hdf5-parallel/1.8.14/INTEL/14.0/lib" to the link line and not to insert -Wl,-Bstatic in front of -lz ? ThxJohn Cary -- 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] Feature request: expose curl to cmake -E
It would be nice to have curl as a platform-independent command like 'md5sum', 'tar', and 'compare_files'. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [cmake-developers] parallel install of different cmake versions
On 2015-12-17 20:16-0700 Orion Poplawski wrote: On 12/14/2015 08:56 AM, Eric Noulard wrote: +1 Personnally when I installed several version of CMake I do install them with a particular prefix and then I use update-alternatives(1) to install proper symlinks to the specific location. I switch from one version to another using update-alternatives(1). This can certainly be used on Fedora/EPEL as well: https://fedoraproject.org/wiki/Packaging:Alternatives Hi Orion: I don't have any Fedora or rpm expertise to add, but like Brad I use multiple versions of cmake all the time without cross-talk between them. In my case I just install them with a separate installation prefix, and put the cmake version that I want on my PATH. I have investigated further what is installed in one of those prefixes. For CMake-3.3.2, most files are installed under $PREFIX/doc/cmake-3.3 and $PREFIX/share/cmake-3.3 so (subject to potential renaming to new locations by the cmake specfile) there is no chance of the installation of these files to clash between cmake major versions. That leaves a small number of additional files which are not identified by "cmake-3.3" in their pathname which are installed with the following names: $PREFIX/share/applications/CMake.desktop $PREFIX/share/icons/hicolor/32x32/apps/CMakeSetup.png $PREFIX/share/icons/hicolor/128x128/apps/CMakeSetup.png $PREFIX/share/mime/packages/cmakecache.xml $PREFIX/share/aclocal/cmake.m4 $PREFIX/bin/ccmake $PREFIX/bin/cmake $PREFIX/bin/cpack $PREFIX/bin/ctest $PREFIX/bin/cmake-gui So the cmake specfile would likely have to do something special with the first 5 of these files to avoid clashes, and the final 5 executables would have to be handled using the alternatives mechanism that is explained in the above URL given to you by Eric. Yes, but this cannot be done in rpm spec files for building other packages (as would be done in EPEL). Perhaps we could leverage environment-modules, but this would be a bit of a departure. I don't understand this remark. If Fedora has already packaged multiple non-clashing versions of cmake as above, then surely all you have to do as a specfile maintainer of a given package that uses a specific major version of CMake to build the package is to have the specfile run a script before the build that runs update-alternatives (or whatever the equivalent name of that Debian application is on Fedora) to select the major CMake version that is required for the package build? Alan __ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __ Linux-powered Science __ -- 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] structured introduction to CMake?
some CMake introductory references: CMake's own Tutorial: https://cmake.org/cmake-tutorial/ (probably want to start here) Mastering CMake (by Kitware): http://www.amazon.com/Mastering-CMake-Ken-Martin/dp/1930934319/ref=sr_1_1?s=books=UTF8=1450465685=1-1 Introduction to CMake: http://www.amazon.com/Introduction-CMake-Software-Tool-Book-ebook/dp/B00KE807Q0/ref=la_B00GPU8HLS_1_1?s=books=UTF8=1450465758=1-1 John Lamp's CMake Tutorial: https://www.johnlamp.net/cmake-tutorial.html Eric Noulard's Tutorial Presentation: https://github.com/TheErk/CMake-tutorial Jan Engels' CMake Tutorial: http://docslide.us/documents/cmake-tutorial.html Daniel Pfeifer's CMake Introduction and best practices: http://www.slideshare.net/DanielPfeifer1/cmake-48475415 On Thu, Dec 17, 2015 at 11:10 AM, Victoriouswrote: > Hi, > > > > While there’s plenty of documentation for CMake, it seems to be targeted > more towards experienced users, and is in the style of reference > documentation. I haven’t been able to find many good tutorials that teach > the concepts incrementally, e.g how the custom scripting language works etc. > > > > Does anyone have any suggestions on where I could look? > > > > Thanks, > > -Vic > > > -- > > Powered by www.kitware.com > > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit: > > CMake Support: http://cmake.org/cmake/help/support.html > CMake Consulting: http://cmake.org/cmake/help/consulting.html > CMake Training Courses: http://cmake.org/cmake/help/training.html > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] CMake, QT5 and cross compilation
Maybe you can do something with the ‘HINTS’ option to find_package()? https://cmake.org/cmake/help/v3.4/command/find_package.html Sincerely, Jakob > On 17 Dec 2015, at 18:03, Hauke Krügerwrote: > > Hi everybody, > > I have a project which builds to realize a Qt5 application. I use the > latest CMAKE Qt5 mechanisms such as AUTOMOC etc with good success. > > The project builds on Raspberry Pi if cmake is run on the Raspberry Pi > itself since all Qt tools are available and run also on the Raspberry Pi. > > Lately, I wanted to compile this project in a cross compile approach. > For this purpose, I mount the Raspberry Pi file system to be part of the > directory tree on my host Linux PC. > Of course, I use find_package to locate the Qt5 package in the directory > branch related to the Raspberry Pi. The corresponding > moc, uic and rcc tools have been built for arm. Therefore, I can not > run the moc from the location as reported by find_package in the cross > build approach. > > So, here is my question: How can I overwrite the moc-executable (and uic > etc) path to use another moc version than the one found by the > find_package mechanism? If I use the moc which is part of my Linux host > PC rather than the arm compiled moc in the Raspberry file system, the > code generation should be fine, and afterwards, I will link against the > Raspberry Pi Qt5 libraries. > > Thank you for any help and best regards > > Hauke > > -- > > Powered by www.kitware.com > > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit: > > CMake Support: http://cmake.org/cmake/help/support.html > CMake Consulting: http://cmake.org/cmake/help/consulting.html > CMake Training Courses: http://cmake.org/cmake/help/training.html > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[CMake] build order
If you download, compile and install a cmake project through external project How can I make sure that the external project is built before something that depends on that external project? -- 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] Generate sources
On 16/12/15 17:53, Mark Stijnman wrote: On Wed, Dec 16, 2015 at 2:29 PM, Layus> wrote: Hi, I am looking for a way to share an archive of a partially compiled project to speedup compilation time and configuration hassle for the users. I have a project that works in two steps. First a source generator is built (based on clang) and generates some extra source files based on the existing source files. Then the normal compilation process takes places, building the application from both original and generated sources. Now, is it possible to distribute a source archive with the generated sources, in such a way that any user unpacking the archive and running cmake would not have to generate the extra sources ? This would be useful because i) the project is tricky to configure and ii) the generated sources are not dependent on the user config, so building the generator is just useless computation time on the user. The ideal scheme would be something like [developper] $ cmake -DCLANG=config $ make generate $ make package_source [user] $ unpack $ cmake -DUSER=config $ make # builds only the application, reusing the shipped generated sources. $ make install ... but when the user runs cmake, he overwrites the generated Makefiles and the extra sources are generated again. Any idea ? layus. -- I'd probably just make it such that the CMake script automatically detects the presence of the generated files, and if they don't exist, generate them. For example: 1. Set a variable GENERATED_FOLDER to ${CMAKE_CURRENT_SOURCE_DIR}/generated 2. If ${GENERATED_FOLDER} doesn't exist, set it to ${CMAKE_CURRENT_BINARY_DIR}/generated instead, and set up the targets that will generate the files in that folder. 3. Simply use the ${GENERATED_FOLDER} variable to add the generated files to your application. 4. Set up the package_source target so that it packages the files from ${GENERATED_FOLDER} to a folder called "generated" (such that if a user unpacks from there, they will end up in ${CMAKE_CURRENT_SOURCE_DIR}/generated), and you're done. 5. Recommended: add a check for the existence of target "generate", and if so, set it as a dependency for your application and package_source. This way, you don't need to remember what switches to use, or when to use "make generate". If you need to make it possible for a user to force generation, you can alter step 2 to also run when a command line option is supplied. Hope that helps, Best regards Mark Works like a charm. (See https://github.com/layus/mozart2/tree/cache_generated_code) Thanks ! -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Feature request: expose curl to cmake -E
On Fri, Dec 18, 2015 at 2:18 PM, Jakob van Bethlehemwrote: > Depending on what you precisely wish to achieve, maybe file(DOWNLOAD) already > fits your needs? > https://cmake.org/cmake/help/v3.1/command/file.html It does, generally, in the way that ExternalProject also fits, but I think would require writing wrapper scripts. My specific use case was something like: cmake -E curl http://jenkins/buildA/artifacts/stuff.tar cmake -E tar xzf stuff.tar cmake -Hstuff/path/to/CMakeLists/ -Bbuild_dir cmake --build build_dir I thought 'curl' is sort of at the level of 'tar', in being a useful tool that could be exposed fairly easily in a cmake portable command. Those portable commands are another thing that CMake offers that makes working on Windows a little easier, if you don't already have Cygwin or the like. -- 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] Feature request: expose curl to cmake -E
Depending on what you precisely wish to achieve, maybe file(DOWNLOAD) already fits your needs? https://cmake.org/cmake/help/v3.1/command/file.html Sincerely, Jakob van Bethlehem > On 18 Dec 2015, at 19:59, iosif neitzkewrote: > > It would be nice to have curl as a platform-independent command like > 'md5sum', 'tar', and 'compare_files'. > -- > > Powered by www.kitware.com > > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit: > > CMake Support: http://cmake.org/cmake/help/support.html > CMake Consulting: http://cmake.org/cmake/help/consulting.html > CMake Training Courses: http://cmake.org/cmake/help/training.html > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[cmake-developers] Can't find correct openssl on Windows
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I have a small problem: when I try to search for my self-built openssl, cmake always prefers the slproweb.com packages instead of my own ones (even when setting OPENSSL_ROOT_DIR). This is due to the different naming of the libraries in the slproweb installation: There, you'll find ssleay32MD.lib vs. ssleay32.lib in my location. I already opened a bug report for that: https://public.kitware.com/Bug/view.php?id=15887 I attached a patch both here and at the bug report which fixes this behaviour for the cost of having an additional and ugly option for the FindOpenSSL.cmake file. I don't see a different solution, as the no-MD/MT version of the library is the backup solution (although the one I would prefer in this case). If you have any other idea, please let me know. regards, Patrick -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.21 (MingW32) iQIcBAEBAgAGBQJWdKmJAAoJEPAKI6QtGt1xB60QAIyVhBdjiqT/yRKE2GsCTj2o xdOKlyMJ8BozJB5KP34QndzVCpKEsC+rs8UStKjk7N0P5Qly3URuRTKG375wDXw1 3d1unxDfDUplTj/vCKjzKFD9lZxmACkJ9/9MHy7jhjWfYIxFUbxDMQvMWnzsSgSZ daC0lxG65ggUBpYtA32TeM9GP2zB8ebAd6gSoDN+Iz3bJrl5cWvb1fom1nh0+2XV fjGQ23yeraJGpzMF96siPXuk9XFoJvQfShIn2cBILjWHqr+NohlPayY6qQkFz4C5 Ock9aMwAYhhbVmJzFWho2A1+qFYGJq0fLnS1Qb/+uJg7GTtI8bC/PQynnbkt+q93 jP7UwlKzqFHUhlhkO7gmTZv8np3bxLUNYTblZvCED1iF4kdlzCwbeNfIqf5y4zev ndInmEqvsODZwshcOqRFbX1nxq93/ZVUAaNy9ESlOBiL6xB2qHl+WOq4vNjZdh7w Pav2UqiEpmyC/x8aFfafrkDDEY4pMf6J/s0U21M8QMXQXw/QErFF8pLGXszLFrqz vJc+M3j45AZ9TLu86Uwekt6Z9WAtfXtfvQGaVH5bSicz7UBopjW5oX+U+3VO83Sa 0vwSmDNbOIo7YVmjtMc4d1xJwYWsbAQ1tXnfUgk66LGZStOHzjYWhUAFoAXZGOCV S4jiUpisEtRhtJSOkNoG =nozd -END PGP SIGNATURE- From 9fd1bfa174a8c8a5e63d875492ed01e7df34d1d7 Mon Sep 17 00:00:00 2001 From: Patrick SpendrinDate: Sat, 19 Dec 2015 01:16:15 +0100 Subject: [PATCH] Make it possible to ignore slproweb OpenSSL slproweb binary installations are found by default and their file naming convention is preferred over the ones openssl generates by default (without MD/MT). This change makes it possible to only find libraries without MD/MT by setting OPENSSL_MSVC_NO_RT_MODE=TRUE --- Modules/FindOpenSSL.cmake | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 8b4b988..c78896b 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -38,6 +38,7 @@ # Set ``OPENSSL_ROOT_DIR`` to the root directory of an OpenSSL installation. # Set ``OPENSSL_USE_STATIC_LIBS`` to ``TRUE`` to look for static libraries. # Set ``OPENSSL_MSVC_STATIC_RT`` set ``TRUE`` to choose the MT version of the lib. +# Set ``OPENSSL_MSVC_NO_RT_MODE`` set ``TRUE`` to use libraries without MD / MT in their name. #= # Copyright 2006-2009 Kitware, Inc. @@ -108,7 +109,6 @@ find_path(OPENSSL_INCLUDE_DIR PATH_SUFFIXES include ) - if(WIN32 AND NOT CYGWIN) if(MSVC) # /MD and /MDd are the standard values - if someone wants to use @@ -127,10 +127,14 @@ if(WIN32 AND NOT CYGWIN) # ssleay32MD.lib is identical to ../ssleay32.lib # enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static -if (OPENSSL_MSVC_STATIC_RT) - set(_OPENSSL_MSVC_RT_MODE "MT") +if (NOT OPENSSL_MSVC_NO_RT_MODE) + if (OPENSSL_MSVC_STATIC_RT) +set(_OPENSSL_MSVC_RT_MODE "MT") + else () +set(_OPENSSL_MSVC_RT_MODE "MD") + endif () else () - set(_OPENSSL_MSVC_RT_MODE "MD") + set(_OPENSSL_MSVC_RT_MODE "") endif () if(OPENSSL_USE_STATIC_LIBS) -- 2.6.3.windows.1 0001-Make-it-possible-to-ignore-slproweb-OpenSSL.patch.sig Description: Binary data -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015887]: FindOpenssl can't find self built openssl but prefers slproweb openssl
The following issue has been SUBMITTED. == https://public.kitware.com/Bug/view.php?id=15887 == Reported By:Patrick Spendrin Assigned To: == Project:CMake Issue ID: 15887 Category: Modules Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2015-12-18 19:44 EST Last Modified: 2015-12-18 19:44 EST == Summary:FindOpenssl can't find self built openssl but prefers slproweb openssl Description: When having a pre-built package of openssl installed from slproweb.com and you try to find a self-built openssl package in a different location, the slproweb stuff is always preferred. Steps to Reproduce: 1) Install slproweb openssl development package (including import libraries and headers). 2a) Build openssl yourself or 2b) copy over the include directory and the lib directory from the slproweb location and delete the VC and the MinGW folder inside the lib dir. 3) run find_package(OpenSSL) -> you will not be able to find the new location, which contains both ssleay32.lib and libeay32.lib Additional Information: The problem occurs because ssleay32MD.lib/ssleay32MT.lib and libeay32MD.lib/libeay32MT.lib are searched before trying to find ssleay32.lib and libeay32.lib. Since the registry paths are by default in the HINTS section, these will be used first. Attached patch fixes this by providing an option OPENSSL_MSVC_NO_RT_MODE which disables searching for MD/MT libraries. == Issue History Date ModifiedUsername FieldChange == 2015-12-18 19:44 Patrick SpendrinNew Issue 2015-12-18 19:44 Patrick SpendrinFile Added: 0001-Make-it-possible-to-ignore-slproweb-OpenSSL.patch == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[CMake] Change the linker and archiver for cmake?
Hello, How does one select the linker and archiver for use with cmake? I can change my C compiler by doing this 'CC=icc cmake ..', but I would also like to use the Intel archiver and linker (xiar and xild). Thank you for the advices. -- 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] Change the linker and archiver for cmake?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am 19.12.2015 um 01:48 schrieb digitalriptide: > Hello, > > How does one select the linker and archiver for use with cmake? I > can change my C compiler by doing this 'CC=icc cmake ..', but I > would also like to use the Intel archiver and linker (xiar and > xild). > > Thank you for the advices. > There has been a similar question: https://cmake.org/pipermail/cmake/2014-August/058268.html In short: You have to provide new linker rules to cmake to replace the current default (linking using the compiler itself). I hope that helps a bit. regards, Patrick -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.21 (MingW32) iQIcBAEBAgAGBQJWdLCNAAoJEPAKI6QtGt1x6skP/3daLIg7qc+al33pWJeFY9LM UCvIuZ2CO5HVj/oKDYqi22ae+751HVQ9t39X5oe5xtcNXeITjl+uX02Uw4h772jt Hb25dZWXG8wAovuofEHuI273qNpOfUtY/tvRxzbMCf8dxXYfp45p5uE+NBeTZ23w QxcKyZv6ixmd8npwu1nsesGDmeMzB8DkzUFUPykUAqV2m/xuOH1FLmJ3wSwmnlTl Uq5QWnJmOmduh6XJYK58NxGrnZkDV0Hy1km+tGnKBNoNwpG0bHNQLqJFWf2FGP4S S4nHWhjmROwFbLT6iRdqk0uyzCnYHlA2cwIYvMipLTaCxZNvdeDZK9rZps1CiqsL cA82IC4mP4Ivtv6qw+2QqOIlQ+dbjLlCG44mm5SKHf9BF+JYuj6REAuv6QdTdOJ1 A2u4NRugxzebwsUyOPO5DzJZeVv7hSB9ivtB9qI4yOrKGh9Eg73x+ptPPrAsLxn6 9xAN2TnIUIkFxlf450GC2pEBuf/n25eyTbby6dVtbO9ADtQ4Y0uyTR+5lSRhTPpC vpACrHBCJNdqPMLEAVYkmjnAZxm9LvxVNQjwW5SN/yHHOlOgElI8dk/CvphvYiz9 miQz1EQiQjS/RFl876brpAbTq33rBn+EEYJD8hHRaaAflaL9CA7c6+h4A4X4DJ7e Z86rA5CPliKgmQdNR3ub =7D3M -END PGP SIGNATURE- -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[CMake] Tests with assert and Release build type
I'm sure I'm not the first one to run into the conflict between a desire to test the code shipped to customers and the desire to at the same time define NDEBUG to make sure tests don't have their `assert` turned into NOOPs. Is there some nice way of handling this? I can always remove -DNDEBUG from the CFLAGS for tests (possibly by defining a new macro, `ADD_EXECUTABLE_TEST()` or something). Another option is to `#undef NDEBUG` in the source of tests. If there's some more or less standard way to address this I'd like to use that. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus There's a big difference between making something easy to use and making it productive. -- Adam Bosworth signature.asc Description: PGP signature -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.4.1-1784-ge8e36aa
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 e8e36aac89d44f7d6bfeecf795b9c662f1e5f3b0 (commit) via ce359e539d5591535cb11a7dc59cc19b0b716a3d (commit) from 46b3d791b50efad69db00959244b2f8f738776f5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8e36aac89d44f7d6bfeecf795b9c662f1e5f3b0 commit e8e36aac89d44f7d6bfeecf795b9c662f1e5f3b0 Merge: 46b3d79 ce359e5 Author: Brad KingAuthorDate: Fri Dec 18 09:18:32 2015 -0500 Commit: CMake Topic Stage CommitDate: Fri Dec 18 09:18:32 2015 -0500 Merge topic 'import-kwiml' into next ce359e53 fixup! Port CMake from cmIML to KWIML https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce359e539d5591535cb11a7dc59cc19b0b716a3d commit ce359e539d5591535cb11a7dc59cc19b0b716a3d Author: Brad King AuthorDate: Fri Dec 18 09:17:57 2015 -0500 Commit: Brad King CommitDate: Fri Dec 18 09:17:57 2015 -0500 fixup! Port CMake from cmIML to KWIML diff --git a/bootstrap b/bootstrap index 8b7a611..860b5e4 100755 --- a/bootstrap +++ b/bootstrap @@ -450,18 +450,6 @@ cmake_error() exit ${res} } -cmake_generate_file () -{ - OUTFILE="$1" - CONTENT="$2" - echo "$CONTENT" > "$OUTFILE.tmp" - if "${_diff}" "$OUTFILE.tmp" "$OUTFILE" > /dev/null 2> /dev/null ; then -rm -f "$OUTFILE.tmp" - else -mv -f "$OUTFILE.tmp" "$OUTFILE" - fi -} - # Replace KWSYS_NAMESPACE with cmsys cmake_replace_string () { --- Summary of changes: bootstrap | 12 1 file changed, 12 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [CMake] fixup bundle vs Qy 5.5.1 and rpaths
It appears you need to add the directory(ies) in the Qt installation containing the Qt libraries to your DIRS. set( DIRS ${APP}/Contents/plugins/platforms ${QT_BINARY_DIR} ${QT_LIBRARY_DIR} ) I think it should have been that way, even with Qt 5.3. Clint - On Dec 18, 2015, at 6:12 AM, Gregory Van Voorenwrote: > I have a project containing several applications (which are sub projects), > each > of which links against some Qt libraries which are built as dylibs, but are > not > part of the project. Qt libraries and headers are found using find-package > which is working perfectly. > I’m currently trying to switch from Qt 5.3.1 to Qt 5.5.1, but am experiencing > problems with fixup_bundle on OS X (everything else seems to work fine). > As far as I’ve gathered Qt has introduced support for rpaths between those two > version and this seems to be the cause of my problems. > Building a single application works and said application starts up correctly, > but building the install target will give me the following output: > -- fixup_bundle: preparing... > -- > warning: cannot resolve item 'libQt5Core_debug.5.dylib' > possible problems: > need more directories? > need to use InstallRequiredSystemLibraries? > run in install tree instead of build tree? > -- warning: gp_resolved_file_type non-absolute file 'libQt5Core_debug.5.dylib' > returning type 'other' -- possibly incorrect > -- > warning: cannot resolve item 'libQt5Core_debug.5.dylib' > possible problems: > need more directories? > need to use InstallRequiredSystemLibraries? > run in install tree instead of build tree? > warning: target 'libQt5Core_debug.5.dylib' is not absolute... > warning: target 'libQt5Core_debug.5.dylib' does not exist... > CMake Error at > /Applications/CMake.app/Contents/share/cmake-3.4/Modules/GetPrerequisites.cmake:800 > (message): > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool > failed: 1 > error: > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool: > can't open file: libQt5Core_debug.5.dylib (No such file or directory) > Call Stack (most recent call first): > /Applications/CMake.app/Contents/share/cmake-3.4/Modules/GetPrerequisites.cmake:925 > (get_prerequisites) > /Applications/CMake.app/Contents/share/cmake-3.4/Modules/BundleUtilities.cmake:555 > (get_prerequisites) > /Applications/CMake.app/Contents/share/cmake-3.4/Modules/BundleUtilities.cmake:804 > (get_bundle_keys) > someApplication/someApplication/cmake_install.cmake:115 (fixup_bundle) > I’ll try to provide sufficient yet minimal information to pinpoint the root > cause of the problem. > In my top CMakeLists.txt I have the following: > set ( > QT_REQUIRED_PACKAGES > Core > Gui > Widgets > ) > set( QT_ROOT_PATH "/usr/local/Qt-5.5.1" ) > set( QT_REQUIRED_PACKAGES ${QT_REQUIRED_PACKAGES} MacExtras ) > set( > QT_PLUGINS_DIR > "${QT_ROOT_PATH}/plugins" > ) > set ( CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${QT_ROOT_PATH}/bin/" ) > FOREACH(QT_PACKAGE ${QT_REQUIRED_PACKAGES}) > set( QT_PACKAGE_WITH_PREFIX "Qt5${QT_PACKAGE}" ) > set( "${QT_PACKAGE_WITH_PREFIX}_DIR" > "${QT_ROOT_PATH}/lib/cmake/${QT_PACKAGE_WITH_PREFIX}" ) > find_package( "${QT_PACKAGE_WITH_PREFIX}" REQUIRED ) > include_directories( ${${QT_PACKAGE_WITH_PREFIX}_INCLUDE_DIRS} ) > set_target_properties( "Qt5::${QT_PACKAGE}" PROPERTIES > MAP_IMPORTED_CONFIG_DEBUG > "DEBUG") > set_target_properties( "Qt5::${QT_PACKAGE}" PROPERTIES > MAP_IMPORTED_CONFIG_RELEASE "RELEASE") > set_target_properties( "Qt5::${QT_PACKAGE}" PROPERTIES > MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RELEASE") > ENDFOREACH(QT_PACKAGE) > add_definitions( ${QT_DEFINITIONS} ) > set( CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR} ) > set( CMAKE_MACOSX_RPATH “" ) > set_property( GLOBAL PROPERTY USE_FOLDERS ON ) > add_subdirectory( someApplication ) > in the someApplication CMakeLists.txt I have the following: > set( > someApplication_Qt_LIBRARIES > ${Qt5Core_LIBRARIES} > ${Qt5Widgets_LIBRARIES} > ) > set_target_properties( someApplication PROPERTIES INSTALL_RPATH > "${QT_ROOT_PATH}/lib" ) > foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) > install( TARGETS someApplication DESTINATION bin/${OUTPUTCONFIG} > CONFIGURATIONS > ${OUTPUTCONFIG} ) > endforeach() > add_custom_command( TARGET someApplication POST_BUILD COMMAND mkdir -p > ${CMAKE_INSTALL_PREFIX}/LocalizationTools/someApplication/Debug/plugins/platforms/ > ) > add_custom_command( TARGET someApplication POST_BUILD COMMAND cp -Rf > "${QT_PLUGINS_DIR}/platforms/libqcocoa_debug.dylib" > ${CMAKE_INSTALL_PREFIX}/LocalizationTools/someApplication/Debug/plugins/platforms/ > ) > add_custom_command( TARGET someApplication POST_BUILD COMMAND mkdir -p > ${CMAKE_INSTALL_PREFIX}/LocalizationTools/someApplication/Release/plugins/platforms/ > ) > add_custom_command( TARGET someApplication POST_BUILD COMMAND cp -Rf > "${QT_PLUGINS_DIR}/platforms/libqcocoa.dylib" >
Re: [CMake] Tests with assert and Release build type
How about using RelWithDebInfo? See: http://stackoverflow.com/a/28124715/2288008 Ruslo On 18-Dec-15 20:55, Magnus Therning wrote: I'm sure I'm not the first one to run into the conflict between a desire to test the code shipped to customers and the desire to at the same time define NDEBUG to make sure tests don't have their `assert` turned into NOOPs. Is there some nice way of handling this? I can always remove -DNDEBUG from the CFLAGS for tests (possibly by defining a new macro, `ADD_EXECUTABLE_TEST()` or something). Another option is to `#undef NDEBUG` in the source of tests. If there's some more or less standard way to address this I'd like to use that. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus There's a big difference between making something easy to use and making it productive. -- Adam Bosworth -- 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] Are the poor reviews of Mastering CMake Justified?
I have only very recently encountered the need to use cmake. It seems this need came all at once out of the blue. It appears to me that there is a general perception that good tutorial material is in short supply. I have followed various tutorials that are available online and find them less than stellar. I am mostly familiar with gnu toolchain stuff. I admit that I am biased here because my own work presents zero requirement for cross-platform builds. So far I find cmake documentation to be considerably inferior to gnu documentation, but that's just me. This all led me to consider purchasing the book Mastering CMake. However, reviews on Amazon are generally very critical of the book. It is indeed expensive. Should I bother to shell out for it, or do others here share this negative evaluation of it? I don't want to waste my money. Best, - Jake - -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v3.4.1-735-ga5149d3
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 a5149d31beaf7e36c449659066f534813a8c (commit) from f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5149d31beaf7e36c449659066f534813a8c commit a5149d31beaf7e36c449659066f534813a8c Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Sat Dec 19 00:01:07 2015 -0500 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Sat Dec 19 00:01:07 2015 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7515139..99c621a 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 4) -set(CMake_VERSION_PATCH 20151218) +set(CMake_VERSION_PATCH 20151219) #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