Re: [cmake-developers] CMake 2.8.12 transitive link regression?
Brad King wrote: Can you explain what the comment about LINK_LIBRARIES means? The comment carried the (now known to be mistaken) assumption that the implementation is only ever the interface if CMP0022 is OLD. If it is NEW, then the INTERFACE_LINK_LIBRARIES defines the link interface (exclusively and always, as the assumption went), and as the preceeding if(explicitLibraries) was not entered, it was not set, and therefore there is no link interface at all. It is the logic here that needs to trigger regardless of the CMP0022 setting, and then the export logic must deal with the case that the implementation is the interface both for populating the new and old interface properties. Your commit, and my follow up from today don't pass this test: add_library(foo SHARED foo.cpp) add_library(bar SHARED foo.cpp) # target_link_libraries(foo bar) set_property(TARGET foo PROPERTY LINK_LIBRARIES bar) file(GENERATE OUTPUT outputfile CONTENT $TARGET_PROPERTY:foo,INTERFACE_LINK_LIBRARIES\n) # Expect outputfile to contain 'bar', but it does not. That was a primary motivation for introducing INTERFACE_LINK_LIBRARIES. So, I guess we should add something similar to the export logic to the genex TargetPropertyNode. Any comments on that? 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
Re: [cmake-developers] CMake 2.8.12 transitive link regression?
On 11/01/2013 07:32 AM, Stephen Kelly wrote:
Your commit, and my follow up from today don't pass this test:
In your follow up, you removed my hunk:
- // Make sure INTERFACE_LINK_LIBRARIES target property exists
- // if any signature except the plain one was used. Other
- // signatures imply awareness of explicit link interfaces.
- if(this-CurrentProcessingState != ProcessingLinkLibraries
- !this-Target-GetProperty(INTERFACE_LINK_LIBRARIES))
-{
-this-Target-SetProperty(INTERFACE_LINK_LIBRARIES, );
-}
What is wrong with it? The documentation of the tll signatures
besides the plain one says that they set INTERFACE_LINK_LIBRARIES.
Shouldn't it get set to empty if a non-plain signature is used
that doesn't add anything to the interface?
add_library(foo SHARED foo.cpp)
add_library(bar SHARED foo.cpp)
# target_link_libraries(foo bar)
set_property(TARGET foo PROPERTY LINK_LIBRARIES bar)
file(GENERATE OUTPUT outputfile
CONTENT $TARGET_PROPERTY:foo,INTERFACE_LINK_LIBRARIES\n)
# Expect outputfile to contain 'bar', but it does not.
That was a primary motivation for introducing INTERFACE_LINK_LIBRARIES.
So, I guess we should add something similar to the export logic to the genex
TargetPropertyNode. Any comments on that?
I think we should encourage use of the tll keyword signatures
in which case this doesn't matter. However, we can try to support
this. Perhaps the implementation of cmTarget::GetProperty can
special-case INTERFACE_LINK_LIBRARIES to return LINK_LIBRARIES
if only the plain tll signature was used. That will cover both
the export and generator expression cases, no?
-Brad
--
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.12 transitive link regression?
On 11/01/2013 08:49 AM, Brad King wrote: On 11/01/2013 07:32 AM, Stephen Kelly wrote: add_library(foo SHARED foo.cpp) add_library(bar SHARED foo.cpp) # target_link_libraries(foo bar) set_property(TARGET foo PROPERTY LINK_LIBRARIES bar) file(GENERATE OUTPUT outputfile CONTENT $TARGET_PROPERTY:foo,INTERFACE_LINK_LIBRARIES\n) # Expect outputfile to contain 'bar', but it does not. Actually, why would we expect 'bar' when setting LINK_LIBRARIES directly? Without the old plain tll() calls I see no reason to expect the link interface to be the link implementation. The link implementation fallback is only for compatibility with the long-standing tll plain signature behavior. If a project sets link information by other means then it takes responsibility for setting the link interface too. Perhaps the implementation of cmTarget::GetProperty can special-case INTERFACE_LINK_LIBRARIES to return LINK_LIBRARIES if only the plain tll signature was used. On second thought, this is a bad idea because it could trigger in a get_property call or something earlier than the last tll call. So yes, hacking the generator expression node for the fallback is probably the right fix. Please also work on the test cases. Thanks, -Brad -- 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] Update to the P4 patch
On 10/31/2013 04:40 PM, Pedro Navarro wrote: Attached is an updated version of the P4 patch. Applied: ctest_update: Do not remove the p4 depot name http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b54b1d5 Thanks, -Brad -- 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] Continuous CMake documentation of 'next' and 'master'
That is awesome ! :) On Fri, Nov 1, 2013 at 11:37 AM, Brad King brad.k...@kitware.com wrote: Hi Folks, We now publish CMake documentation built from 'next': http://www.cmake.org/cmake/help/git-next/ and from 'master': http://www.cmake.org/cmake/help/git-master/ updated every 10 minutes from each branch. There is also a continuous dashboard submission section: http://open.cdash.org/index.php?project=CMake#Continuous_Help that builds just the documentation for rapid turnaround. These links now appear in the developer workflow instructions: http://www.cmake.org/Wiki/CMake/Git/Develop#Merge_a_Topic_for_Testing Please follow the links from those instructions when you modify documentation to make sure it builds and renders correctly. Thanks, -Brad -- 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 -- +1 919 869 8849 -- 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 0014538]: passing -D to ccmake prevents editing that value
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14538 == Reported By:mwoehlke Assigned To: == Project:CMake Issue ID: 14538 Category: CCMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2013-11-01 19:44 EDT Last Modified: 2013-11-01 19:44 EDT == Summary:passing -D to ccmake prevents editing that value Description: Values passed as e.g. -D arguments to ccmake cannot be edited in ccmake; they are reset to the value on the command line when configuring the project. This is caused by ccmake naïvely passing these arguments along to cmake when it is invoked, such that they are reset to the value given on the command line and not the value specified in ccmake. Steps to Reproduce: - ccmake -DFOO=123 - change FOO to something else - configure - FOO is reset to 123 == Issue History Date ModifiedUsername FieldChange == 2013-11-01 19: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
Re: [CMake] assembler with non standard extension with gcc compiler
On Thursday 31 October 2013, Ivan Sergio Borgonovo wrote: On Thu, 31 Oct 2013 21:17:11 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: On Thursday 31 October 2013, Ivan Sergio Borgonovo wrote: On Thu, 31 Oct 2013 18:01:29 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: Did you try setting the source file property LANGUAGE to ASM for these files ? http://www.cmake.org/cmake/help/v2.8.12/cmake.html#prop_sf:LANGUAGE Thanks, that made the trick but I ran into another problem: One of those asm file is somehow being ignored by cmake. I can find the right commands greping in the build dir but they are not executed during make: can you post a bit more from your cmake files, or maybe a complete minimal example ? It was automatically generated by a python script. The schema is: main CMakeLists.txt [list of include_directories()] [list of add_subdirectory()] add_executable(project main.c) target_link_libraries(project [list of targets]) In each dir I've a CMakeLists.txt consisting of: add_library(target STATIC source) # for asm source only: set_source_files_properties(source PROPERTIES LANGUAGE ASM) SET_TARGET_PROPERTIES(target PROPERTIES LINKER_LANGUAGE ASM) All asm files get compiled and linked with the exception of one. The only difference I can spot is that others contains global symbols that are referenced in C files[1] or in the linker options[2] while the only one that doesn't get compiled and linked contains symbols that are referenced just in another ASM file[3]. so crt0.x is the missing one, right ? Are you sure it is not compiled ? (let's just use compile although an assembler file is not actually compiled) Or is just the symbol missing when linking ? If crt0.x is listed as a source file, I see no reason why this one file should not be compiled. I would guess that it is compiled, but the object file is not included by the linker because nobody else references anything from it. Can you post the complete linker command ? Alex -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Fri, 1 Nov 2013 11:37:10 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: so crt0.x is the missing one, right ? Are you sure it is not compiled ? Absolutely. Once I've added add_dependencies(someotherasm crt0.x) crt0.x got compiled BUT not linked. But even after I succede to compile libcrt0.a and even if crt0 was included in the target_link_libraries() list it was missing from the list of the actually linked libraries. That mean I had a libcrt0.a but cmake was running gcc without it in the list of libraries to link. I finally found a way to force cmake to link it adding set_property(TARGET SAM3 APPEND PROPERTY LINK_LIBRARIES crt0) after target_link_libraries(). I don't know if this is the best way to do it but it works. Anyway I ran into a new list of problems I'm still investigating. So as for the how to make cmake recognize different asm extension and the how to force cmake to compile and link asm files when it seems it can't get dependencies right the problem seems solved -- Ivan Sergio Borgonovo http://www.webthatworks.it -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Friday 01 November 2013, Ivan Sergio Borgonovo wrote: On Fri, 1 Nov 2013 11:37:10 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: so crt0.x is the missing one, right ? Are you sure it is not compiled ? Absolutely. Once I've added add_dependencies(someotherasm crt0.x) crt0.x got compiled BUT not linked. Very strange. I'll see whether I can reproduce this. Alex -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Fri, 1 Nov 2013 12:58:32 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: On Friday 01 November 2013, Ivan Sergio Borgonovo wrote: On Fri, 1 Nov 2013 11:37:10 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: so crt0.x is the missing one, right ? Are you sure it is not compiled ? Absolutely. Once I've added add_dependencies(someotherasm crt0.x) crt0.x got compiled BUT not linked. Very strange. I'll see whether I can reproduce this. If it was supposed to work right out of the box without fiddling with it I'll try to add some more details and a bunch code sample. All the code involved is part of atmel asf[1] The 2 files involved are trampoline.x and crt0.x. crt0.x define _stext .global _stext .type _stext, @function _stext: and trampoline.x uses it lda.w pc, _stext I've a add_library(crt0 crt0.x) and a target_link_libraries(... crt0) But without some help[2] crt0 doesn't get compiled and linked [1] I'm working on an older version then the one available on atmel site but I think you can get the idea [2] add_dependencies(trampoline crt0.x) make it compile set_property(TARGET SAM3 APPEND PROPERTY LINK_LIBRARIES crt0) make it link -- Ivan Sergio Borgonovo http://www.webthatworks.it -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Forwarding parameters to cmake through cmake-gui
I've already searched for a feature like this but was not able to find it. Then i've looked up in the cmake-gui source code but couldn't find anything related. What I'm looking for: If cmake is used directly from the command line, it's possible to pass a bunch of options ( http://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options). This is nice because with this it's possible to use default settings - even if the cache get deleted. I'm actually really interested in this because it would be possible to set the CMAKE_MODULE_PATH variable via batch file - which is neat for custom find modules in custom locations. My Request: I would like to see a feature which makes it possible to pass command line options to cmake-gui which get forwarded to cmake when it gets called. To make this work the cmake-gui could look for parameters which look like forward-* (where the * is a cmake option name) and pass it to cmake. Are there any counter-arguments against this? In my opinion it would make things much cleaner. -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
Hi Physhh, I like the idea. Instead, a gui panel (with tooltips, doc, ...) should be autogenerated from the option associated to the corresponding cmake executable. Would be happy to review changes / patches. Thanks Jc On Fri, Nov 1, 2013 at 10:47 AM, physhh . phy...@gmail.com wrote: I've already searched for a feature like this but was not able to find it. Then i've looked up in the cmake-gui source code but couldn't find anything related. What I'm looking for: If cmake is used directly from the command line, it's possible to pass a bunch of options ( http://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options). This is nice because with this it's possible to use default settings - even if the cache get deleted. I'm actually really interested in this because it would be possible to set the CMAKE_MODULE_PATH variable via batch file - which is neat for custom find modules in custom locations. My Request: I would like to see a feature which makes it possible to pass command line options to cmake-gui which get forwarded to cmake when it gets called. To make this work the cmake-gui could look for parameters which look like forward-* (where the * is a cmake option name) and pass it to cmake. Are there any counter-arguments against this? In my opinion it would make things much cleaner. -- 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://www.cmake.org/mailman/listinfo/cmake -- +1 919 869 8849 -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
Hi Jean, I'm not quite sure I've understood your feedback correctly. You mean it would be nice to add a panel to the gui which lists all forwarded options with description text? Will try to create a patch for this. Thanks for your time On Fri, Nov 1, 2013 at 3:52 PM, Jean-Christophe Fillion-Robin jchris.filli...@kitware.com wrote: Hi Physhh, I like the idea. Instead, a gui panel (with tooltips, doc, ...) should be autogenerated from the option associated to the corresponding cmake executable. Would be happy to review changes / patches. Thanks Jc On Fri, Nov 1, 2013 at 10:47 AM, physhh . phy...@gmail.com wrote: I've already searched for a feature like this but was not able to find it. Then i've looked up in the cmake-gui source code but couldn't find anything related. What I'm looking for: If cmake is used directly from the command line, it's possible to pass a bunch of options ( http://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options). This is nice because with this it's possible to use default settings - even if the cache get deleted. I'm actually really interested in this because it would be possible to set the CMAKE_MODULE_PATH variable via batch file - which is neat for custom find modules in custom locations. My Request: I would like to see a feature which makes it possible to pass command line options to cmake-gui which get forwarded to cmake when it gets called. To make this work the cmake-gui could look for parameters which look like forward-* (where the * is a cmake option name) and pass it to cmake. Are there any counter-arguments against this? In my opinion it would make things much cleaner. -- 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://www.cmake.org/mailman/listinfo/cmake -- +1 919 869 8849 -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
Hi, More specifically, it could be an entry named More Options ... in the already available Options menu. Or you could simply expose more command line option directly in that menu. Jc On Fri, Nov 1, 2013 at 11:05 AM, physhh . phy...@gmail.com wrote: Hi Jean, I'm not quite sure I've understood your feedback correctly. You mean it would be nice to add a panel to the gui which lists all forwarded options with description text? Will try to create a patch for this. Thanks for your time On Fri, Nov 1, 2013 at 3:52 PM, Jean-Christophe Fillion-Robin jchris.filli...@kitware.com wrote: Hi Physhh, I like the idea. Instead, a gui panel (with tooltips, doc, ...) should be autogenerated from the option associated to the corresponding cmake executable. Would be happy to review changes / patches. Thanks Jc On Fri, Nov 1, 2013 at 10:47 AM, physhh . phy...@gmail.com wrote: I've already searched for a feature like this but was not able to find it. Then i've looked up in the cmake-gui source code but couldn't find anything related. What I'm looking for: If cmake is used directly from the command line, it's possible to pass a bunch of options ( http://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options). This is nice because with this it's possible to use default settings - even if the cache get deleted. I'm actually really interested in this because it would be possible to set the CMAKE_MODULE_PATH variable via batch file - which is neat for custom find modules in custom locations. My Request: I would like to see a feature which makes it possible to pass command line options to cmake-gui which get forwarded to cmake when it gets called. To make this work the cmake-gui could look for parameters which look like forward-* (where the * is a cmake option name) and pass it to cmake. Are there any counter-arguments against this? In my opinion it would make things much cleaner. -- 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://www.cmake.org/mailman/listinfo/cmake -- +1 919 869 8849 -- +1 919 869 8849 -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
On 2013-11-01 10:47, physhh . wrote: What I'm looking for: If cmake is used directly from the command line, it's possible to pass a bunch of options. This is nice because with this it's possible to use default settings - even if the cache get deleted. ccmake accepts e.g. -D options to set CMake cache variables. It... does appear that cmake-gui does not. That seems like a bug (or at least a missing feature that one would naturally expect to exist). I would like to see a feature which makes it possible to pass command line options to cmake-gui which get forwarded to cmake when it gets called. To make this work the cmake-gui could look for parameters which look like forward-* (where the * is a cmake option name) and pass it to cmake. I'm not sure a forward option makes sense... what would it mean to forward e.g. -P or -E? Rather, I think cmake-gui should just accept directly those options that make sense, e.g. -D, -U, -C, -G, -T and probably -W[no-]dev, the same way that ccmake does. (Besides, these should affect cmake-gui even before cmake is invoked, so merely forwarding them is actually insufficient.) -- Matthew -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
Hey Matthew, that's interesting. I'm currently at a windows only machine so i can't check out ccmake but can only lookup the source. It appears that ALL parameters get forwarded to cmake - at least that's what cmCursesMainForm.cxx:52 this-CMakeInstance-SetArgs(this-Args); looks to me. Why do you think that a simple forward is not enough? ccmake seems to do it exactly that way? On Fri, Nov 1, 2013 at 4:12 PM, Matthew Woehlke matthew.woeh...@kitware.com wrote: On 2013-11-01 10:47, physhh . wrote: What I'm looking for: If cmake is used directly from the command line, it's possible to pass a bunch of options. This is nice because with this it's possible to use default settings - even if the cache get deleted. ccmake accepts e.g. -D options to set CMake cache variables. It... does appear that cmake-gui does not. That seems like a bug (or at least a missing feature that one would naturally expect to exist). I would like to see a feature which makes it possible to pass command line options to cmake-gui which get forwarded to cmake when it gets called. To make this work the cmake-gui could look for parameters which look like forward-* (where the * is a cmake option name) and pass it to cmake. I'm not sure a forward option makes sense... what would it mean to forward e.g. -P or -E? Rather, I think cmake-gui should just accept directly those options that make sense, e.g. -D, -U, -C, -G, -T and probably -W[no-]dev, the same way that ccmake does. (Besides, these should affect cmake-gui even before cmake is invoked, so merely forwarding them is actually insufficient.) -- Matthew -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/**CMake_FAQhttp://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.htmlhttp://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/**consulting.htmlhttp://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/**training.htmlhttp://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/** opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/**listinfo/cmakehttp://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
On 11/1/2013 10:47 AM, physhh . wrote: If cmake is used directly from the command line, it's possible to pass a bunch of options (http://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options). This is nice because with this it's possible to use default settings - even if the cache get deleted. I'm actually really interested in this because it would be possible to set the CMAKE_MODULE_PATH variable via batch file - which is neat for custom find modules in custom locations. Branching the topic a bit. cmake-gui should most likely be updated to take the same arguments that ccmake and cmake take. However, if you are setting CMAKE_MODULE_PATH, the best place to do it is in the CMake code of your project. That way your project will stand on its own and not require special command line options to build (which is bad IMO). -Bill -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
+1 for updating cmake-gui to work equally to ccmake But my opinion regarding CMAKE_MODULE_PATH is different. The problem is that alot of the default find-modules don't work because the dependency is not in the location where the find-module expects it. Currently there are only two workarounds: - Change the find-module directly so it works in the local environment - Change the CMakeLists.txt of the project - which is bad because it's just a LOCAL problem and the CMakeLists should be mostly independent of the environment. With the command-line option it's possible to setup a custom cmake-gui batch file once per computer which sets e.g. the CMAKE_MODULE_PATH to a directory with customized find modules. If one doesn't want to use custom find modules that's fine too but I think everyone should have the option to place dependent libraries wherever she/he wants. On Fri, Nov 1, 2013 at 4:56 PM, Bill Hoffman bill.hoff...@kitware.comwrote: On 11/1/2013 10:47 AM, physhh . wrote: If cmake is used directly from the command line, it's possible to pass a bunch of options (http://www.cmake.org/cmake/**help/v2.8.12/cmake.html#**section_Optionshttp://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options ). This is nice because with this it's possible to use default settings - even if the cache get deleted. I'm actually really interested in this because it would be possible to set the CMAKE_MODULE_PATH variable via batch file - which is neat for custom find modules in custom locations. Branching the topic a bit. cmake-gui should most likely be updated to take the same arguments that ccmake and cmake take. However, if you are setting CMAKE_MODULE_PATH, the best place to do it is in the CMake code of your project. That way your project will stand on its own and not require special command line options to build (which is bad IMO). -Bill -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/**CMake_FAQhttp://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.htmlhttp://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/**consulting.htmlhttp://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/**training.htmlhttp://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/** opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/**listinfo/cmakehttp://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
+1 for updating cmake-gui to work equally to ccmake But my opinion regarding CMAKE_MODULE_PATH is different. The problem is that alot of the default find-modules don't work because the dependency is not in the location where the find-module expects it. Currently there are only two workarounds: - Change the find-module directly so it works in the local environment - Change the CMakeLists.txt of the project - which is bad because it's just a LOCAL problem and the CMakeLists should be mostly independent of the environment. With the command-line option it's possible to setup a custom cmake-gui batch file once per computer which sets e.g. the CMAKE_MODULE_PATH to a directory with customized find modules. If one doesn't want to use custom find modules that's fine too but I think everyone should have the option to place dependent libraries wherever she/he wants. For these kind of things I use environment variables in my CMakeLists.txt. If the environment variable is set I use it. If not I use the default behavior. John -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Friday 01 November 2013, Ivan Sergio Borgonovo wrote: On Fri, 1 Nov 2013 12:58:32 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: On Friday 01 November 2013, Ivan Sergio Borgonovo wrote: On Fri, 1 Nov 2013 11:37:10 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: so crt0.x is the missing one, right ? Are you sure it is not compiled ? Absolutely. Once I've added add_dependencies(someotherasm crt0.x) crt0.x got compiled BUT not linked. Very strange. I'll see whether I can reproduce this. If it was supposed to work right out of the box without fiddling with having to set the LANGUAGE is expected for unusual file extensions. With that, it should work. it I'll try to add some more details and a bunch code sample. All the code involved is part of atmel asf[1] The 2 files involved are trampoline.x and crt0.x. crt0.x define _stext .global _stext .type _stext, @function _stext: and trampoline.x uses it lda.w pc, _stext I've a add_library(crt0 crt0.x) and a target_link_libraries(... crt0) But without some help[2] crt0 doesn't get compiled and linked Could you try to rename your target crt0 to something different and see whether this changes something ? [1] I'm working on an older version then the one available on atmel site but I think you can get the idea [2] add_dependencies(trampoline crt0.x) hmm, this should actually only add dependencies between targets, and crt0.x is just a source file, not a target. So this is strange too. make it compile set_property(TARGET SAM3 APPEND PROPERTY LINK_LIBRARIES crt0) make it link usually a target_link_libraries(SAM3 ... crt0 ... ) should do. Alex -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
Yes but not all cmake projects which I build are mine. So i would still have to modify a CMakeLists from someone else, which is in my opinion a bad thing. When you have the possiblity to inject cmake stuff without modifying the project itself you can implement a clean separation between project dependencies and how/where to find those. On Fri, Nov 1, 2013 at 5:28 PM, John Drescher dresche...@gmail.com wrote: +1 for updating cmake-gui to work equally to ccmake But my opinion regarding CMAKE_MODULE_PATH is different. The problem is that alot of the default find-modules don't work because the dependency is not in the location where the find-module expects it. Currently there are only two workarounds: - Change the find-module directly so it works in the local environment - Change the CMakeLists.txt of the project - which is bad because it's just a LOCAL problem and the CMakeLists should be mostly independent of the environment. With the command-line option it's possible to setup a custom cmake-gui batch file once per computer which sets e.g. the CMAKE_MODULE_PATH to a directory with customized find modules. If one doesn't want to use custom find modules that's fine too but I think everyone should have the option to place dependent libraries wherever she/he wants. For these kind of things I use environment variables in my CMakeLists.txt. If the environment variable is set I use it. If not I use the default behavior. John -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Fri, 1 Nov 2013 17:36:33 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: If it was supposed to work right out of the box without fiddling with having to set the LANGUAGE is expected for unusual file extensions. With that, it should work. That's OK. I just had to understand how. Could you try to rename your target crt0 to something different and see whether this changes something ? I renamed the crt0.x file to pino.x. removed add_dependencies() and set_property(...) pino.x get assembled but it doesn't get linked. -- Ivan Sergio Borgonovo http://www.webthatworks.it -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
On 2013-11-01 11:39, physhh . wrote: that's interesting. I'm currently at a windows only machine so i can't check out ccmake but can only lookup the source. It appears that ALL parameters get forwarded to cmake - at least that's what cmCursesMainForm.cxx:52 this-CMakeInstance-SetArgs(this-Args); looks to me. Why do you think that a simple forward is not enough? ccmake seems to do it exactly that way? I don't know enough of the guts to know how values initially specified in ccmake / cmake-gui get passed to CMake. Where you could get into trouble is, say, you pass -DBOOST_ROOT=/some/ptah, realize you've made a mistake (e.g. 'ptah' - 'path') and fix it in the gui before running cmake. Now does cmake see the original value or the corrected value? That's where it *might* go sideways. But it might also be perfectly safe to just pass them through, e.g. if the corrected value is passed also as a -D argument later in the list. However, what I was mainly getting at is that cmake-gui should also process the -D, etc., as I am pretty sure ccmake does, so that it can display those values and/or make appropriate use of the arguments. -- Matthew -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Friday 01 November 2013, Ivan Sergio Borgonovo wrote: On Fri, 1 Nov 2013 17:36:33 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: If it was supposed to work right out of the box without fiddling with having to set the LANGUAGE is expected for unusual file extensions. With that, it should work. That's OK. I just had to understand how. Could you try to rename your target crt0 to something different and see whether this changes something ? I renamed the crt0.x file to pino.x. removed add_dependencies() and set_property(...) pino.x get assembled but it doesn't get linked. and the name of the library target ? Still crt0 or something else ? Alex -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Fri, 1 Nov 2013 20:08:05 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: On Friday 01 November 2013, Ivan Sergio Borgonovo wrote: On Fri, 1 Nov 2013 17:36:33 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: If it was supposed to work right out of the box without fiddling with having to set the LANGUAGE is expected for unusual file extensions. With that, it should work. That's OK. I just had to understand how. Could you try to rename your target crt0 to something different and see whether this changes something ? I renamed the crt0.x file to pino.x. removed add_dependencies() and set_property(...) pino.x get assembled but it doesn't get linked. and the name of the library target ? Still crt0 or something else ? Changed too. Everything is generated by a python script that take the name of the target from the source (+ numbering if needed to avoid duplicates in targets name). I just had one file whose name was duplicated and coincidentally it was an asm file too. 2 exception.x whose targets became exception and exception1 but both of them were compiled and just 1 linked, since just one was actually referenced in the rest of the code. -- Ivan Sergio Borgonovo http://www.webthatworks.it -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
I've tried to implement it in the same way as CCMake seem to do it. Because I can't compare it = Could somone with access to ccmake test this: - Start CCMake with -D foo=123 - Configure - Question: Is foo displayed in the variable list? - Add/Edit foo to some other value - Configure - Question: Was foo overwritten with 123? Thanks On Fri, Nov 1, 2013 at 7:02 PM, Matthew Woehlke matthew.woeh...@kitware.com wrote: On 2013-11-01 11:39, physhh . wrote: that's interesting. I'm currently at a windows only machine so i can't check out ccmake but can only lookup the source. It appears that ALL parameters get forwarded to cmake - at least that's what cmCursesMainForm.cxx:52 this-CMakeInstance-SetArgs(**this-Args); looks to me. Why do you think that a simple forward is not enough? ccmake seems to do it exactly that way? I don't know enough of the guts to know how values initially specified in ccmake / cmake-gui get passed to CMake. Where you could get into trouble is, say, you pass -DBOOST_ROOT=/some/ptah, realize you've made a mistake (e.g. 'ptah' - 'path') and fix it in the gui before running cmake. Now does cmake see the original value or the corrected value? That's where it *might* go sideways. But it might also be perfectly safe to just pass them through, e.g. if the corrected value is passed also as a -D argument later in the list. However, what I was mainly getting at is that cmake-gui should also process the -D, etc., as I am pretty sure ccmake does, so that it can display those values and/or make appropriate use of the arguments. -- Matthew -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/**CMake_FAQhttp://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.htmlhttp://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/**consulting.htmlhttp://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/**training.htmlhttp://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/** opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/**listinfo/cmakehttp://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] does cmake get dependencies between asm files? and when said so does it link them?
On Fri, 1 Nov 2013 20:08:05 +0100 Alexander Neundorf a.neundorf-w...@gmx.net wrote: and the name of the library target ? Still crt0 or something else ? BTW I'm using 2.8.11.2 in Debian sid -- Ivan Sergio Borgonovo http://www.webthatworks.it -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
Current patch: http://pastebin.com/DfGZtGQT On Fri, Nov 1, 2013 at 10:35 PM, physhh . phy...@gmail.com wrote: I've tried to implement it in the same way as CCMake seem to do it. Because I can't compare it = Could somone with access to ccmake test this: - Start CCMake with -D foo=123 - Configure - Question: Is foo displayed in the variable list? - Add/Edit foo to some other value - Configure - Question: Was foo overwritten with 123? Thanks On Fri, Nov 1, 2013 at 7:02 PM, Matthew Woehlke matthew.woeh...@kitware.com wrote: On 2013-11-01 11:39, physhh . wrote: that's interesting. I'm currently at a windows only machine so i can't check out ccmake but can only lookup the source. It appears that ALL parameters get forwarded to cmake - at least that's what cmCursesMainForm.cxx:52 this-CMakeInstance-SetArgs(**this-Args); looks to me. Why do you think that a simple forward is not enough? ccmake seems to do it exactly that way? I don't know enough of the guts to know how values initially specified in ccmake / cmake-gui get passed to CMake. Where you could get into trouble is, say, you pass -DBOOST_ROOT=/some/ptah, realize you've made a mistake (e.g. 'ptah' - 'path') and fix it in the gui before running cmake. Now does cmake see the original value or the corrected value? That's where it *might* go sideways. But it might also be perfectly safe to just pass them through, e.g. if the corrected value is passed also as a -D argument later in the list. However, what I was mainly getting at is that cmake-gui should also process the -D, etc., as I am pretty sure ccmake does, so that it can display those values and/or make appropriate use of the arguments. -- Matthew -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/**CMake_FAQhttp://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.htmlhttp://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/**consulting.htmlhttp://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/**training.htmlhttp://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/** opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/**listinfo/cmakehttp://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
On 2013-11-01 17:35, physhh . wrote: I've tried to implement it in the same way as CCMake seem to do it. Because I can't compare it = Could somone with access to ccmake test this: - Start CCMake with -D foo=123 - Configure - Question: Is foo displayed in the variable list? Yes. - Add/Edit foo to some other value - Configure - Question: Was foo overwritten with 123? Yes. Repeatedly (i.e. if I configure, then change it, it still gets overwritten). And I'm going to have to call that a bug; it's hard to imagine how it is desired behavior. -- Matthew -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
On 2013-11-01 19:39, Matthew Woehlke wrote: On 2013-11-01 17:35, physhh . wrote: I've tried to implement it in the same way as CCMake seem to do it. Because I can't compare it = Could somone with access to ccmake test this: - Start CCMake with -D foo=123 - Configure - Question: Is foo displayed in the variable list? Yes. - Add/Edit foo to some other value - Configure - Question: Was foo overwritten with 123? Yes. Repeatedly (i.e. if I configure, then change it, it still gets overwritten). And I'm going to have to call that a bug; it's hard to imagine how it is desired behavior. Reported here: http://public.kitware.com/Bug/view.php?id=14538. -- Matthew -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
The question is: What is the expected behavior? Execute it per configure but don't overwrite variables? What if one really wants to overwrite? Execute it once every time the binary directory changes? Changing stuff only through setting the path is bad. Other possiblities? On Sat, Nov 2, 2013 at 12:45 AM, Matthew Woehlke matthew.woeh...@kitware.com wrote: On 2013-11-01 19:39, Matthew Woehlke wrote: On 2013-11-01 17:35, physhh . wrote: I've tried to implement it in the same way as CCMake seem to do it. Because I can't compare it = Could somone with access to ccmake test this: - Start CCMake with -D foo=123 - Configure - Question: Is foo displayed in the variable list? Yes. - Add/Edit foo to some other value - Configure - Question: Was foo overwritten with 123? Yes. Repeatedly (i.e. if I configure, then change it, it still gets overwritten). And I'm going to have to call that a bug; it's hard to imagine how it is desired behavior. Reported here: http://public.kitware.com/Bug/**view.php?id=14538http://public.kitware.com/Bug/view.php?id=14538 . -- Matthew -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/**CMake_FAQhttp://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.htmlhttp://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/**consulting.htmlhttp://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/**training.htmlhttp://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/** opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/**listinfo/cmakehttp://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
I have a macro . (maybe it has a horrible name...)
macro( DEFINE_DEFAULT variable default )
if( NOT DEFINED ${variable} )
#message( variable ${variable} not defined (command line) )
set( ${variable} $ENV{${variable}} CACHE STRING no description
available)
if( ${${variable}} STREQUAL )
set( ${variable} ${default} CACHE STRING no description available)
endif( ${${variable}} STREQUAL )
endif( NOT DEFINED ${variable} )
endmacro( DEFINE_DEFAULT variable )
usage:
DEFINE_DEFAULT( SOME_OPTION c:/path/to/something )
then you can...
set SOME_OPTION=c:/real/path/to/thing cmake source path
-or-
cmake -DSOME_OPTION=C:/other/path/to/thing source path
-or-
cmake-gui source path
(click configure)
set the option appropriately.
On Fri, Nov 1, 2013 at 7:47 AM, physhh . phy...@gmail.com wrote:
I've already searched for a feature like this but was not able to find it.
Then i've looked up in the cmake-gui source code but couldn't find anything
related.
What I'm looking for:
If cmake is used directly from the command line, it's possible to pass a
bunch of options
(http://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options). This
is nice because with this it's possible to use default settings - even if
the cache get deleted. I'm actually really interested in this because it
would be possible to set the CMAKE_MODULE_PATH variable via batch file -
which is neat for custom find modules in custom locations.
My Request:
I would like to see a feature which makes it possible to pass command line
options to cmake-gui which get forwarded to cmake when it gets called. To
make this work the cmake-gui could look for parameters which look like
forward-* (where the * is a cmake option name) and pass it to cmake.
Are there any counter-arguments against this?
In my opinion it would make things much cleaner.
--
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://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Forwarding parameters to cmake through cmake-gui
sorry and I should ask; after reading a bit more context;
why are you using cmake-gui if you have -D's to pass already?
but the macro does allow you to export them to the environment
instead; it doesn't update what was configured though; and actually
most places I use the same macro but without the CACHE STRING option
on the SET().
On Fri, Nov 1, 2013 at 6:41 PM, J Decker d3c...@gmail.com wrote:
I have a macro . (maybe it has a horrible name...)
macro( DEFINE_DEFAULT variable default )
if( NOT DEFINED ${variable} )
#message( variable ${variable} not defined (command line) )
set( ${variable} $ENV{${variable}} CACHE STRING no description
available)
if( ${${variable}} STREQUAL )
set( ${variable} ${default} CACHE STRING no description available)
endif( ${${variable}} STREQUAL )
endif( NOT DEFINED ${variable} )
endmacro( DEFINE_DEFAULT variable )
usage:
DEFINE_DEFAULT( SOME_OPTION c:/path/to/something )
then you can...
set SOME_OPTION=c:/real/path/to/thing cmake source path
-or-
cmake -DSOME_OPTION=C:/other/path/to/thing source path
-or-
cmake-gui source path
(click configure)
set the option appropriately.
On Fri, Nov 1, 2013 at 7:47 AM, physhh . phy...@gmail.com wrote:
I've already searched for a feature like this but was not able to find it.
Then i've looked up in the cmake-gui source code but couldn't find anything
related.
What I'm looking for:
If cmake is used directly from the command line, it's possible to pass a
bunch of options
(http://www.cmake.org/cmake/help/v2.8.12/cmake.html#section_Options). This
is nice because with this it's possible to use default settings - even if
the cache get deleted. I'm actually really interested in this because it
would be possible to set the CMAKE_MODULE_PATH variable via batch file -
which is neat for custom find modules in custom locations.
My Request:
I would like to see a feature which makes it possible to pass command line
options to cmake-gui which get forwarded to cmake when it gets called. To
make this work the cmake-gui could look for parameters which look like
forward-* (where the * is a cmake option name) and pass it to cmake.
Are there any counter-arguments against this?
In my opinion it would make things much cleaner.
--
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://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.12-4728-g10e54d0
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 10e54d095de4c136589a588d10b7b68a79db289a (commit)
via 42a17cc664d1c2d560df074a1c1c60d6d54ce2c5 (commit)
from 11f96261dc61b773253f722710c7d5806f53f32a (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=10e54d095de4c136589a588d10b7b68a79db289a
commit 10e54d095de4c136589a588d10b7b68a79db289a
Merge: 11f9626 42a17cc
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Nov 1 07:18:07 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 07:18:07 2013 -0400
Merge topic 'handle-only-plain-tll' into next
42a17cc Ensure that LINK_LIBRARIES can be populated without tll.
diff --cc Source/cmTarget.cxx
index 1b09789,2bf8327..d305d95
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -5180,8 -6395,28 +5180,28 @@@ void cmTarget::GetTransitivePropertyLin
}
//
+ bool cmTarget::OnlyUsedWithPlainTLL() const
+ {
+ if (this-TLLCommands.empty())
+ {
+ return false;
+ }
+ typedef std::vectorstd::pairTLLSignature, cmListFileBacktrace
+ Container;
+ for(Container::const_iterator it = this-TLLCommands.begin();
+ it != this-TLLCommands.end(); ++it)
+ {
+ if (it-first == cmTarget::KeywordTLLSignature)
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ //
bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface iface,
-cmTarget *headTarget)
+cmTarget const* headTarget) const
{
// Construct the property name suffix for this configuration.
std::string suffix = _;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42a17cc664d1c2d560df074a1c1c60d6d54ce2c5
commit 42a17cc664d1c2d560df074a1c1c60d6d54ce2c5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Nov 1 12:10:57 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Nov 1 12:14:30 2013 +0100
Ensure that LINK_LIBRARIES can be populated without tll.
It should be allowed to use
add_library(foo ...)
add_library(bar ...)
set_property(TARGET foo PROPERTY LINK_LIBRARIES bar)
without causing bar to be in the exported INTERFACE_LINK_LIBRARIES
of foo.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d674aef..e37e15c 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -186,7 +186,7 @@ bool
cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
std::vectorstd::string missingTargets)
{
const char *input = target-GetProperty(INTERFACE_LINK_LIBRARIES);
- if (!input)
+ if (!input target-OnlyUsedWithPlainTLL())
{
// Only the plain target_link_libraries(foo bar) signature was
// called so use the link implementation as the link interface.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 221ca16..2bf8327 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6395,6 +6395,26 @@ void cmTarget::GetTransitivePropertyLinkLibraries(
}
//
+bool cmTarget::OnlyUsedWithPlainTLL() const
+{
+ if (this-TLLCommands.empty())
+{
+return false;
+}
+ typedef std::vectorstd::pairTLLSignature, cmListFileBacktrace
+Container;
+ for(Container::const_iterator it = this-TLLCommands.begin();
+ it != this-TLLCommands.end(); ++it)
+{
+if (it-first == cmTarget::KeywordTLLSignature)
+ {
+ return false;
+ }
+}
+ return true;
+}
+
+//
bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface iface,
cmTarget *headTarget)
{
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 27b74ca..161f40b 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -196,6 +196,7 @@ public:
};
bool PushTLLCommandTrace(TLLSignature signature);
void GetTllSignatureTraces(cmOStringStream s, TLLSignature sig) const;
+ bool OnlyUsedWithPlainTLL() const;
void MergeLinkLibraries( cmMakefile mf, const char* selfname,
const LinkLibraryVectorType libs );
diff --git
[Cmake-commits] CMake branch, next, updated. v2.8.12-4730-gf24ef61
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 f24ef61cddba064cf2ed448294b1f78f2c4362b7 (commit)
via 53d6ebb36079bd30c9033e4374fd8d31a2928b6a (commit)
from 10e54d095de4c136589a588d10b7b68a79db289a (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=f24ef61cddba064cf2ed448294b1f78f2c4362b7
commit f24ef61cddba064cf2ed448294b1f78f2c4362b7
Merge: 10e54d0 53d6ebb
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Nov 1 07:32:00 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 07:32:00 2013 -0400
Merge topic 'cpack-drag-n-drop-rez' into next
53d6ebb cpack: For DragNDrop generator, add sysroot option when calling Rez.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d6ebb36079bd30c9033e4374fd8d31a2928b6a
commit 53d6ebb36079bd30c9033e4374fd8d31a2928b6a
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Nov 1 05:31:07 2013 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Nov 1 05:31:07 2013 -0600
cpack: For DragNDrop generator, add sysroot option when calling Rez.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index cd98f49..2d641f5 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -519,9 +519,9 @@ cpack_set_if_not_set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE )
# WiX specific variables
cpack_set_if_not_set(CPACK_WIX_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
-# osx sysroot
+# set sysroot so SDK tools can be used
if(CMAKE_OSX_SYSROOT)
- set(CPACK_OSX_SYSROOT ${CMAKE_OSX_SYSROOT})
+ cpack_set_if_not_set(CPACK_OSX_SYSROOT ${CMAKE_OSX_SYSROOT})
endif()
if(DEFINED CPACK_COMPONENTS_ALL)
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index ab386d3..dfb2f15 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -505,7 +505,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string
src_dir,
cmOStringStream embed_sla_command;
embed_sla_command this-GetOption(CPACK_COMMAND_REZ);
const char* sysroot = this-GetOption(CPACK_OSX_SYSROOT);
-if(sysroot)
+if(sysroot sysroot[0] != '\0')
{
embed_sla_command -isysroot \ sysroot \;
}
---
Summary of changes:
Modules/CPack.cmake|4 ++--
Source/CPack/cmCPackDragNDropGenerator.cxx |2 +-
2 files changed, 3 insertions(+), 3 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.12-4732-g32dc4e1
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 32dc4e149a9b0eb4b7551e47b74e0f8928601eb2 (commit)
via 1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978 (commit)
from f24ef61cddba064cf2ed448294b1f78f2c4362b7 (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=32dc4e149a9b0eb4b7551e47b74e0f8928601eb2
commit 32dc4e149a9b0eb4b7551e47b74e0f8928601eb2
Merge: f24ef61 1b54b1d
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 09:16:08 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 09:16:08 2013 -0400
Merge topic 'ctest-p4' into next
1b54b1d ctest_update: Do not remove the p4 depot name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978
commit 1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978
Author: Pedro Navarro pnava...@netflix.com
AuthorDate: Thu Oct 31 13:24:57 2013 -0700
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Nov 1 08:52:26 2013 -0400
ctest_update: Do not remove the p4 depot name
Instead of removing the depot name, which causes problems when looking
at the file change list in CDash, make the Update test remove a given
prefix from the files retrieved from Update.xml.
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index a504157..0058721 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -144,17 +144,7 @@ private:
if(!this-Line.empty() this-Line[0] == '='
this-RegexDiff.find(this-Line))
{
-std::string Path = this-RegexDiff.match(1);
-// See if we need to remove the //depot prefix
-if(Path.length() 2 Path[0] == '/' Path[1] == '/')
- {
- size_t found = Path.find('/', 2);
- if(found != std::string::npos)
-{
-Path = Path.substr(found + 1);
-}
- }
-CurrentPath = Path;
+CurrentPath = this-RegexDiff.match(1);
AlreadyNotified = false;
}
else
diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake
index ae8fda2..db4e08d 100644
--- a/Tests/CTestUpdateCommon.cmake
+++ b/Tests/CTestUpdateCommon.cmake
@@ -37,10 +37,19 @@ function(check_updates build)
REGEX (${types}|FullName)
LIMIT_INPUT ${max_update_xml_size}
)
+
string(REGEX REPLACE
[ \t]*(${types})[ \t]*;[ \t]*FullName([^]*)/FullName
\\1{\\2} UPDATE_XML_ENTRIES ${UPDATE_XML_ENTRIES})
+ # If specified, remove the given prefix from the files in Update.xml.
+ # Some VCS systems, like Perforce, return absolute locations
+ if(DEFINED REPOSITORY_FILE_PREFIX)
+string(REPLACE
+ ${REPOSITORY_FILE_PREFIX}
+ UPDATE_XML_ENTRIES ${UPDATE_XML_ENTRIES})
+ endif()
+
# Compare expected and actual entries
set(EXTRA ${UPDATE_XML_ENTRIES})
list(REMOVE_ITEM EXTRA ${ARGN} ${UPDATE_EXTRA} ${UPDATE_MAYBE})
diff --git a/Tests/CTestUpdateP4.cmake.in b/Tests/CTestUpdateP4.cmake.in
index f23bd11..f0420c4 100644
--- a/Tests/CTestUpdateP4.cmake.in
+++ b/Tests/CTestUpdateP4.cmake.in
@@ -8,6 +8,7 @@ set(P4_TOP ${TOP})
set(TOP ${TOP}/@CTestUpdateP4_DIR@)
# Include code common to all update tests.
+set(REPOSITORY_FILE_PREFIX //ctest/)
include(@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake)
#-
---
Summary of changes:
Source/CTest/cmCTestP4.cxx| 12 +---
Tests/CTestUpdateCommon.cmake |9 +
Tests/CTestUpdateP4.cmake.in |1 +
3 files changed, 11 insertions(+), 11 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.12-559-ga549b68
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 a549b68d37bc3d1b87cfd407d4edb45fa02079dd (commit) via b54dbebf6259eb9fb688b1857e84cfcc2ffdbbe1 (commit) via ccdf7e04d451ac9fa877835d7c167b8bbda70686 (commit) via 999abb993e8bd951ec21e10a9d5390734f5d94c6 (commit) from 80c3420f30909ab7402145ee98fcb7d67c4fc7fc (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=a549b68d37bc3d1b87cfd407d4edb45fa02079dd commit a549b68d37bc3d1b87cfd407d4edb45fa02079dd Merge: 80c3420 b54dbeb Author: Brad King brad.k...@kitware.com AuthorDate: Fri Nov 1 09:39:56 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Nov 1 09:39:56 2013 -0400 Merge topic 'cmake-syntax-recorded-brackets' b54dbeb Test foreach/function/macro handling of bracket arguments ccdf7e0 macro: Do not substitute for placeholders in bracket arguments 999abb9 macro: Add extra indentation to placeholder substitution code --- Summary of changes: Source/cmMacroCommand.cxx | 105 +++-- Tests/RunCMake/Syntax/ForEachBracket1-stderr.txt |2 + Tests/RunCMake/Syntax/ForEachBracket1.cmake |3 + Tests/RunCMake/Syntax/FunctionBracket1-stderr.txt |2 + Tests/RunCMake/Syntax/FunctionBracket1.cmake |6 + Tests/RunCMake/Syntax/MacroBracket1-stderr.txt|2 + Tests/RunCMake/Syntax/MacroBracket1.cmake |6 + Tests/RunCMake/Syntax/RunCMakeTest.cmake |3 + 8 files changed, 80 insertions(+), 49 deletions(-) create mode 100644 Tests/RunCMake/Syntax/ForEachBracket1-stderr.txt create mode 100644 Tests/RunCMake/Syntax/ForEachBracket1.cmake create mode 100644 Tests/RunCMake/Syntax/FunctionBracket1-stderr.txt create mode 100644 Tests/RunCMake/Syntax/FunctionBracket1.cmake create mode 100644 Tests/RunCMake/Syntax/MacroBracket1-stderr.txt create mode 100644 Tests/RunCMake/Syntax/MacroBracket1.cmake 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.12-566-g20bb609
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 20bb60917125ee69e5ce0131934f214be15fdcb6 (commit) via 2eccdbdc2a7d39a1a56e5ed78abb65ad286b7125 (commit) from e065decd43186117913044984eaefd5040cf9063 (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=20bb60917125ee69e5ce0131934f214be15fdcb6 commit 20bb60917125ee69e5ce0131934f214be15fdcb6 Merge: e065dec 2eccdbd Author: Brad King brad.k...@kitware.com AuthorDate: Fri Nov 1 09:40:26 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Nov 1 09:40:26 2013 -0400 Merge topic 'fix-duplicate-test-run' 2eccdbd CTest: prevent tests from being inserted in the cost list twice --- Summary of changes: Source/CTest/cmCTestMultiProcessHandler.cxx |9 - 1 files changed, 8 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.12-564-ge065dec
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 e065decd43186117913044984eaefd5040cf9063 (commit)
via fe057ab3cd2469af5440307f1bf2a4f69d686db3 (commit)
from de5c29890f2139318b5c4c34e69774f3fa70ef30 (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=e065decd43186117913044984eaefd5040cf9063
commit e065decd43186117913044984eaefd5040cf9063
Merge: de5c298 fe057ab
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 09:40:19 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 09:40:19 2013 -0400
Merge topic 'add-CMAKE_FIND_NO_INSTALL_PREFIX'
fe057ab Allow disabling adding the install prefix to the prefix search path.
---
Summary of changes:
Help/manual/cmake-variables.7.rst |1 +
Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst | 13 +
Modules/Platform/UnixPaths.cmake |9 ++---
Modules/Platform/WindowsPaths.cmake| 18 --
Tests/RunCMake/CMakeLists.txt |1 +
.../{CMP0004 = no_install_prefix}/CMakeLists.txt |0
.../RunCMake/no_install_prefix/RunCMakeTest.cmake | 15 +++
Tests/RunCMake/no_install_prefix/do_test.cmake |2 ++
.../no_install_prefix-result.txt} |0
.../no_install_prefix/no_install_prefix-stderr.txt | 18 ++
.../no_install_prefix/no_install_prefix.cmake |2 ++
.../with_install_prefix-result.txt}|0
.../with_install_prefix-stderr.txt}|0
.../no_install_prefix/with_install_prefix.cmake|2 ++
14 files changed, 72 insertions(+), 9 deletions(-)
create mode 100644 Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
copy Tests/RunCMake/{CMP0004 = no_install_prefix}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/no_install_prefix/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/no_install_prefix/do_test.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
no_install_prefix/no_install_prefix-result.txt} (100%)
create mode 100644
Tests/RunCMake/no_install_prefix/no_install_prefix-stderr.txt
create mode 100644 Tests/RunCMake/no_install_prefix/no_install_prefix.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =
no_install_prefix/with_install_prefix-result.txt} (100%)
copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
= no_install_prefix/with_install_prefix-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/no_install_prefix/with_install_prefix.cmake
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.12-4740-gdcd2506
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 dcd250692708ce8a42dfe12fd05e222a96aa3a45 (commit)
via d9605897788d800e892de0d201a305046510d089 (commit)
from 2c713fe7fc13791833cc919a7f4cc6066b8295cd (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=dcd250692708ce8a42dfe12fd05e222a96aa3a45
commit dcd250692708ce8a42dfe12fd05e222a96aa3a45
Merge: 2c713fe d960589
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 10:25:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 10:25:30 2013 -0400
Merge topic 'object-library-no-TARGET_FILE' into next
d960589 Genex: Reject $TARGET_FILE:... for object libraries (#14532)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9605897788d800e892de0d201a305046510d089
commit d9605897788d800e892de0d201a305046510d089
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 10:14:47 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Nov 1 10:17:01 2013 -0400
Genex: Reject $TARGET_FILE:... for object libraries (#14532)
Teach the cmGeneratorExpressionEvaluator filesystem artifact logic
to reject OBJECT_LIBRARY targets since they have no main artifact.
Without the explicit rejection evaluation falls through to an
internal CMake error message in cmTarget::GetOutputInfo.
Extend the RunCMake.GeneratorExpression test to cover these cases.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index abe4e70..8b31354 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1277,7 +1277,7 @@ struct TargetFilesystemArtifact : public
cmGeneratorExpressionNode
No target \ + name + \);
return std::string();
}
-if(target-GetType() = cmTarget::UTILITY
+if(target-GetType() = cmTarget::OBJECT_LIBRARY
target-GetType() != cmTarget::UNKNOWN_LIBRARY)
{
::reportError(context, content-GetOriginalExpression(),
diff --git a/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-result.txt
b/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt
b/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt
new file mode 100644
index 000..533d38c
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt
@@ -0,0 +1,26 @@
+CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
+ Error evaluating generator expression:
+
+\$TARGET_FILE:objlib
+
+ Target objlib is not an executable or library.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
++
+CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
+ Error evaluating generator expression:
+
+\$TARGET_SONAME_FILE:objlib
+
+ Target objlib is not an executable or library.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
++
+CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
+ Error evaluating generator expression:
+
+\$TARGET_LINKER_FILE:objlib
+
+ Target objlib is not an executable or library.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake
b/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake
new file mode 100644
index 000..c47ee2b
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake
@@ -0,0 +1,7 @@
+enable_language(C)
+add_library(objlib OBJECT empty.c)
+add_custom_target(check ALL COMMAND echo
+ $TARGET_FILE:objlib
+ $TARGET_SONAME_FILE:objlib
+ $TARGET_LINKER_FILE:objlib
+ )
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index 62bf29b..54d5064 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -7,4 +7,5 @@ run_cmake(BadNOT)
run_cmake(BadStrEqual)
run_cmake(BadZero)
run_cmake(BadTargetName)
+run_cmake(BadTargetTypeObject)
run_cmake(BadInstallPrefix)
diff --git a/Tests/RunCMake/GeneratorExpression/empty.c
b/Tests/RunCMake/GeneratorExpression/empty.c
new file mode 100644
index 000..e69de29
---
Summary of changes:
[Cmake-commits] CMake branch, next, updated. v2.8.12-4742-gc4c3df9
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 c4c3df9ee7f18e720ca7c3c8f2db43c261c1ca7c (commit)
via f60797f75b882acfb89e4dd3698fb085ba182753 (commit)
from dcd250692708ce8a42dfe12fd05e222a96aa3a45 (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=c4c3df9ee7f18e720ca7c3c8f2db43c261c1ca7c
commit c4c3df9ee7f18e720ca7c3c8f2db43c261c1ca7c
Merge: dcd2506 f60797f
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 11:00:22 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 11:00:22 2013 -0400
Merge topic 'test-Assembler-no-g' into next
f60797f Tests/Assembler: Drop -g when generating sample assembly source
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f60797f75b882acfb89e4dd3698fb085ba182753
commit f60797f75b882acfb89e4dd3698fb085ba182753
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 10:55:58 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Nov 1 10:55:58 2013 -0400
Tests/Assembler: Drop -g when generating sample assembly source
Some compilers, such as Clang on OS X, do not want the -g flag for both
generating assembly code and assembling it. Drop the -g flag from
generation of main.s in the Assembler test.
diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index 1f07dc9..fdc5c00 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -15,6 +15,9 @@ if(${CMAKE_GENERATOR} MATCHES Makefile|Xcode AND
if(CMAKE_OSX_SYSROOT AND CMAKE_C_SYSROOT_FLAG AND NOT ;${C_FLAGS};
MATCHES ;${CMAKE_C_SYSROOT_FLAG};)
list(APPEND C_FLAGS ${CMAKE_C_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT})
endif()
+# Clang on OS X, and perhaps other compilers, do not support -g
+# for both generating and assembling, so drop it from generating.
+list(REMOVE_ITEM C_FLAGS -g)
set(SRCS main.s)
add_custom_command(
OUTPUT main.s
---
Summary of changes:
Tests/Assembler/CMakeLists.txt |3 +++
1 files changed, 3 insertions(+), 0 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.12-4746-ga7ae14e
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 a7ae14e54806ff4c0bd7f77cb2feda96c6a41edf (commit) via 37b6c1dcb3d31823450798d201ce824f244249d3 (commit) from a283c608090fc3e0fc0b1628354268dde4a2f66c (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=a7ae14e54806ff4c0bd7f77cb2feda96c6a41edf commit a7ae14e54806ff4c0bd7f77cb2feda96c6a41edf Merge: a283c60 37b6c1d Author: Brad King brad.k...@kitware.com AuthorDate: Fri Nov 1 11:23:22 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Nov 1 11:23:22 2013 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4749-g603b35b
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 603b35b157dc6cf883f00d1122e259a3dd78fc38 (commit)
via f53878b0d5a5ff5689ecb8dffc428f67280708fe (commit)
via a42a66547bc1b5f2f0a616d7ae64d39c3c2b4cc4 (commit)
from a7ae14e54806ff4c0bd7f77cb2feda96c6a41edf (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=603b35b157dc6cf883f00d1122e259a3dd78fc38
commit 603b35b157dc6cf883f00d1122e259a3dd78fc38
Merge: a7ae14e f53878b
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 11:38:46 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 11:38:46 2013 -0400
Merge topic 'doc-FindBoost-updates' into next
f53878b FindBoost: Clarify example static libs option (#13663)
a42a665 FindBoost: Refine .rst formatting
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f53878b0d5a5ff5689ecb8dffc428f67280708fe
commit f53878b0d5a5ff5689ecb8dffc428f67280708fe
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 11:05:14 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Nov 1 11:24:06 2013 -0400
FindBoost: Clarify example static libs option (#13663)
State explicitly in the example that it will only find static libraries.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 88adba1..51a3d77 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -132,9 +132,9 @@
# add_executable(foo foo.cc)
# endif()
#
-# Example to find Boost headers and some libraries::
+# Example to find Boost headers and some *static* libraries::
#
-# set(Boost_USE_STATIC_LIBSON)
+# set(Boost_USE_STATIC_LIBSON) # only find static libs
# set(Boost_USE_MULTITHREADED ON)
# set(Boost_USE_STATIC_RUNTIMEOFF)
# find_package(Boost 1.36.0 COMPONENTS date_time filesystem system ...)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a42a66547bc1b5f2f0a616d7ae64d39c3c2b4cc4
commit a42a66547bc1b5f2f0a616d7ae64d39c3c2b4cc4
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 11:04:22 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Nov 1 11:24:06 2013 -0400
FindBoost: Refine .rst formatting
Move the '::' starting literal blocks to the end of the preceding
paragraph. Convert the Boost CMake divider to a section header.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 6e1c926..88adba1 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -4,9 +4,7 @@
#
# Find Boost include dirs and libraries
#
-# Use this module by invoking find_package with the form:
-#
-# ::
+# Use this module by invoking find_package with the form::
#
# find_package(Boost
# [version] [EXACT] # Minimum or EXACT version e.g. 1.36.0
@@ -17,9 +15,7 @@
# This module finds headers and requested component libraries OR a CMake
# package configuration file provided by a Boost CMake build. For the
# latter case skip to the Boost CMake section below. For the former
-# case results are reported in variables:
-#
-# ::
+# case results are reported in variables::
#
# Boost_FOUND- True if headers and requested libraries were found
# Boost_INCLUDE_DIRS - Boost include directories
@@ -38,11 +34,7 @@
#information about Boost's automatic linking
#displayed during compilation
#
-#
-#
-# This module reads hints about search locations from variables:
-#
-# ::
+# This module reads hints about search locations from variables::
#
# BOOST_ROOT - Preferred installation prefix
#(or BOOSTROOT)
@@ -54,9 +46,7 @@
# - List of Boost versions not known to this module
#(Boost install locations may contain the version)
#
-# and saves search results persistently in CMake cache entries:
-#
-# ::
+# and saves search results persistently in CMake cache entries::
#
# Boost_INCLUDE_DIR - Directory containing Boost headers
# Boost_LIBRARY_DIR - Directory containing Boost libraries
@@ -83,9 +73,7 @@
#
# Boost libraries come in many variants encoded in their file name.
# Users or projects may tell this module which variant to find by
-# setting variables:
-#
-# ::
+# setting variables::
#
# Boost_USE_MULTITHREADED - Set to OFF to use the non-multithreaded
# libraries ('mt' tag). Default is ON.
@@ -109,9 +97,7 @@
# such as pthread or win32. Names with
# and without
[Cmake-commits] CMake branch, next, updated. v2.8.12-4753-g635b94d
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 635b94d0da0fe81c84e241eca9c845b02dea727a (commit)
via 82baceaa6077b2d07d2dca68e1c39ff4c6c88dfc (commit)
from cdce5905bfb6207197b5186b2d570d7d207a6829 (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=635b94d0da0fe81c84e241eca9c845b02dea727a
commit 635b94d0da0fe81c84e241eca9c845b02dea727a
Merge: cdce590 82bacea
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 12:59:12 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 12:59:12 2013 -0400
Merge topic 'cmake-gui-warning' into next
82bacea cmake-gui: Rename local variable to avoid shadowing a member
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82baceaa6077b2d07d2dca68e1c39ff4c6c88dfc
commit 82baceaa6077b2d07d2dca68e1c39ff4c6c88dfc
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 12:56:43 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Nov 1 12:56:43 2013 -0400
cmake-gui: Rename local variable to avoid shadowing a member
Address warnings:
Source/QtDialog/CMakeSetupDialog.cxx:1233:15:
warning: declaration of 'cursor' shadows a member of 'this' [-Wshadow]
Source/QtDialog/CMakeSetupDialog.cxx:1260:15:
warning: declaration of 'cursor' shadows a member of 'this' [-Wshadow]
by renaming the local variable to 'textCursor'.
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index a4dfdc9..a7665c8 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -1230,7 +1230,7 @@ void CMakeSetupDialog::doOutputFindNext(bool
directionForward)
QString search = this-FindHistory.front();
- QTextCursor cursor = this-Output-textCursor();
+ QTextCursor textCursor = this-Output-textCursor();
QTextDocument* document = this-Output-document();
QTextDocument::FindFlags flags;
if (!directionForward)
@@ -1238,67 +1238,67 @@ void CMakeSetupDialog::doOutputFindNext(bool
directionForward)
flags |= QTextDocument::FindBackward;
}
- cursor = document-find(search, cursor, flags);
+ textCursor = document-find(search, textCursor, flags);
- if (cursor.isNull())
+ if (textCursor.isNull())
{
// first search found nothing, wrap around and search again
-cursor = this-Output-textCursor();
-cursor.movePosition(directionForward ? QTextCursor::Start
- : QTextCursor::End);
-cursor = document-find(search, cursor, flags);
+textCursor = this-Output-textCursor();
+textCursor.movePosition(directionForward ? QTextCursor::Start
+ : QTextCursor::End);
+textCursor = document-find(search, textCursor, flags);
}
- if (cursor.hasSelection())
+ if (textCursor.hasSelection())
{
-this-Output-setTextCursor(cursor);
+this-Output-setTextCursor(textCursor);
}
}
void CMakeSetupDialog::doOutputErrorNext()
{
- QTextCursor cursor = this-Output-textCursor();
+ QTextCursor textCursor = this-Output-textCursor();
bool atEnd = false;
// move cursor out of current error-block
- if (cursor.blockCharFormat() == this-ErrorFormat)
+ if (textCursor.blockCharFormat() == this-ErrorFormat)
{
-atEnd = !cursor.movePosition(QTextCursor::NextBlock);
+atEnd = !textCursor.movePosition(QTextCursor::NextBlock);
}
// move cursor to next error-block
- while (cursor.blockCharFormat() != this-ErrorFormat !atEnd)
+ while (textCursor.blockCharFormat() != this-ErrorFormat !atEnd)
{
-atEnd = !cursor.movePosition(QTextCursor::NextBlock);
+atEnd = !textCursor.movePosition(QTextCursor::NextBlock);
}
if (atEnd)
{
// first search found nothing, wrap around and search again
-atEnd = !cursor.movePosition(QTextCursor::Start);
+atEnd = !textCursor.movePosition(QTextCursor::Start);
// move cursor to next error-block
-while (cursor.blockCharFormat() != this-ErrorFormat !atEnd)
+while (textCursor.blockCharFormat() != this-ErrorFormat !atEnd)
{
- atEnd = !cursor.movePosition(QTextCursor::NextBlock);
+ atEnd = !textCursor.movePosition(QTextCursor::NextBlock);
}
}
if (!atEnd)
{
-cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
+textCursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
QTextCharFormat selectionFormat;
selectionFormat.setBackground(Qt::yellow);
-QTextEdit::ExtraSelection extraSelection =
[Cmake-commits] CMake branch, next, updated. v2.8.12-4755-g0ff6e57
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 0ff6e579b977152c4a492135402c30fdc072f431 (commit)
via 5a2fc3d69659717e530becddb3cbebb04583f4e9 (commit)
from 635b94d0da0fe81c84e241eca9c845b02dea727a (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=0ff6e579b977152c4a492135402c30fdc072f431
commit 0ff6e579b977152c4a492135402c30fdc072f431
Merge: 635b94d 5a2fc3d
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 14:50:01 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 14:50:01 2013 -0400
Merge topic 'object-library-missing-source' into next
5a2fc3d Check for OBJECT_LIBRARY source files at start of generation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a2fc3d69659717e530becddb3cbebb04583f4e9
commit 5a2fc3d69659717e530becddb3cbebb04583f4e9
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Nov 1 13:39:50 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Nov 1 14:46:58 2013 -0400
Check for OBJECT_LIBRARY source files at start of generation
Teach cmGlobalGenerator::CheckTargets to include OBJECT_LIBRARY targets
in the check for source file existence.
Extend the RunCMake.ObjectLibrary test to cover this case.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7f2b592..b12c691 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1088,6 +1088,7 @@ bool cmGlobalGenerator::CheckTargets()
target.GetType() == cmTarget::STATIC_LIBRARY ||
target.GetType() == cmTarget::SHARED_LIBRARY ||
target.GetType() == cmTarget::MODULE_LIBRARY ||
+ target.GetType() == cmTarget::OBJECT_LIBRARY ||
target.GetType() == cmTarget::UTILITY)
{
if(!target.FindSourceFiles())
diff --git a/Tests/RunCMake/ObjectLibrary/MissingSource-result.txt
b/Tests/RunCMake/ObjectLibrary/MissingSource-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/ObjectLibrary/MissingSource-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt
b/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt
new file mode 100644
index 000..411cd7c
--- /dev/null
+++ b/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at MissingSource.cmake:1 \(add_library\):
+ Cannot find source file:
+
+missing.c
+
+ Tried extensions( \.[A-Za-z+]+|
+ )*
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/ObjectLibrary/MissingSource.cmake
b/Tests/RunCMake/ObjectLibrary/MissingSource.cmake
new file mode 100644
index 000..258eaed
--- /dev/null
+++ b/Tests/RunCMake/ObjectLibrary/MissingSource.cmake
@@ -0,0 +1 @@
+add_library(A OBJECT missing.c)
diff --git a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
index 55db14d..2dd8d38 100644
--- a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
@@ -12,6 +12,7 @@ run_cmake(Install)
run_cmake(LinkObjLHS)
run_cmake(LinkObjRHS1)
run_cmake(LinkObjRHS2)
+run_cmake(MissingSource)
run_cmake(ObjWithObj)
run_cmake(PostBuild)
run_cmake(PreBuild)
---
Summary of changes:
Source/cmGlobalGenerator.cxx |1 +
.../MissingSource-result.txt} |0
.../ObjectLibrary/MissingSource-stderr.txt |9 +
Tests/RunCMake/ObjectLibrary/MissingSource.cmake |1 +
Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake|1 +
5 files changed, 12 insertions(+), 0 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
ObjectLibrary/MissingSource-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/MissingSource.cmake
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.12-4757-gd411953
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 d4119539cc87f52421f862937dcaf02699b6c052 (commit) via 7947981c2be1fe2eb71b09290a3f0e57d572a3f0 (commit) from 0ff6e579b977152c4a492135402c30fdc072f431 (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=d4119539cc87f52421f862937dcaf02699b6c052 commit d4119539cc87f52421f862937dcaf02699b6c052 Merge: 0ff6e57 7947981 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Nov 1 15:44:16 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Nov 1 15:44:16 2013 -0400 Merge topic 'osx-no-PackageMaker' into next 7947981 CPack: Disable OS X PackageMaker by default (#13662) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7947981c2be1fe2eb71b09290a3f0e57d572a3f0 commit 7947981c2be1fe2eb71b09290a3f0e57d572a3f0 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Nov 1 15:36:26 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Nov 1 15:41:16 2013 -0400 CPack: Disable OS X PackageMaker by default (#13662) As mentioned in commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3 bits and pieces) PackageMaker was split out of Xcode 4.3 and above into a separate Auxiliary tools package. Since Xcode 5.0 or so, Apple no longer distributes PackageMaker as part of the available development tools so it can only be obtained from old packages. Disable the CPACK_BINARY_PACKAGEMAKER option by default as is the case for most other tool-dependent generators. diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index da6b2e0..fba5c47 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -416,7 +416,7 @@ if(NOT CPACK_GENERATOR) if(APPLE) option(CPACK_BINARY_BUNDLE Enable to build OSX bundles OFF) option(CPACK_BINARY_DRAGNDROPEnable to build OSX Drag And Drop package OFF) -option(CPACK_BINARY_PACKAGEMAKER Enable to build PackageMaker packages ON) +option(CPACK_BINARY_PACKAGEMAKER Enable to build PackageMaker packages OFF) option(CPACK_BINARY_OSXX11 Enable to build OSX X11 packages OFF) else() option(CPACK_BINARY_TZ Enable to build TZ packages ON) --- Summary of changes: Modules/CPack.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
[Cmake-commits] CMake branch, master, updated. v2.8.12-569-g547c59f
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 547c59f000731872d37a5cff128995aabaa5fcdd (commit) from 37b6c1dcb3d31823450798d201ce824f244249d3 (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=547c59f000731872d37a5cff128995aabaa5fcdd commit 547c59f000731872d37a5cff128995aabaa5fcdd Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Nov 2 00:01:11 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Nov 2 00:01:11 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f2dd3bd..a9c3b98 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 12) -set(CMake_VERSION_TWEAK 20131101) +set(CMake_VERSION_TWEAK 20131102) #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
