Re: [cmake-developers] Review request: FindQt4-nonfatal-if-Qt5-found
David Cole wrote: On Tue, Oct 23, 2012 at 11:43 AM, Clinton Stimpson wrote: It looks like that branch removes the error if find_package(Qt4 REQUIRED) doesn't find Qt 4.x. No? Yes. The intention was to find a way for CMake to continue to look for Qt 4 if it finds Qt 5 first. That doesn't seem to be possible. If it does remove the error, that seems wrong. Is there another way to avoid the error in the cmake unit tests? Yeah -- I don't think we should take this branch. I think we should change callers to look for Qt5 first, and only do find_package(Qt4) if Qt5 is not found first... Yes, that's the workaround. What I was aiming for was to keep looking for Qt 4 if Qt 5 is found. While that works with Config files, it won't work if there's a Find module in the mix. I wonder if a Find module which contains find_package(... NO_MODULE) would behave 'correctly'. I've removed the branch from stage. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0013604]: wrong behavior editing field in column 0
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13604 == Reported By:mwoehlke Assigned To: == Project:CMake Issue ID: 13604 Category: CCMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2012-10-24 13:44 EDT Last Modified: 2012-10-24 13:44 EDT == Summary:wrong behavior editing field in column 0 Description: Editing a field behaves differently when the cursor is in column 0 versus any other column. DEL does not work at all. Any other key erases the existing value. In other columns, DEL works, and typing inserts text, as expected. == Issue History Date ModifiedUsername FieldChange == 2012-10-24 13:44 mwoehlke New Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] rpm/deb component issue
I have a problem with the rpm deb cpack generators. I've set the following: set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set(CPACK_DEB_COMPONENT_INSTALL 1) set(CPACK_RPM_COMPONENT_INSTALL 1) I get this implementation detail string ALL_COMPONENTS_IN_ONE being put in the package name (that is name, not the filename), so I end up with mypackage- ALL_COMPONENTS_IN_ONE. To remove it, I do yum remove mypackage- ALL_COMPONENTS_IN_ONE. I would rather just have mypackage since that is the name I've specified. But I don't see a way to override it. Does anyone have a suggested way for me to fix cmCPack*Generator.cxx and/or CPackDeb.cmake, CPackRPM.cmake? This is the first time I've looked at modifying those particular files. -- Clinton Stimpson Elemental Technologies, Inc Computational Simulation Software, LLC www.csimsoft.com -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] CMake 2.8.10-rc2 ready for testing!
On 2012-10-19 10:25, David Cole wrote: [...] Please try this version of CMake on your projects and report any issues to the list or the bug tracker. This release candidate will become the final release for 2.8.10 by the end of October unless somebody finds and reports a serious issue that needs to be fixed. It would be great if the patch in http://public.kitware.com/Bug/view.php?id=13604 could be merged. (Better if the both aspects of the bug can be fixed, but the patch fixes the more annoying of the two related issues.) (Yes, I just filed the bug; sorry. It hadn't crossed my 'annoyed but too lazy to do anything' threshold until just now.) -- Matthew -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] rpm/deb component issue
On Wednesday, October 24, 2012 11:59:52 AM Clinton Stimpson wrote: I have a problem with the rpm deb cpack generators. I've set the following: set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set(CPACK_DEB_COMPONENT_INSTALL 1) set(CPACK_RPM_COMPONENT_INSTALL 1) I get this implementation detail string ALL_COMPONENTS_IN_ONE being put in the package name (that is name, not the filename), so I end up with mypackage- ALL_COMPONENTS_IN_ONE. To remove it, I do yum remove mypackage- ALL_COMPONENTS_IN_ONE. I would rather just have mypackage since that is the name I've specified. But I don't see a way to override it. Does anyone have a suggested way for me to fix cmCPack*Generator.cxx and/or CPackDeb.cmake, CPackRPM.cmake? This is the first time I've looked at modifying those particular files. I have an idea that I'm comfortable with. I'm effectively separating a variable into two, one for the component name, and another for the directory where it can be found. For the ALL_COMPONENTS_IN_ONE mode, the directory can be ALL_COMPONENTS_IN_ONE/, but the component name empty. Let me know if you disagree. -- Clinton Stimpson Elemental Technologies, Inc Computational Simulation Software, LLC www.csimsoft.com -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] rpm/deb component issue
2012/10/24 Clinton Stimpson clin...@elemtech.com: On Wednesday, October 24, 2012 11:59:52 AM Clinton Stimpson wrote: I have a problem with the rpm deb cpack generators. I've set the following: set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set(CPACK_DEB_COMPONENT_INSTALL 1) set(CPACK_RPM_COMPONENT_INSTALL 1) I get this implementation detail string ALL_COMPONENTS_IN_ONE being put in the package name (that is name, not the filename), so I end up with mypackage- ALL_COMPONENTS_IN_ONE. To remove it, I do yum remove mypackage- ALL_COMPONENTS_IN_ONE. I would rather just have mypackage since that is the name I've specified. But I don't see a way to override it. This is clearly a bug, I can't see any way to fix without a small patch. Note that the DEB generator does not seem to suffer from this, is it? When the xx.deb file is generated you can check it (without installing) using dpkg-deb --info xx.deb dpkg-deb --contents xx.deb dpkg-deb --show xx.deb Does anyone have a suggested way for me to fix cmCPack*Generator.cxx and/or CPackDeb.cmake, CPackRPM.cmake? This is the first time I've looked at modifying those particular files. I think the best current workaround is to change CPackRPM.cmake. I have an idea that I'm comfortable with. I'm effectively separating a variable into two, one for the component name, and another for the directory where it can be found. For the ALL_COMPONENTS_IN_ONE mode, the directory can be ALL_COMPONENTS_IN_ONE/, but the component name empty. Let me know if you disagree.D I agree and ended-up with the same patch (in CPackRPM.cmake). You'll find my patch (against CMake master) proposal attached, I'm not really sure it's the right final fix though. Clint would you be kind enough to open a bug report for that please? -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org 0001-Fix-the-ALL_COMPONENTS_IN_ONE-spurious-suffix-with-C.patch Description: Binary data -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] rpm/deb component issue
On Wednesday, October 24, 2012 09:27:38 PM Eric Noulard wrote: 2012/10/24 Clinton Stimpson clin...@elemtech.com: On Wednesday, October 24, 2012 11:59:52 AM Clinton Stimpson wrote: I have a problem with the rpm deb cpack generators. I've set the following: set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set(CPACK_DEB_COMPONENT_INSTALL 1) set(CPACK_RPM_COMPONENT_INSTALL 1) I get this implementation detail string ALL_COMPONENTS_IN_ONE being put in the package name (that is name, not the filename), so I end up with mypackage- ALL_COMPONENTS_IN_ONE. To remove it, I do yum remove mypackage- ALL_COMPONENTS_IN_ONE. I would rather just have mypackage since that is the name I've specified. But I don't see a way to override it. This is clearly a bug, I can't see any way to fix without a small patch. Note that the DEB generator does not seem to suffer from this, is it? When the xx.deb file is generated you can check it (without installing) using dpkg-deb --info xx.deb dpkg-deb --contents xx.deb dpkg-deb --show xx.deb Does anyone have a suggested way for me to fix cmCPack*Generator.cxx and/or CPackDeb.cmake, CPackRPM.cmake? This is the first time I've looked at modifying those particular files. I think the best current workaround is to change CPackRPM.cmake. I have an idea that I'm comfortable with. I'm effectively separating a variable into two, one for the component name, and another for the directory where it can be found. For the ALL_COMPONENTS_IN_ONE mode, the directory can be ALL_COMPONENTS_IN_ONE/, but the component name empty. Let me know if you disagree.D I agree and ended-up with the same patch (in CPackRPM.cmake). You'll find my patch (against CMake master) proposal attached, I'm not really sure it's the right final fix though. Clint would you be kind enough to open a bug report for that please? The Deb generator suffers from the same problem. Attached is my patch which is working fine for me. Does it look OK? I did the approach of simplifying the .cmake files and putting the implementation specific logic in the cmCPack*.cxx files. -- Clinton Stimpson Elemental Technologies, Inc Computational Simulation Software, LLC www.csimsoft.comFrom b3363e7847a9214b4daa81ac2d990d7cf4c31a89 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson clin...@elemtech.com Date: Wed, 24 Oct 2012 13:37:18 -0600 Subject: [PATCH] RPM/Deb: Fix package names to not include ALL_COMPONENTS_IN_ONE --- Modules/CPackDeb.cmake | 6 ++ Modules/CPackRPM.cmake | 6 ++ Source/CPack/cmCPackDebGenerator.cxx | 10 -- Source/CPack/cmCPackRPMGenerator.cxx | 10 -- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 106b44c..75ff3be 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -385,15 +385,13 @@ endif() # Are we packaging components ? if(CPACK_DEB_PACKAGE_COMPONENT) set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME -${CPACK_DEB_PACKAGE_COMPONENT}) - set(CPACK_DEB_PACKAGE_COMPONENT_PART_PATH /${CPACK_DEB_PACKAGE_COMPONENT}) - set(WDIR ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/${CPACK_DEB_PACKAGE_COMPONENT}) string(TOLOWER ${CPACK_PACKAGE_NAME}${CPACK_DEB_PACKAGE_COMPONENT_PART_NAME} CPACK_DEBIAN_PACKAGE_NAME) else() set(CPACK_DEB_PACKAGE_COMPONENT_PART_NAME ) - set(CPACK_DEB_PACKAGE_COMPONENT_PART_PATH ) - set(WDIR ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) endif() +set(WDIR ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_DEB_PACKAGE_COMPONENT_PART_PATH}) + # Print out some debug information if we were asked for that if(CPACK_DEBIAN_PACKAGE_DEBUG) message(CPackDeb:Debug: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}) diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 0cec897..34d0045 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -311,14 +311,12 @@ endif() # Are we packaging components ? if(CPACK_RPM_PACKAGE_COMPONENT) set(CPACK_RPM_PACKAGE_COMPONENT_PART_NAME -${CPACK_RPM_PACKAGE_COMPONENT}) - set(CPACK_RPM_PACKAGE_COMPONENT_PART_PATH /${CPACK_RPM_PACKAGE_COMPONENT}) - set(WDIR ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/${CPACK_RPM_PACKAGE_COMPONENT}) else() set(CPACK_RPM_PACKAGE_COMPONENT_PART_NAME ) - set(CPACK_RPM_PACKAGE_COMPONENT_PART_PATH ) - set(WDIR ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) endif() +set(WDIR ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}) + # # Use user-defined RPM specific variables value # or generate reasonable default value from diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 4bd5d5c..8a41d0e 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -76,6 +76,10 @@ int
Re: [cmake-developers] rpm/deb component issue
2012/10/24 Clinton Stimpson clin...@elemtech.com: On Wednesday, October 24, 2012 09:27:38 PM Eric Noulard wrote: 2012/10/24 Clinton Stimpson clin...@elemtech.com: On Wednesday, October 24, 2012 11:59:52 AM Clinton Stimpson wrote: I have a problem with the rpm deb cpack generators. I've set the following: set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set(CPACK_DEB_COMPONENT_INSTALL 1) set(CPACK_RPM_COMPONENT_INSTALL 1) I get this implementation detail string ALL_COMPONENTS_IN_ONE being put in the package name (that is name, not the filename), so I end up with mypackage- ALL_COMPONENTS_IN_ONE. To remove it, I do yum remove mypackage- ALL_COMPONENTS_IN_ONE. I would rather just have mypackage since that is the name I've specified. But I don't see a way to override it. This is clearly a bug, I can't see any way to fix without a small patch. Note that the DEB generator does not seem to suffer from this, is it? When the xx.deb file is generated you can check it (without installing) using dpkg-deb --info xx.deb dpkg-deb --contents xx.deb dpkg-deb --show xx.deb Does anyone have a suggested way for me to fix cmCPack*Generator.cxx and/or CPackDeb.cmake, CPackRPM.cmake? This is the first time I've looked at modifying those particular files. I think the best current workaround is to change CPackRPM.cmake. I have an idea that I'm comfortable with. I'm effectively separating a variable into two, one for the component name, and another for the directory where it can be found. For the ALL_COMPONENTS_IN_ONE mode, the directory can be ALL_COMPONENTS_IN_ONE/, but the component name empty. Let me know if you disagree.D I agree and ended-up with the same patch (in CPackRPM.cmake). You'll find my patch (against CMake master) proposal attached, I'm not really sure it's the right final fix though. Clint would you be kind enough to open a bug report for that please? The Deb generator suffers from the same problem. Ok you are right my test was not done properly. Attached is my patch which is working fine for me. Does it look OK? I did the approach of simplifying the .cmake files and putting the implementation specific logic in the cmCPack*.cxx files. Looks good, I'll give it a more thorough look test tomorrow or the day after. -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] rpm/deb component issue
On Wednesday, October 24, 2012 10:08:29 PM Eric Noulard wrote: 2012/10/24 Clinton Stimpson clin...@elemtech.com: On Wednesday, October 24, 2012 09:27:38 PM Eric Noulard wrote: 2012/10/24 Clinton Stimpson clin...@elemtech.com: On Wednesday, October 24, 2012 11:59:52 AM Clinton Stimpson wrote: I have a problem with the rpm deb cpack generators. I've set the following: set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set(CPACK_DEB_COMPONENT_INSTALL 1) set(CPACK_RPM_COMPONENT_INSTALL 1) I get this implementation detail string ALL_COMPONENTS_IN_ONE being put in the package name (that is name, not the filename), so I end up with mypackage- ALL_COMPONENTS_IN_ONE. To remove it, I do yum remove mypackage- ALL_COMPONENTS_IN_ONE. I would rather just have mypackage since that is the name I've specified. But I don't see a way to override it. This is clearly a bug, I can't see any way to fix without a small patch. Note that the DEB generator does not seem to suffer from this, is it? When the xx.deb file is generated you can check it (without installing) using dpkg-deb --info xx.deb dpkg-deb --contents xx.deb dpkg-deb --show xx.deb Does anyone have a suggested way for me to fix cmCPack*Generator.cxx and/or CPackDeb.cmake, CPackRPM.cmake? This is the first time I've looked at modifying those particular files. I think the best current workaround is to change CPackRPM.cmake. I have an idea that I'm comfortable with. I'm effectively separating a variable into two, one for the component name, and another for the directory where it can be found. For the ALL_COMPONENTS_IN_ONE mode, the directory can be ALL_COMPONENTS_IN_ONE/, but the component name empty. Let me know if you disagree.D I agree and ended-up with the same patch (in CPackRPM.cmake). You'll find my patch (against CMake master) proposal attached, I'm not really sure it's the right final fix though. Clint would you be kind enough to open a bug report for that please? The Deb generator suffers from the same problem. Ok you are right my test was not done properly. Attached is my patch which is working fine for me. Does it look OK? I did the approach of simplifying the .cmake files and putting the implementation specific logic in the cmCPack*.cxx files. Looks good, I'll give it a more thorough look test tomorrow or the day after. Ok thanks. I'll go ahead and put in on stage then. Also, when I run the tests, CPackComponents fails for me, and its because I don't have nsis installed on this Linux machine. I'm looking at Tests/CMakeLists.txt and I don't see a way to turn off that test. Only on Windows does it check the existence of nsis and disables the test. Or am I looking at it wrong? -- Clinton Stimpson Elemental Technologies, Inc Computational Simulation Software, LLC www.csimsoft.com -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] rpm/deb component issue
2012/10/24 Clinton Stimpson clin...@elemtech.com: Looks good, I'll give it a more thorough look test tomorrow or the day after. Ok thanks. I'll go ahead and put in on stage then. Also, when I run the tests, CPackComponents fails for me, and its because I don't have nsis installed on this Linux machine. I'm looking at Tests/CMakeLists.txt and I don't see a way to turn off that test. Only on Windows does it check the existence of nsis and disables the test. Or am I looking at it wrong? The CTEST_RUN_CPackComponents is not a problem on linux. and from my understanding this if(NSIS_MAKENSIS_EXECUTABLE) set(CPackComponents_EXTRA_OPTIONS ${CPackComponents_EXTRA_OPTIONS} -DCPACK_BINARY_NSIS:BOOL=ON) endif() should protect against trying to use NSIS generator on any platform. because NSIS_MAKENSIS_EXECUTABLE comes from: find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis ...) which is not guarded by any platform specific test. -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] CMake 2.8.10-rc3 ready for testing!
The CMake 2.8.10 release candidate stream continues! This is the last RC unless somebody finds a critical, must-fix issue with it. You can find the source and binaries here: http://www.cmake.org/files/v2.8/?C=M;O=D This email is also available as blog posts: http://www.kitware.com/blog/home/post/406 http://cmake.blogspot.com/2012/10/cmake-2810-rc3-ready-for-testing.html Some of the notable changes in this release are: - file(DOWNLOAD now handles https URLs -- the pre-built binaries available from Kitware link to OpenSSL - support for the latest available versions of Visual Studio (11 / 2012) and Xcode (4.3, 4.4, 4.5, developer previews) - uniform compiler id and version number variables available for nearly all known compilers and platforms - new way to arrange exported targets that depend on other targets into export sets - new generator expressions - generator expressions available in more contexts, namely in the INCLUDE_DIRECTORIES and COMPILE_DEFINITIONS target properties - new target properties for PDB_OUTPUT_DIRECTORY and PDB_NAME, implemented for Visual Studio 7 and up - and, as always, various minor bug fixes The bug tracker change log page for this version is at: http://public.kitware.com/Bug/changelog_page.php?version_id=100 Following is the complete list of changes in this rc since the previous rc. Please try this version of CMake on your projects and report any issues to the list or the bug tracker. This release candidate will become the final release for 2.8.10 by the end of October unless somebody finds and reports a serious issue that needs to be fixed. Thanks! -Dave Changes in CMake 2.8.10-rc3 (since 2.8.10-rc2) -- Rolf Eike Beer (2): SelectLibraryConfigurations: add testcase SelectLibraryConfigurations: fix for release and debug libs being the same Stephen Kelly (5): BasicConfigVersion: Make docs refer to the macro, not the module name Document LOCATION undefined behavior with use of LINKER_LANGUAGE. GenEx: Add an accessor for imported targets in a makefile. GenEx: Create cmGeneratorTargets for imported targets. GexEx: Validate Target names and property names differently. Thomas Arcila (1): SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntax -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] CMake 2.8.10-rc3 ready for testing!
Hi all, thanks for your work on CMake. On Wed, 24 Oct 2012 16:39:07 -0400 David Cole david.c...@kitware.com wrote: The CMake 2.8.10 release candidate stream continues! This is the last RC unless somebody finds a critical, must-fix issue with it. You can find the source and binaries here: http://www.cmake.org/files/v2.8/?C=M;O=D This email is also available as blog posts: http://www.kitware.com/blog/home/post/406 http://cmake.blogspot.com/2012/10/cmake-2810-rc3-ready-for-testing.html Some of the notable changes in this release are: OK, I did cmake .. ; make ; make test on the latest git source, and I got this: 99% tests passed, 1 tests failed out of 267 Label Time Summary: Label1= 0.06 sec Label2= 0.06 sec Total Test time (real) = 619.32 sec The following tests FAILED: 267 - CMake.CheckSourceTree (Failed) Errors while running CTest make: *** [test] Error 8 Regards, Shlomi Fish -- - Shlomi Fish http://www.shlomifish.org/ My Favourite FOSS - http://www.shlomifish.org/open-source/favourite/ That's why I feed my leprechaun every day — because there are not enough phonemes in Navajo to tell him to get his act together and find a job. — My comment on http://www.youtube.com/watch?v=izne8XcaBBg . Please reply to list if it's a mailing list post - http://shlom.in/reply . -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0013605]: Add vax to supported platforms
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13605 == Reported By:Thomas Klausner Assigned To: == Project:CMake Issue ID: 13605 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2012-10-24 18:41 EDT Last Modified: 2012-10-24 18:41 EDT == Summary:Add vax to supported platforms Description: The attached patch adds vax to the supported platforms. == Issue History Date ModifiedUsername FieldChange == 2012-10-24 18:41 Thomas KlausnerNew Issue 2012-10-24 18:41 Thomas KlausnerFile Added: patch-Utilities_KWIML_ABI.h.in == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] CMake 2.8.10-rc3 ready for testing!
Instead of make test, please run ctest -VV -R CheckSourceTree and send the output. It probably just means you have some local mods to your source tree, or an untracked file is present. On Wed, Oct 24, 2012 at 5:53 PM, Shlomi Fish shlo...@shlomifish.org wrote: Hi all, thanks for your work on CMake. On Wed, 24 Oct 2012 16:39:07 -0400 David Cole david.c...@kitware.com wrote: The CMake 2.8.10 release candidate stream continues! This is the last RC unless somebody finds a critical, must-fix issue with it. You can find the source and binaries here: http://www.cmake.org/files/v2.8/?C=M;O=D This email is also available as blog posts: http://www.kitware.com/blog/home/post/406 http://cmake.blogspot.com/2012/10/cmake-2810-rc3-ready-for-testing.html Some of the notable changes in this release are: OK, I did cmake .. ; make ; make test on the latest git source, and I got this: 99% tests passed, 1 tests failed out of 267 Label Time Summary: Label1= 0.06 sec Label2= 0.06 sec Total Test time (real) = 619.32 sec The following tests FAILED: 267 - CMake.CheckSourceTree (Failed) Errors while running CTest make: *** [test] Error 8 Regards, Shlomi Fish -- - Shlomi Fish http://www.shlomifish.org/ My Favourite FOSS - http://www.shlomifish.org/open-source/favourite/ That's why I feed my leprechaun every day — because there are not enough phonemes in Navajo to tell him to get his act together and find a job. — My comment on http://www.youtube.com/watch?v=izne8XcaBBg . Please reply to list if it's a mailing list post - http://shlom.in/reply . -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] CMake Installerproject with NSIS
Hi I am trying to make my first installer of my already working cmake application but I have the problem that no output is done by CMake. I have installed NSIS, whereby my CMake flags in GUI are: CPACK_BINARY_NSIS is true, CPACK_BINARY_ZIP is false and CPACK_SOURCE_ZIP is true My CMake script looks like this: SET(Srcs MySource.cpp ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) ADD_EXECUTABLE( MyApp ${ Srcs _Srcs}) TARGET_LINK_LIBRARIES(MyApp MyLib ) install( TARGETS MyApp RUNTIME DESTINATION bin COMPONENT applications ) set(CPACK_PACKAGE_NAME MyApp ) set(CPACK_PACKAGE_VENDOR www.joanneum.at) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY MyApp - Installation) set(CPACK_PACKAGE_VERSION 1.0.0) set(CPACK_PACKAGE_VERSION_MAJOR 1) set(CPACK_PACKAGE_VERSION_MINOR 0) set(CPACK_PACKAGE_VERSION_PATCH 0) set(CPACK_PACKAGE_INSTALL_DIRECTORY MyApp ) set(CPACK_COMPONENTS_ALL applications libraries headers) set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME MyApp Application) set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME Libraries) set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME C++ Headers) set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION MyApp executable) set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION Libraries used by MyApp) set(CPACK_COMPONENT_HEADERS_DESCRIPTION C/C++ header files) include(CPack) When I configure and generate I run without errors, when I look into my visual studio there are no changes visible. When I look into the binary directory there is also no installer found, also no *.nsi file which could be opened by NSIS. So how could I generate a exe ? Thanks for help... Gerald -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] WG: CMake Installerproject with NSIS
Sorry, i found the PACKAGE project now Von: cmake-boun...@cmake.org [mailto:cmake-boun...@cmake.org] Im Auftrag von Lodron, Gerald Gesendet: Mittwoch, 24. Oktober 2012 07:54 An: CMake (cmake@cmake.org) Betreff: [CMake] CMake Installerproject with NSIS Hi I am trying to make my first installer of my already working cmake application but I have the problem that no output is done by CMake. I have installed NSIS, whereby my CMake flags in GUI are: CPACK_BINARY_NSIS is true, CPACK_BINARY_ZIP is false and CPACK_SOURCE_ZIP is true My CMake script looks like this: SET(Srcs MySource.cpp ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) ADD_EXECUTABLE( MyApp ${ Srcs _Srcs}) TARGET_LINK_LIBRARIES(MyApp MyLib ) install( TARGETS MyApp RUNTIME DESTINATION bin COMPONENT applications ) set(CPACK_PACKAGE_NAME MyApp ) set(CPACK_PACKAGE_VENDOR www.joanneum.athttp://www.joanneum.at) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY MyApp - Installation) set(CPACK_PACKAGE_VERSION 1.0.0) set(CPACK_PACKAGE_VERSION_MAJOR 1) set(CPACK_PACKAGE_VERSION_MINOR 0) set(CPACK_PACKAGE_VERSION_PATCH 0) set(CPACK_PACKAGE_INSTALL_DIRECTORY MyApp ) set(CPACK_COMPONENTS_ALL applications libraries headers) set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME MyApp Application) set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME Libraries) set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME C++ Headers) set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION MyApp executable) set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION Libraries used by MyApp) set(CPACK_COMPONENT_HEADERS_DESCRIPTION C/C++ header files) include(CPack) When I configure and generate I run without errors, when I look into my visual studio there are no changes visible. When I look into the binary directory there is also no installer found, also no *.nsi file which could be opened by NSIS. So how could I generate a exe ? Thanks for help... Gerald -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake-- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMake Installerproject with NSIS
2012/10/24 Lodron, Gerald gerald.lod...@joanneum.at: Hi I am trying to make my first installer of my already working cmake application but I have the problem that no output is done by CMake. I have installed NSIS, whereby my CMake flags in GUI are: CPACK_BINARY_NSIS is true, CPACK_BINARY_ZIP is false and CPACK_SOURCE_ZIP is true My CMake script looks like this: SET(Srcs MySource.cpp ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) ADD_EXECUTABLE( MyApp ${ Srcs _Srcs}) TARGET_LINK_LIBRARIES(MyApp MyLib ) install( TARGETS MyApp RUNTIME DESTINATION bin COMPONENT applications ) set(CPACK_PACKAGE_NAME MyApp ) set(CPACK_PACKAGE_VENDOR www.joanneum.at) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY MyApp - Installation) set(CPACK_PACKAGE_VERSION 1.0.0) set(CPACK_PACKAGE_VERSION_MAJOR 1) set(CPACK_PACKAGE_VERSION_MINOR 0) set(CPACK_PACKAGE_VERSION_PATCH 0) set(CPACK_PACKAGE_INSTALL_DIRECTORY MyApp ) set(CPACK_COMPONENTS_ALL applications libraries headers) set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME MyApp Application) set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME Libraries) set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME C++ Headers) set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION MyApp executable) set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION Libraries used by MyApp) set(CPACK_COMPONENT_HEADERS_DESCRIPTION C/C++ header files) include(CPack) When I configure and generate I run without errors, when I look into my visual studio there are no changes visible. You should have 2 new buildable target: PACKAGE and PACKAGE_SOURCE. When I look into the binary directory there is also no installer found, also no *.nsi file which could be opened by NSIS. So how could I generate a exe ? Thanks for help… Installer and *.nsi file are generated when you build PACKAGE target. -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] (no subject)
Hi all, I'd like to create a shared library that uses another toolkit Foobar, so within the main CMakeLists.txt I write TARGET_LINK_LIBRARIES(mylib ${Foobar_LIBRARIES}) to avoid undefined symbols (I link with -Wl,-no-undefined). ${Foobar_LIBRARIES} consists of {foobarA;foobarB;foobarC}. This pulls in all Foobar libraries on the link like. Moreover, the respective src/CMakeFiles/mylib.dir/build.make contains *snip* [...] # External object files for target nosh nosh_EXTERNAL_OBJECTS = src/libmylib.so.11.0.0: src/CMakeFiles/mylib.dir/mysource1.cpp.o src/libmylib.so.11.0.0: src/CMakeFiles/mylib.dir/mysource2.cpp.o src/libmylib.so.11.0.0: src/CMakeFiles/mylib.dir/mysource3.cpp.o src/libmylib.so.11.0.0: src/CMakeFiles/mylib.dir/build.make src/libmylib.so.11.0.0: /usr/lib/libfoobarA.so.11 src/libmylib.so.11.0.0: /usr/lib/libfoobarB.so.11 src/libmylib.so.11.0.0: /usr/lib/libfoobarC.so.11 src/libmylib.so.11.0.0: /usr/lib/liblapack.so src/libmylib.so.11.0.0: /usr/lib/libblas.so src/libmylib.so.11.0.0: /usr/lib/libnetcdf.so src/libmylib.so.11.0.0: src/CMakeFiles/mylib.dir/link.txt [...] *snap* CMake correctly pulls in the libraries BLAS, LAPACK, and netCDF on which Foobar depends, without me having to specify those in mylib. Nice! I'm having one problem with this though: ldd reveals that libfoobar*.so contains dynamic links to the respective libraries with versioning info, i.e., $ ldd /usr/lib/libfoobarA.so.11 | grep netcdf libnetcdf.so.7 = /usr/lib/libnetcdf.so.7 (0x7f1fe33da000) $ In fact, there is no library by the exact name /usr/lib/libnetcdf.so installed. The same goes for BLAS and LAPACK. I'm now wondering how CMake generates the information in src/CMakeFiles/mylib.dir/build.make, and how to fix this. Hints, anyone? --Nico -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] FindPackage(Ruby) on Ubuntu LTS
Hio, I have some problems with the CMake-Module findRuby.cmake with using ruby1.8 and ruby1.9 on Ubuntu 12.04 LTS (via apt). I'm not sure, but i guess it worked some month ago and its maybe broken due to an update (or i missed some important aspect in my setup) A simple find_package(Ruby) call in a CMakeLists.txt results in the error: -- Could NOT find Ruby (missing: RUBY_LIBRARY) (found version 1.9.1) -- Configuring done -- Generating done -- Build files have been written to: /home/chris/repos/build $ cmake --version cmake version 2.8.7 $ ruby -v ruby 1.9.3p0 (2011-10-30 revision 33570) [x86_64-linux] $ ls /usr/lib | grep ruby libqtruby4shared.so.2 libqtruby4shared.so.2.0.0 libruby1.8.so libruby1.8.so.1.8 libruby1.8.so.1.8.7 libruby1.8-static.a libruby-1.9.1.so libruby-1.9.1.so.1.9 libruby-1.9.1.so.1.9.1 libruby-1.9.1-static.a ruby Any ideas? Chris -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] how to find current Windows build configuration?
On platforms other than Windows, the build type is a single value stored in CMAKE_BUILD_TYPE, and can be accessed if you want your build to different things in Debug, Release, etc modes. On Windows with Visual Studio, there's a variable CMAKE_CONFIGURATION_TYPE that is a list of the builds that will be done. How do I recover the actual, current build type? The reason I need to do this: I need to import libraries built in an ExternalProject. On OS X or Linux, the libraries generated by the ExternalProject are in one predictable place. So I can do this: set(EP_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EP_NAME}-build/lib) On windows this will need to be # fictional variable WINDOWS_CURRENT_BUILD_TYPE giving current build type set(EP_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EP_NAME}-build/${WINDOWS_CURRENT_BUILD_TYPE}) Unfortunately, there's no such variable. And, given how Visual Studio works, where you can have a build that actually builds any number of build_types at one go, I'm not sure how to handle this. One thought I had was to always build the External Project as Release on Windows; then the libraries are someplace predictable. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] how to find current Windows build configuration?
Hi Kent. As you say, there is no current build type in Visual Studio; that depends on what the user selects in the combo box. If you only need this information at build time, you can use the generator expression $CONFIGURATION for this purpose. See the documentation of add_custom_command(); I also believe genexes are undergoing a major overhaul for the soon-to-be 2.8.10 release. If you need the information before build time (i.e. at cmake time), you're pretty much out of luck and you'll have to rework your logic somehow to push the dependency to build time. Petr On Wed, Oct 24, 2012 at 3:57 PM, Kent Williams nkwmailingli...@gmail.comwrote: On platforms other than Windows, the build type is a single value stored in CMAKE_BUILD_TYPE, and can be accessed if you want your build to different things in Debug, Release, etc modes. On Windows with Visual Studio, there's a variable CMAKE_CONFIGURATION_TYPE that is a list of the builds that will be done. How do I recover the actual, current build type? The reason I need to do this: I need to import libraries built in an ExternalProject. On OS X or Linux, the libraries generated by the ExternalProject are in one predictable place. So I can do this: set(EP_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EP_NAME}-build/lib) On windows this will need to be # fictional variable WINDOWS_CURRENT_BUILD_TYPE giving current build type set(EP_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EP_NAME}-build/${WINDOWS_CURRENT_BUILD_TYPE}) Unfortunately, there's no such variable. And, given how Visual Studio works, where you can have a build that actually builds any number of build_types at one go, I'm not sure how to handle this. One thought I had was to always build the External Project as Release on Windows; then the libraries are someplace predictable. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Relink to shared libs
I agree with Leif Walsh I am currently looking at replacing my unix makefile (linux+gmake, solaris+make/gmake) and Windows VS projects, with cmake. For the makefiles I get gcc to output dependency files based on header file usage, using gcc options -MM -MF -MP -MT. This has worked really well for over a year. If I modify a cpp file that is used by the shared lib, then the executable does not re-link. If I modify a .h file that is used by the shared lib *and* the executable, then it WILL re-link. Can I confirm that I cannot replicate this functionality with cmake ? If so then this may be a blocker for CMAKE adoption , since we have long build times, and dont want to make them longer. regards. David -- View this message in context: http://cmake.3232098.n2.nabble.com/Relink-to-shared-libs-tp7580943p7582156.html Sent from the CMake mailing list archive at Nabble.com. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Relink to shared libs
David, I have had some build time success by adopting the ninja generator. It's got some dependency issues but it's workable, and though it doesn't solve the relinking issue, it does make builds generally a lot faster. Sent from my iPhone On Oct 24, 2012, at 10:35, DavidAllen dal...@insynchsoft.co.uk wrote: I agree with Leif Walsh I am currently looking at replacing my unix makefile (linux+gmake, solaris+make/gmake) and Windows VS projects, with cmake. For the makefiles I get gcc to output dependency files based on header file usage, using gcc options -MM -MF -MP -MT. This has worked really well for over a year. If I modify a cpp file that is used by the shared lib, then the executable does not re-link. If I modify a .h file that is used by the shared lib *and* the executable, then it WILL re-link. Can I confirm that I cannot replicate this functionality with cmake ? If so then this may be a blocker for CMAKE adoption , since we have long build times, and dont want to make them longer. regards. David -- View this message in context: http://cmake.3232098.n2.nabble.com/Relink-to-shared-libs-tp7580943p7582156.html Sent from the CMake mailing list archive at Nabble.com. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] FindPackage(Ruby) on Ubuntu LTS
On Wed, Oct 24, 2012 at 9:36 AM, Chris ruu...@googlemail.com wrote: Hio, I have some problems with the CMake-Module findRuby.cmake with using ruby1.8 and ruby1.9 on Ubuntu 12.04 LTS (via apt). I'm not sure, but i guess it worked some month ago and its maybe broken due to an update (or i missed some important aspect in my setup) A simple find_package(Ruby) call in a CMakeLists.txt results in the error: -- Could NOT find Ruby (missing: RUBY_LIBRARY) (found version 1.9.1) -- Configuring done -- Generating done -- Build files have been written to: /home/chris/repos/build $ cmake --version cmake version 2.8.7 $ ruby -v ruby 1.9.3p0 (2011-10-30 revision 33570) [x86_64-linux] $ ls /usr/lib | grep ruby libqtruby4shared.so.2 libqtruby4shared.so.2.0.0 libruby1.8.so libruby1.8.so.1.8 libruby1.8.so.1.8.7 libruby1.8-static.a libruby-1.9.1.so libruby-1.9.1.so.1.9 libruby-1.9.1.so.1.9.1 libruby-1.9.1-static.a ruby Any ideas? Chris -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake The following 5 commits were merged to 'master' for FindRuby.cmake *after* CMake 2.8.7, and probably fix the problem you're seeing. Can you try with 2.8.8 or later? # to inspect and figure things out: $ gitk -- Modules/FindRuby.cmake # to show the series of commands that came after 2.8.7 based on commit hashes revealed by the manual inspection: $ git log 93c55ec1~1..854e7623 -- Modules/FindRuby.cmake commit 854e76237ce3e8f03d9cabcad1f8f37e04992ad3 Author: Rolf Eike Beer e...@sf-mail.de Date: Fri Feb 17 18:06:07 2012 +0100 FindRuby: clean up querying variables from Ruby Newer Ruby versions (from 1.9 onward) seem to warn if you query Config::CONFIG and print a warning to use RbConfig instead. RbConfig seems to also work in older versions, at least in 1.8. Use a macro to query RbConfig first and only if that doesn't give anything fall back to Config. commit 409aeafa2518a1cd38709810ba765860ef21aeb8 Author: Rolf Eike Beer e...@sf-mail.de Date: Wed Jan 25 17:26:43 2012 +0100 FindRuby: do not blindly set version to 1.8.0 RUBY_VERSION was always set, even if no RUBY_EXECUTABLE was found. While it may make sense to assume a default version if we can't execute the binary, it certainly doesn't make sense to report a version if there is no executable at all. commit a9bca052f8ff013d8f47cf365495d2c8d0a2e70f Author: Alex Neundorf neund...@kde.org Date: Thu Jan 5 21:58:49 2012 +0100 FindRuby.cmake: add more debug output Alex commit 3db2c8b9eafe4cc1d3a6e9d1f3bfc90764544d01 Author: Alex Neundorf neund...@kde.org Date: Thu Jan 5 21:57:11 2012 +0100 FindRuby: add more possible library names (for ubuntu, #12172) Alex commit 93c55ec1421a2cf43dbcaf9afd0528c8dda42de5 Author: Alex Neundorf neund...@kde.org Date: Thu Jan 5 21:53:02 2012 +0100 FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172) Alex HTH, David -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] FindPackage(Ruby) on Ubuntu LTS
On Wed, Oct 24, 2012 at 11:57 AM, David Cole david.c...@kitware.com wrote: On Wed, Oct 24, 2012 at 9:36 AM, Chris ruu...@googlemail.com wrote: Hio, I have some problems with the CMake-Module findRuby.cmake with using ruby1.8 and ruby1.9 on Ubuntu 12.04 LTS (via apt). I'm not sure, but i guess it worked some month ago and its maybe broken due to an update (or i missed some important aspect in my setup) A simple find_package(Ruby) call in a CMakeLists.txt results in the error: -- Could NOT find Ruby (missing: RUBY_LIBRARY) (found version 1.9.1) -- Configuring done -- Generating done -- Build files have been written to: /home/chris/repos/build $ cmake --version cmake version 2.8.7 $ ruby -v ruby 1.9.3p0 (2011-10-30 revision 33570) [x86_64-linux] $ ls /usr/lib | grep ruby libqtruby4shared.so.2 libqtruby4shared.so.2.0.0 libruby1.8.so libruby1.8.so.1.8 libruby1.8.so.1.8.7 libruby1.8-static.a libruby-1.9.1.so libruby-1.9.1.so.1.9 libruby-1.9.1.so.1.9.1 libruby-1.9.1-static.a ruby Any ideas? Chris -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake The following 5 commits were merged to 'master' for FindRuby.cmake *after* CMake 2.8.7, and probably fix the problem you're seeing. Can you try with 2.8.8 or later? # to inspect and figure things out: $ gitk -- Modules/FindRuby.cmake # to show the series of commands that came after 2.8.7 based on commit hashes revealed by the manual inspection: $ git log 93c55ec1~1..854e7623 -- Modules/FindRuby.cmake commit 854e76237ce3e8f03d9cabcad1f8f37e04992ad3 Author: Rolf Eike Beer e...@sf-mail.de Date: Fri Feb 17 18:06:07 2012 +0100 FindRuby: clean up querying variables from Ruby Newer Ruby versions (from 1.9 onward) seem to warn if you query Config::CONFIG and print a warning to use RbConfig instead. RbConfig seems to also work in older versions, at least in 1.8. Use a macro to query RbConfig first and only if that doesn't give anything fall back to Config. commit 409aeafa2518a1cd38709810ba765860ef21aeb8 Author: Rolf Eike Beer e...@sf-mail.de Date: Wed Jan 25 17:26:43 2012 +0100 FindRuby: do not blindly set version to 1.8.0 RUBY_VERSION was always set, even if no RUBY_EXECUTABLE was found. While it may make sense to assume a default version if we can't execute the binary, it certainly doesn't make sense to report a version if there is no executable at all. commit a9bca052f8ff013d8f47cf365495d2c8d0a2e70f Author: Alex Neundorf neund...@kde.org Date: Thu Jan 5 21:58:49 2012 +0100 FindRuby.cmake: add more debug output Alex commit 3db2c8b9eafe4cc1d3a6e9d1f3bfc90764544d01 Author: Alex Neundorf neund...@kde.org Date: Thu Jan 5 21:57:11 2012 +0100 FindRuby: add more possible library names (for ubuntu, #12172) Alex commit 93c55ec1421a2cf43dbcaf9afd0528c8dda42de5 Author: Alex Neundorf neund...@kde.org Date: Thu Jan 5 21:53:02 2012 +0100 FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172) Alex HTH, David Also if the libs reported by your find only go up to 1.9.1, but ruby itself reports 1.9.3. where is it getting it's libs from? Do you perhaps need to update a dev package for ruby? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] FindPackage(Ruby) on Ubuntu LTS
Am 24.10.2012 17:58, schrieb David Cole: On Wed, Oct 24, 2012 at 11:57 AM, David Cole david.c...@kitware.com wrote: The following 5 commits were merged to 'master' for FindRuby.cmake *after* CMake 2.8.7, and probably fix the problem you're seeing. Can you try with 2.8.8 or later? I'll check that. Also if the libs reported by your find only go up to 1.9.1, but ruby itself reports 1.9.3. where is it getting it's libs from? Do you perhaps need to update a dev package for ruby? The setup for ruby seems a little messed up in the Ubuntu repositories (i guess its also the same for Debian). Almost all packages are only referenced for 1.9.1. e.g. $ apt-cache search ruby1.9 ... ruby1.9.1 - Interpreter of object-oriented scripting language Ruby ruby1.9.1-dev - Header files for compiling extension modules for the Ruby 1.9.1 ruby1.9.1-full - Ruby 1.9.1 full installation ruby1.9.3 - Interpreter of object-oriented scripting language Ruby, version 1.9.3 No clear naming conventions (ruby1.8, ruby-1.9.1, ...) Even using $ ruby1.9.1 -v you get the version description for 1.9.3. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] FindPackage(Ruby) on Ubuntu LTS
Am 24.10.2012 17:57, schrieb David Cole: The following 5 commits were merged to 'master' for FindRuby.cmake *after* CMake 2.8.7, and probably fix the problem you're seeing. Can you try with 2.8.8 or later? I've build CMake 2.8.9 directly from the sources and it works here for a simple example. Thanks. Chris -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] CMake 2.8.10-rc3 ready for testing!
The CMake 2.8.10 release candidate stream continues! This is the last RC unless somebody finds a critical, must-fix issue with it. You can find the source and binaries here: http://www.cmake.org/files/v2.8/?C=M;O=D This email is also available as blog posts: http://www.kitware.com/blog/home/post/406 http://cmake.blogspot.com/2012/10/cmake-2810-rc3-ready-for-testing.html Some of the notable changes in this release are: - file(DOWNLOAD now handles https URLs -- the pre-built binaries available from Kitware link to OpenSSL - support for the latest available versions of Visual Studio (11 / 2012) and Xcode (4.3, 4.4, 4.5, developer previews) - uniform compiler id and version number variables available for nearly all known compilers and platforms - new way to arrange exported targets that depend on other targets into export sets - new generator expressions - generator expressions available in more contexts, namely in the INCLUDE_DIRECTORIES and COMPILE_DEFINITIONS target properties - new target properties for PDB_OUTPUT_DIRECTORY and PDB_NAME, implemented for Visual Studio 7 and up - and, as always, various minor bug fixes The bug tracker change log page for this version is at: http://public.kitware.com/Bug/changelog_page.php?version_id=100 Following is the complete list of changes in this rc since the previous rc. Please try this version of CMake on your projects and report any issues to the list or the bug tracker. This release candidate will become the final release for 2.8.10 by the end of October unless somebody finds and reports a serious issue that needs to be fixed. Thanks! -Dave Changes in CMake 2.8.10-rc3 (since 2.8.10-rc2) -- Rolf Eike Beer (2): SelectLibraryConfigurations: add testcase SelectLibraryConfigurations: fix for release and debug libs being the same Stephen Kelly (5): BasicConfigVersion: Make docs refer to the macro, not the module name Document LOCATION undefined behavior with use of LINKER_LANGUAGE. GenEx: Add an accessor for imported targets in a makefile. GenEx: Create cmGeneratorTargets for imported targets. GexEx: Validate Target names and property names differently. Thomas Arcila (1): SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntax -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Automatic building app version if any one of the dependency is changed.
On 2012-10-17 15:24, Vivek Goel wrote: Using CMake I am generating a common version file. version.h which contains current svn version of source code. In all application main.c I am including this file. Now every application is depending on this version.h and everything got rebuild. I want to change this logic so application will have their own version and version.h file should be generated only if any other dependency of application is changed. If you were using git, you could use something like 'git log -1 list of files that affect the build of MyFooApp', and put that in version.h for MyFooApp (and similar for other applications). I imagine you can do something similar with svn. The trick is getting the list of files that affect the build of MyFooApp (depending on how pedantic a definition of affects the build you need). If you don't mind creating version.h being a bit expensive, you could write a CMake script to collect the names of all files in your source tree that do not belong to other applications. If you don't care about e.g. top-level build configuration, libraries in your project, etc. (i.e. only files in src/apps/foo), then it's a little easier. -- Matthew -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Adding to RUN_TESTS target
Can I extend RUN_TESTS to execute more tests of my choosing? RUN_TESTS will only execute tests defined in the directory of the project I opened or below. I want to add some tests to it that are created prior to that project. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Adding to RUN_TESTS target
The ctest command that is run by RUN_TESTS is not extensible at the moment. However, you can use add_custom_target to make your own test target (just don't name it test or RUN_TESTS... ;-) which can do whatever you want. HTH, David On Wed, Oct 24, 2012 at 5:44 PM, Robert Dailey rcdailey.li...@gmail.com wrote: Can I extend RUN_TESTS to execute more tests of my choosing? RUN_TESTS will only execute tests defined in the directory of the project I opened or below. I want to add some tests to it that are created prior to that project. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Adding to RUN_TESTS target
Thanks David. I don't mind creating a custom target for this, but I'm not sure how to invoke CTest manually with the tests in question. What commands would I run? On Wed, Oct 24, 2012 at 6:15 PM, David Cole david.c...@kitware.com wrote: The ctest command that is run by RUN_TESTS is not extensible at the moment. However, you can use add_custom_target to make your own test target (just don't name it test or RUN_TESTS... ;-) which can do whatever you want. HTH, David On Wed, Oct 24, 2012 at 5:44 PM, Robert Dailey rcdailey.li...@gmail.com wrote: Can I extend RUN_TESTS to execute more tests of my choosing? RUN_TESTS will only execute tests defined in the directory of the project I opened or below. I want to add some tests to it that are created prior to that project. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Adding to RUN_TESTS target
(re-send to list) On 2012-10-24 17:44, Robert Dailey wrote: Can I extend RUN_TESTS to execute more tests of my choosing? RUN_TESTS will only execute tests defined in the directory of the project I opened or below. I want to add some tests to it that are created prior to that project. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake You might be able to leverage a custom test script. Have a look at the TEST_INCLUDE_FILE directory property. I'm using this to generate ctest tests without using add_test at all in my CMakeLists.txt. (I'm using gtest, and run the test driver at build time to generate the list of tests that the driver knows about, from which I create a custom ctest script to run each test as an individual ctest test.) -- Matthew -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, release, updated. v2.8.9-598-g52cd8e8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, release has been updated via 52cd8e83d4c7dfefec2058e7afd3523cfa572ce9 (commit) via 4bda4b1c1cd6a75e5cf84d4275bd451ce8a5631c (commit) via f551fa62450379b41b510054948e097582538357 (commit) via 02b993b1ca3fc569aca2af6b0cf7eb442b5b8e2a (commit) via 2b5635ee2327a41688a7ccfdf80a534a47268131 (commit) via 23a257628bb70f0e182c9b537ddab2b452fbddb0 (commit) via c26373f6ca9762c0bd9950eb3aa5f1183f370842 (commit) via 0276f4e9f42e4ac07c2f9dc48f7576f863e9326f (commit) via dc0b0f6b6d70a9f3438d110cfc2840f61319151a (commit) via 2362bc8e80ee657dd733bbf4b698199ce3b656fe (commit) via e386992152ac3ba5fe2abb66a56ea6ae99d6e8f3 (commit) via 95d590ddbac80780f437252de4522b78f4069f45 (commit) via 04421042b3eb5977208929ba01faf7816c2f8f69 (commit) via 0cc00b06d807a6cbdd74eb1f8f518c2266eecabc (commit) via 9c42e9831d5e73b68467783c74c251b905b103d6 (commit) via a22f4fabb7eb6a978c5f0ddf7988d1c57793f7e6 (commit) via 5052fbc93d8158e44d1a44f167ba00f39813b82f (commit) via df5c1db8c0abf0b82f6b7c1289b0325323517333 (commit) via 62d58bf52c4f2c33bbdd5fb2f5a6c1b513d36200 (commit) via 1cd2ec1072bb5508293aff602f2bc320660daf87 (commit) via 4c5db6ce6c2bb90f0f7eaa54f31e35767d9e5816 (commit) from f1189ee60e78fb4a5fd1fb8c3337efdf6f5d602f (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=52cd8e83d4c7dfefec2058e7afd3523cfa572ce9 commit 52cd8e83d4c7dfefec2058e7afd3523cfa572ce9 Author: David Cole david.c...@kitware.com AuthorDate: Wed Oct 24 11:43:00 2012 -0400 Commit: David Cole david.c...@kitware.com CommitDate: Wed Oct 24 11:43:00 2012 -0400 CMake 2.8.10-rc3 diff --git a/ChangeLog.manual b/ChangeLog.manual index a7fd2db..ecf03f5 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,19 @@ +Changes in CMake 2.8.10-rc3 (since 2.8.10-rc2) +-- +Rolf Eike Beer (2): + SelectLibraryConfigurations: add testcase + SelectLibraryConfigurations: fix for release and debug libs being the same + +Stephen Kelly (5): + BasicConfigVersion: Make docs refer to the macro, not the module name + Document LOCATION undefined behavior with use of LINKER_LANGUAGE. + GenEx: Add an accessor for imported targets in a makefile. + GenEx: Create cmGeneratorTargets for imported targets. + GexEx: Validate Target names and property names differently. + +Thomas Arcila (1): + SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntax + Changes in CMake 2.8.10-rc2 (since 2.8.10-rc1) -- Alex Neundorf (2): diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 54bab40..ab65d90 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -3,4 +3,4 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 10) set(CMake_VERSION_TWEAK 0) -set(CMake_VERSION_RC 2) +set(CMake_VERSION_RC 3) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bda4b1c1cd6a75e5cf84d4275bd451ce8a5631c commit 4bda4b1c1cd6a75e5cf84d4275bd451ce8a5631c Merge: f551fa6 f1189ee Author: David Cole david.c...@kitware.com AuthorDate: Wed Oct 24 11:40:33 2012 -0400 Commit: David Cole david.c...@kitware.com CommitDate: Wed Oct 24 11:40:33 2012 -0400 Merge branch 'release' --- Summary of changes: ChangeLog.manual | 16 + .../BasicConfigVersion-AnyNewerVersion.cmake.in|2 +- .../BasicConfigVersion-SameMajorVersion.cmake.in |2 +- Modules/SelectLibraryConfigurations.cmake | 18 -- Source/CMakeVersion.cmake |2 +- Source/cmDocumentLocationUndefined.h |4 +- Source/cmExtraEclipseCDT4Generator.cxx |4 + Source/cmGeneratorExpressionEvaluator.cxx | 17 -- Source/cmGlobalGenerator.cxx | 10 +++ Source/cmLocalGenerator.cxx|4 + Source/cmMakefile.h|4 + Tests/CMakeOnly/CMakeLists.txt |2 + .../SelectLibraryConfigurations/CMakeLists.txt | 64 .../TargetIncludeDirectories/CMakeLists.txt| 11 .../TargetIncludeDirectories/main.cpp |1 + 15 files changed, 143 insertions(+), 18 deletions(-) create mode 100644
[Cmake-commits] CMake branch, next, updated. v2.8.9-1198-g52f669a
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 52f669adb298c1584871e2de61e5dc5faef9e8d5 (commit) via f7abffa7fcde060f3c3fb519090678649ae89dc4 (commit) from 1b3376d80ae926e4f4a6e03acd15be6c8f38aa4d (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=52f669adb298c1584871e2de61e5dc5faef9e8d5 commit 52f669adb298c1584871e2de61e5dc5faef9e8d5 Merge: 1b3376d f7abffa Author: Alexander Neundorf neund...@kde.org AuthorDate: Wed Oct 24 13:48:56 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 24 13:48:56 2012 -0400 Merge topic 'EclipseFixIndexerBySettingSourcePath' into next f7abffa Eclipse: set source path once to fix Eclipse indexer (#13596) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7abffa7fcde060f3c3fb519090678649ae89dc4 commit f7abffa7fcde060f3c3fb519090678649ae89dc4 Author: Alex Neundorf neund...@kde.org AuthorDate: Tue Oct 23 22:38:33 2012 +0200 Commit: Alex Neundorf neund...@kde.org CommitDate: Wed Oct 24 15:26:19 2012 +0200 Eclipse: set source path once to fix Eclipse indexer (#13596) Since CMake 2.8.7 no src-path entry was generated anymore, in response to http://public.kitware.com/Bug/view.php?id=12213 . Before that a src-path entry was added for each linked resource. Now only one src-path entry is added, for the ${CMAKE_SOURCE_DIR}. According to http://public.kitware.com/Bug/view.php?id=13596 this makes the indexer behave better. Alex diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 689f213..09924e0 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -579,7 +579,9 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects( this-GetEclipsePath(linkSourceDirectory), LinkToFolder ); - this-SrcLinkedResources.push_back(it-first); + // Don't add it to the srcLinkedResources, because listing multiple + // directories confuses the Eclipse indexer (#13596). + //this-SrcLinkedResources.push_back(it-first); } } } @@ -730,15 +732,16 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const /* I don't know what the pathentry kind=src are good for, e.g. autocompletion * works also without them. Done wrong, the indexer complains, see #12417 * and #12213. + * According to #13596, this entry at least limits the directories the + * indexer is searching for files. So now the src entry contains only + * the linked resource to CMAKE_SOURCE_DIR. * The CDT documentation is very terse on that: * CDT_SOURCE: Entry kind constant describing a path entry identifying a * folder containing source code to be compiled. * Also on the cdt-dev list didn't bring any information: * http://web.archiveorange.com/archive/v/B4NlJDNIpYoOS1SbxFNy - * So I'm disabling them for now, hoping that somebody will report if something - * is not workging anymore. * Alex */ -#ifdef DO_CREATE_SRC_PATH_ENTRIES + for (std::vectorstd::string::const_iterator it = this-SrcLinkedResources.begin(); it != this-SrcLinkedResources.end(); @@ -755,7 +758,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const excludeFromOut += this-EscapeForXML(*it) + /|; } } -#endif + excludeFromOut += **/CMakeFiles/; fout pathentry excluding=\ excludeFromOut \ kind=\out\ path=\\/\n; --- Summary of changes: Source/cmExtraEclipseCDT4Generator.cxx | 13 - 1 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-1201-g8f903ca
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 8f903ca241e6e538243ade69dddba1b228841b68 (commit) via 3c347a92736e7fbb677758313d287cface7697fc (commit) via f551fa62450379b41b510054948e097582538357 (commit) from 52f669adb298c1584871e2de61e5dc5faef9e8d5 (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=8f903ca241e6e538243ade69dddba1b228841b68 commit 8f903ca241e6e538243ade69dddba1b228841b68 Merge: 52f669a 3c347a9 Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Oct 24 14:19:26 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 24 14:19:26 2012 -0400 Merge topic 'test-major-version' into next 3c347a9 Tests: add MajorVersionSelection tests f551fa6 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c347a92736e7fbb677758313d287cface7697fc commit 3c347a92736e7fbb677758313d287cface7697fc Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Oct 24 19:55:14 2012 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Wed Oct 24 20:19:06 2012 +0200 Tests: add MajorVersionSelection tests For things where we may have 2 major versions of the same software installed in parallel (think of Qt and Python) make sure our version selection gets this right. diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt index 51a630f..44dc5c0 100644 --- a/Tests/CMakeOnly/CMakeLists.txt +++ b/Tests/CMakeOnly/CMakeLists.txt @@ -38,3 +38,21 @@ add_test(CMakeOnly.ProjectInclude ${CMAKE_CMAKE_COMMAND} -DCMAKE_ARGS=-DCMAKE_PROJECT_ProjectInclude_INCLUDE=${CMAKE_CURRENT_SOURCE_DIR}/ProjectInclude/include.cmake -P ${CMAKE_CURRENT_BINARY_DIR}/Test.cmake ) + +include(CMakeParseArguments) + +function(add_major_test module) + cmake_parse_arguments(MAJOR_TEST NOLANG VERSION_VAR VERSIONS ${ARGN}) + foreach (_version IN LISTS MAJOR_TEST_VERSIONS) +add_test(CMakeOnly.MajorVersionSelection-${module}_${_version} + ${CMAKE_CMAKE_COMMAND} +-DTEST=MajorVersionSelection-${module}_${_version} +-DTEST_SOURCE=MajorVersionSelection + -DCMAKE_ARGS=-DMAJOR_TEST_MODULE=${module};-DMAJOR_TEST_VERSION=${_version};-DMAJOR_TEST_NO_LANGUAGES=${MAJOR_TEST_NOLANG};-DMAJOR_TEST_VERSION_VAR=${MAJOR_TEST_VERSION_VAR} +-P ${CMAKE_CURRENT_BINARY_DIR}/Test.cmake + ) + endforeach () +endfunction() + +add_major_test(PythonLibs VERSIONS 2 3 VERSION_VAR PYTHONLIBS_VERSION_STRING) +add_major_test(PythonInterp NOLANG VERSIONS 2 3 VERSION_VAR PYTHON_VERSION_STRING) diff --git a/Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt b/Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt new file mode 100644 index 000..74f5451 --- /dev/null +++ b/Tests/CMakeOnly/MajorVersionSelection/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 2.8) + +if (NOT MAJOR_TEST_MODULE OR NOT MAJOR_TEST_VERSION) + message(FATAL_ERROR test selection variables not set up) +endif () + +if (MAJOR_TEST_NO_LANGUAGES) + project(major_detect_${MAJOR_TEST_MODULE}_${MAJOR_TEST_VERSION} NONE) +else () + project(major_detect_${MAJOR_TEST_MODULE}_${MAJOR_TEST_VERSION}) +endif () + +find_package(${MAJOR_TEST_MODULE} ${MAJOR_TEST_VERSION}) + +if (MAJOR_TEST_VERSION_VAR) + set(VERSION_VAR ${MAJOR_TEST_VERSION_VAR}) +else () + set(VERSION_VAR ${MAJOR_TEST_MODULE}_VERSION_STRING) +endif () + +string(TOUPPER ${MAJOR_TEST_MODULE} MODULE_UPPER) + +if ( ( ${MAJOR_TEST_MODULE}_FOUND OR ${MODULE_UPPER}_FOUND ) AND ${VERSION_VAR}) + message(STATUS ${VERSION_VAR} is '${${VERSION_VAR}}') + if (${VERSION_VAR} VERSION_LESS MAJOR_TEST_VERSION) +message(SEND_ERROR Found version ${${VERSION_VAR}} is less than requested major version ${MAJOR_TEST_VERSION}) + endif () + math(EXPR V_PLUS_ONE ${MAJOR_TEST_VERSION} + 1) + if (${VERSION_VAR} VERSION_GREATER V_PLUS_ONE) +message(SEND_ERROR Found version ${${VERSION_VAR}} is greater than requested major version ${MAJOR_TEST_VERSION}) + endif () +endif () + +if ( ( ${MAJOR_TEST_MODULE}_FOUND OR ${MODULE_UPPER}_FOUND ) AND ${MAJOR_TEST_MODULE}_VERSION_MAJOR) + message(STATUS ${MAJOR_TEST_MODULE}_VERSION_MAJOR is '${${MAJOR_TEST_MODULE}_VERSION_MAJOR}') + if (NOT ${MAJOR_TEST_VERSION} EQUAL ${MAJOR_TEST_MODULE}_VERSION_MAJOR) +message(SEND_ERROR We requested major version ${MAJOR_TEST_VERSION} but ${MAJOR_TEST_MODULE} set ${MAJOR_TEST_MODULE}_VERSION_MAJOR to ${${MAJOR_TEST_MODULE}_VERSION_MAJOR}) + endif () +endif () + +if ( ( ${MAJOR_TEST_MODULE}_FOUND OR ${MODULE_UPPER}_FOUND ) AND ${MODULE_UPPER}_VERSION_MAJOR) + message(STATUS
[Cmake-commits] CMake branch, next, updated. v2.8.9-1204-gd102dcb
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 d102dcba4b7e801559e9b92089cf0db2b649da41 (commit) via 041fb29bd7b25a03ecf5aab2bb6737a10ab21e67 (commit) via 7bb9395974c2edb078db908cc9c7f1c5752e2aff (commit) from 8f903ca241e6e538243ade69dddba1b228841b68 (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=d102dcba4b7e801559e9b92089cf0db2b649da41 commit d102dcba4b7e801559e9b92089cf0db2b649da41 Merge: 8f903ca 041fb29 Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Oct 24 14:20:32 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 24 14:20:32 2012 -0400 Merge topic 'FindQt-version-selection' into next 041fb29 FindQt: add some more places to look for Qt3 7bb9395 FindQt: improve version selection http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=041fb29bd7b25a03ecf5aab2bb6737a10ab21e67 commit 041fb29bd7b25a03ecf5aab2bb6737a10ab21e67 Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Oct 24 19:52:58 2012 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Wed Oct 24 20:19:54 2012 +0200 FindQt: add some more places to look for Qt3 Qt3 may be e.g. in /usr/lib64/qt-3 or in /usr/lib/qt3, too. diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 1a2e16c..5af3125 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -31,7 +31,7 @@ # License text for the above reference.) # look for signs of qt3 installations -file(GLOB GLOB_TEMP_VAR /usr/lib/qt-3*/bin/qmake) +file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake) if(GLOB_TEMP_VAR) set(QT3_INSTALLED TRUE) endif() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bb9395974c2edb078db908cc9c7f1c5752e2aff commit 7bb9395974c2edb078db908cc9c7f1c5752e2aff Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Oct 24 19:50:47 2012 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Wed Oct 24 20:19:50 2012 +0200 FindQt: improve version selection -make find_package(Qt 3) work -if DESIRED_QT_VERSION was set, but only the other Qt major version was found don't override the DESIRED_QT_VERSION set by the user diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 13f18fe..1a2e16c 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -56,6 +56,10 @@ if(GLOB_TEMP_VAR) endif() set(GLOB_TEMP_VAR) +if (Qt_FIND_VERSION) + set(DESIRED_QT_VERSION ${Qt_FIND_VERSION}) +endif () + # now find qmake find_program(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake PATHS ${QT_SEARCH_PATH}/bin $ENV{QTDIR}/bin) if(QT_QMAKE_EXECUTABLE_FINDQT) @@ -113,15 +117,15 @@ if(QT3_QGLOBAL_H_FILE) set(QT3_INSTALLED TRUE) endif() -if(QT3_INSTALLED AND QT4_INSTALLED ) +if(QT3_INSTALLED AND QT4_INSTALLED AND NOT DESIRED_QT_VERSION) # force user to pick if we have both set(DESIRED_QT_VERSION 0 CACHE STRING Pick a version of Qt to use: 3 or 4) else() # if only one found then pick that one - if(QT3_INSTALLED) + if(QT3_INSTALLED AND NOT DESIRED_QT_VERSION EQUAL 4) set(DESIRED_QT_VERSION 3 CACHE STRING Pick a version of Qt to use: 3 or 4) endif() - if(QT4_INSTALLED) + if(QT4_INSTALLED AND NOT DESIRED_QT_VERSION EQUAL 3) set(DESIRED_QT_VERSION 4 CACHE STRING Pick a version of Qt to use: 3 or 4) endif() endif() --- Summary of changes: Modules/FindQt.cmake | 12 1 files changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-1206-gd3328cb
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 d3328cb775dbbbe63722accd2625b53a83702086 (commit) via 763cf0af6d4386ddfd8049cddb7cf17466bcf225 (commit) from d102dcba4b7e801559e9b92089cf0db2b649da41 (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=d3328cb775dbbbe63722accd2625b53a83702086 commit d3328cb775dbbbe63722accd2625b53a83702086 Merge: d102dcb 763cf0a Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Oct 24 14:58:51 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 24 14:58:51 2012 -0400 Merge topic 'test-major-version' into next 763cf0a use CMakeParseArguments from the source tree http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=763cf0af6d4386ddfd8049cddb7cf17466bcf225 commit 763cf0af6d4386ddfd8049cddb7cf17466bcf225 Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Oct 24 20:58:34 2012 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Wed Oct 24 20:58:34 2012 +0200 use CMakeParseArguments from the source tree CMake 2.8.2 and before do not have that module diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt index 44dc5c0..832d7bd 100644 --- a/Tests/CMakeOnly/CMakeLists.txt +++ b/Tests/CMakeOnly/CMakeLists.txt @@ -39,7 +39,7 @@ add_test(CMakeOnly.ProjectInclude ${CMAKE_CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/Test.cmake ) -include(CMakeParseArguments) +include(${CMAKE_SOURCE_DIR}/Modules/CMakeParseArguments.cmake) function(add_major_test module) cmake_parse_arguments(MAJOR_TEST NOLANG VERSION_VAR VERSIONS ${ARGN}) --- Summary of changes: Tests/CMakeOnly/CMakeLists.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-594-g259cff9
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 259cff94ff81f7b95b7375905fe0e0a292f70dda (commit) from f551fa62450379b41b510054948e097582538357 (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=259cff94ff81f7b95b7375905fe0e0a292f70dda commit 259cff94ff81f7b95b7375905fe0e0a292f70dda Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Oct 25 00:01:06 2012 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Oct 25 00:01:06 2012 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 33d1411..467a73e 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 9) -set(CMake_VERSION_TWEAK 20121024) +set(CMake_VERSION_TWEAK 20121025) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits