[cmake-developers] [CMake 0013004]: Archive generator (TGZ, ZIP etc) doesn't work if component-based packaging is used with CPACK_SET_DESTDIR set to ON
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13004 == Reported By:Stanislaw Szymczyk Assigned To: == Project:CMake Issue ID: 13004 Category: CPack Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2012-02-29 08:01 EST Last Modified: 2012-02-29 08:01 EST == Summary:Archive generator (TGZ, ZIP etc) doesn't work if component-based packaging is used with CPACK_SET_DESTDIR set to ON Description: Component-based packaging doesn't work in CPack archive generator (for example TGZ or ZIP) if CPACK_SET_DESTDIR is set to ON. The following error messages are displayed: [sszymczy@RR19-19:~/Desktop/ComponentExampleStart/Source/build]$ LANG=C make package [ 50%] Built target mylib [100%] Built target mylibapp Run CPack packaging tool... CPack: Create package using ZIP CPack: Install projects CPack: - Run preinstall target for: MyLib CPack: - Install project: MyLib CPack: - Install component: applications CPack: - Install component: libraries CPack: - Install component: headers CPack: Create package CPack Error: ERROR while packaging files: archive_read_disk_entry_from_file: (Empty error message) CPack Error: ERROR while packaging files: archive_read_disk_entry_from_file: (Empty error message) CPack Error: ERROR while packaging files: archive_read_disk_entry_from_file: (Empty error message) CPack Error: Problem compressing the directory CPack Error: Error when generating package: MyLib make: *** [package] Error 1 Steps to Reproduce: 1. unzip MyLib.zip (attached to the ticket) 2. cd MyLib 3. mkdir build 4. cd build 5. cmake .. 6. make package == Issue History Date ModifiedUsername FieldChange == 2012-02-29 08:01 Stanislaw SzymczykNew Issue 2012-02-29 08:01 Stanislaw SzymczykFile Added: MyLib.zip == -- 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] Usage of Qt4 for Tests
On Wednesday, February 29, 2012 02:23:47 am Rolf Eike Beer wrote:
The tests using Qt4 on my machine are failing:
http://open.cdash.org/testDetails.php?test=136849123build=2048757
http://open.cdash.org/testDetails.php?test=136849126build=2048757
This is because this machine only has QtCore installed, but nothing else.
I think something like this should be done to only run the tests if all of
the Qt4 dependencies are found:
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e1dbfe2..bf9bce3 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -274,7 +274,7 @@ IF(BUILD_TESTING)
# run test for DeployQt4 on supported platforms/compilers (which
depends on BundleUtilities)
# this test also depends on the existence of the standard qtiff plugin
-if(QT4_WORKS)
+if(QT4_WORKS AND QT_QTGUI_FOUND AND QT_QTSQL_FOUND)
ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/Qt4Deploy
@@ -912,7 +912,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
)
LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/Environment)
- IF(QT4_WORKS)
+ IF(QT4_WORKS AND QT_QTGUI_FOUND)
ADD_TEST(QtAutomoc ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/QtAutomoc
Opinions?
The Qt4Deploy test can have its QtGui dependency easily removed. I can take
care of that one.
The part of your patch for QtAutomoc looks good.
--
Clinton Stimpson
Elemental Technologies, Inc
Computational Simulation Software, LLC
www.csimsoft.com
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH 1/2] cmPropertyDefinition::IsChained is const
On 2/29/2012 7:56 AM, Yury G. Kudryashov wrote: Brad King wrote: Please add -Woverloaded-virtual and try again. Done, fixed. Pushed to the same branch. Merged, thanks. I squashed the two Is* method fixes into the original commit: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=737c49a3 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=261491fe -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] Usage of Qt4 for Tests
Am Mittwoch, 29. Februar 2012, 07:53:38 schrieb Clinton Stimpson: On Wednesday, February 29, 2012 02:23:47 am Rolf Eike Beer wrote: The tests using Qt4 on my machine are failing: http://open.cdash.org/testDetails.php?test=136849123build=2048757 http://open.cdash.org/testDetails.php?test=136849126build=2048757 This is because this machine only has QtCore installed, but nothing else. I think something like this should be done to only run the tests if all of the Qt4 dependencies are found: The Qt4Deploy test can have its QtGui dependency easily removed. I can take care of that one. The part of your patch for QtAutomoc looks good. Pushed to your qt4-deploy branch on stage. Please pull again before further working in it. Eike signature.asc Description: This is a digitally signed message part. -- 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] Two pull requests
Brad King wrote: On 2/28/2012 4:21 PM, Brad King wrote: On 2/28/2012 4:02 PM, Yury G. Kudryashov wrote: git pull git://gitorious.org/~urkud1/cmake/urkud-cmake.git doxygen-fixes Our style checker limits .h and .cxx files to 79 columns. Some of the updated comments exceed this limit. Please reformat them. Where can I find the style checker sources? I'll run it to pre-commit hook then. -- Yury G. Kudryashov, mailto: ur...@mccme.ru -- 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] Two pull requests
Brad King wrote: On 2/28/2012 4:21 PM, Brad King wrote: On 2/28/2012 4:02 PM, Yury G. Kudryashov wrote: git pull git://gitorious.org/~urkud1/cmake/urkud-cmake.git run-vim-spellcheck Merged, thanks: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adc2c990 git pull git://gitorious.org/~urkud1/cmake/urkud-cmake.git doxygen-fixes Our style checker limits .h and .cxx files to 79 columns. Some of the updated comments exceed this limit. Please Force-pushed. BTW, what is the policy for const MyClass* vs MyClass const*? Which parts of STL are allowed in sources that are needed for bootstrap? -- Yury G. Kudryashov, mailto: ur...@mccme.ru -- 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] Question regarding source tree structure and how to find libraries easily within that structure
Hi Andreas,I too am new to CMake, but let me take a crack at this... someone correct me if there's a better way.You shouldn't need a find module. You only need them when you're including libraries that CMake doesn't already know the location of. Since you're building Library_1 in CMake you can just give the library target name directly to target_link_libraries.Assuming you have:Source/CMakeLists.txt ... add_subdirectory(Library_1) add_subdirectory(Application_1)Source/Library_1/CMakeLists.txt add_library(Library_1then you can simply do this:Source/Application_1/CMakeLists.txt add_executable( Application_1 app1.cpp ) target_link_libraries( Application_1 Library_1 ) # That said, I'm not quite sure the nicest way to include_directories of said library. # I've been using this: include_directories( "${PROJECT_SOURCE_DIR}/Library_1" )Hope this helps,-Carl-cmake-boun...@cmake.org wrote: -To: cmake@cmake.orgFrom: "m.hergarden" m.hergar...@euphoria-it.nlSent by: cmake-boun...@cmake.orgDate: 02/29/2012 01:50AMSubject: Re: [CMake] Question regarding source tree structure and how to find libraries easily within that structure
On 02/26/2012 09:18 AM, Andreas Guther wrote:
Hello,I'm justing starting to learn/use CMake and I have a question regarding the usage of it in regards of source tree structure and library usage.I have the following folder structure:Root Bin Win32X86Debug Win32X86Release ... Lib Win32X86Debug Win32X86Release ... Source ace Application_1 Application_2 boost Library_1 Library_2 Library_3 ... Tools I'd like to point out the structure within "Source". In the source directory there are libraries that may be used by one or more applications. That means for example that "Application_1" may use "Library_1" and "Library_3" and "Application_2" may use "Library_1" and "Library_2".I have currently no idea how I should solve this without creating a find module for every library in the tree. Is there any other solution than creating find modules I can use?If there is really no other (good) solution than creating find modules, is it possible to place the find modules (Library_n.cmake files, right?) within the library folders? I ask this, because I think it would make it much more easy to maintain them.Kind regards,Andreas --Powered by www.kitware.comVisit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.htmlPlease keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQFollow this link to subscribe/unsubscribe:http://www.cmake.org/mailman/listinfo/cmake
Is there a reason you can't use the
'include_directories' and 'link_directories' commands to add the
correct linkpaths?
Micha
--Powered by www.kitware.comVisit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.htmlPlease keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQFollow this link to subscribe/unsubscribe:http://www.cmake.org/mailman/listinfo/cmake
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Transitive library dependencies with parallel builds
Do transitive dependencies reduce number of jobs that can be compiled in
parallel?
If I have two libraries A and B, with an executable C, whose
dependencies are described by:
add_library(A ${A_SRC})
add_library(B ${B_SRC})
target_link_libraries(B A)
add_executable(C ${C_SRC})
target_link_libraries(C B)
I understand that when *linking* C, the transitive dependency A will be
added. However, if I build C in parallel make -j N, will CMake build
libraries A and B simultaneously, or fully compile and link A before
starting compilation of B? I.e. just because the link steps are serial
dependencies, are the compilation steps? Would it be faster to do:
add_library(A ${A_SRC})
add_library(B ${B_SRC})
add_executable(C ${C_SRC})
target_link_libraries(C B A)
Thanks.
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] cmake snippets
If anyone is interested, I'm collecting cmake-mode yasnippet snippets for Emacs: https://github.com/AndreaCrotti/yasnippet-snippets/tree/master/cmake-mode Is anyone else using it and has some nice snippets to share? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] find_package(Subversion) fails when run by an automated Jenkins build
Hi there, Awkward behaviour: My CMakeLists.txt do a find_package(Subversion) Now, I have a Jenkins build server running under domain user XYZ The Jenkins CMake plugin tells me it's trying to do the following: c:\Program Files\CMake 2.8\bin\cmake.exe -G Visual Studio 9 2008 -DCMAKE_BUILD_TYPE=Release D:\path\to\where\jenkins\puts\mysource And fails with -- Could NOT find Subversion (missing: Subversion_SVN_EXECUTABLE) But if I logon to that very same server with that very same domain user, check-out the code from svn elsewhere on the server disk and run the above command (adjusting for the different path to the source), then the find_package will work just fine. Does anyone have a clue on what the problem might be? What might be causing the difference in behaviour? Thanks in advance! -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] cmake snippets
2012/2/29 Andrea Crotti andrea.crott...@gmail.com: If anyone is interested, I'm collecting cmake-mode yasnippet snippets for Emacs: https://github.com/AndreaCrotti/yasnippet-snippets/tree/master/cmake-mode Is anyone else using it and has some nice snippets to share? I'm not using it (yasnippet) but this seems interesting. Can you complete then expand the snippets? -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] find_package(Subversion) fails when run by an automated Jenkins build
2012/2/29 Massaro Alessio alessio.mass...@mediobanca.co.uk:
Hi there,
Awkward behaviour:
My CMakeLists.txt do a find_package(Subversion)
Now, I have a Jenkins build server running under domain user XYZ
The Jenkins CMake plugin tells me it’s trying to do the following:
“c:\Program Files\CMake 2.8\bin\cmake.exe” -G Visual Studio 9
2008
-DCMAKE_BUILD_TYPE=Release
D:\path\to\where\jenkins\puts\mysource
And fails with
-- Could NOT find Subversion (missing: Subversion_SVN_EXECUTABLE)
But if I logon to that very same server with that very same domain user,
check-out the code from svn elsewhere on the server disk and run the above
command (adjusting for the different path to the source), then the
find_package will work just fine.
Does anyone have a clue on what the problem might be?
What might be causing the difference in behaviour?
May be the path is set to a different value in the Jenkins context.
You could try to make your CMakeLists.txt display the content of
the PATH variable with something like;
MESSAGE(PATH=$ENV{PATH})
that way you'll see if something is different
--
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.org
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] smarter shortcuts with NSIS
On 02/28/2012 05:53 PM, Eric Noulard wrote: 2012/2/28 Andrea Crottiandrea.crott...@gmail.com: On 02/28/2012 03:42 PM, Eric Noulard wrote: Yes more or less beside the fact is CPack is doing more work than that: 1) CPack handles CPack-private install location for you (including the installation of the component selected to be put in the installer taken from CPACK_COMPONENTS_ALL) 2) It prepares componentization of the installer. (including possible COMPONENT dependencies, display name etc... 3) Finally if you use configure_file + add_custom_command you won't get all the CPACK_xxx vars CPack has :-( Because some of them my be computed dynamically by CPack which then does the configure_file in this context. I forgot to mention that NSIS.template.in is including an auxiliary file: NSIS.InstallOptions.ini.in which is configured as well. All this is doable by hand but may not be as easy as it seems in the general case. Thanks for the great explanation, now it's clear.. Just one thing, how do I make sure that it's actually using my own template (apart from running the produced installer)? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] smarter shortcuts with NSIS
On Wed, Feb 29, 2012 at 1:44 PM, Andrea Crotti andrea.crott...@gmail.com wrote: On 02/28/2012 05:53 PM, Eric Noulard wrote: 2012/2/28 Andrea Crottiandrea.crott...@gmail.com: On 02/28/2012 03:42 PM, Eric Noulard wrote: Yes more or less beside the fact is CPack is doing more work than that: 1) CPack handles CPack-private install location for you (including the installation of the component selected to be put in the installer taken from CPACK_COMPONENTS_ALL) 2) It prepares componentization of the installer. (including possible COMPONENT dependencies, display name etc... 3) Finally if you use configure_file + add_custom_command you won't get all the CPACK_xxx vars CPack has :-( Because some of them my be computed dynamically by CPack which then does the configure_file in this context. I forgot to mention that NSIS.template.in is including an auxiliary file: NSIS.InstallOptions.ini.in which is configured as well. All this is doable by hand but may not be as easy as it seems in the general case. Thanks for the great explanation, now it's clear.. Just one thing, how do I make sure that it's actually using my own template (apart from running the produced installer)? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake If you must, put an intentional error in your own template, and then verify that you get an error when you run CPack. It's probably quicker to simply run the installer... -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] cmake snippets
On 02/29/2012 06:27 PM, Eric Noulard wrote: 2012/2/29 Andrea Crottiandrea.crott...@gmail.com: If anyone is interested, I'm collecting cmake-mode yasnippet snippets for Emacs: https://github.com/AndreaCrotti/yasnippet-snippets/tree/master/cmake-mode Is anyone else using it and has some nice snippets to share? I'm not using it (yasnippet) but this seems interesting. Can you complete then expand the snippets? Yes sure, if you also use auto-complete (http://www.emacswiki.org/emacs/AutoComplete) I just start typing and then auto-complete comes in and proposes me some snippets or just some strings from the buffer or the sources that I configure. Have a look here (my emacs conf) https://github.com/AndreaCrotti/Emacs-configuration/tree/master/modules in ca-auto-complete and ca-yas there are my settings.. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Functions inherit parent variables?
I ran a quick test:
function( test )
message( SOME_TEST: ${SOME_TEST} )
endfunction()
function( start )
set( SOME_TEST HELLO WORLD )
test()
endfunction()
start()
Seems like a function has access to the calling scope's defined variables.
I thought because functions created a new scope, that excluded access to
variables defined in the outer scope (i.e. calling scope)
Can someone explain?
-
Robert Dailey
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Code and API review request for Qt5 CMake files
On 02/28/2012 10:03 PM, Alexander Neundorf wrote:
...will reply later in detail.
Could you please go through the existing find-modules shipped with cmake
which
support COMPONENTS and make a summary of how they handle them ?
At least FindQt4.cmake be default searches all components.
Thanks
Alex
The following CMakeLists.txt can be used to systematically investigate
the results of the component-aware find modules currently shipped with
CMake, these are Find{Boost,GTK2,HDF5,ImageMagick,Java,OpenSceneGraph,
Qt4,wxWidgets,XMLRPC}:
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
PROJECT(FINDRESULTVARIABLES C CXX)
SET(CMAKE_VERBOSE_MAKEFILE ON)
FUNCTION(FindResultVariables pkg)
SET(prefix ${pkg})
IF(DEFINED ARGV1)
SET(prefix ${ARGV1})
ENDIF()
UNSET(REQUIRED)
IF(${pkg}_REQUIRED)
SET(REQUIRED REQUIRED)
ENDIF()
FIND_PACKAGE(${pkg} COMPONENTS ${${pkg}_COMPONENTS} ${REQUIRED})
MESSAGE(Begin: ${pkg} result variables)
GET_DIRECTORY_PROPERTY(v VARIABLES)
FOREACH(i IN LISTS v)
IF(i MATCHES ^${prefix}.*_FOUND$)
MESSAGE(${i}=${${i}})
ENDIF()
ENDFOREACH()
MESSAGE(${prefix}_LIBRARIES: ${${prefix}_LIBRARIES})
MESSAGE(End: ${pkg} result variables)
ENDFUNCTION()
FindResultVariables(Boost)
FindResultVariables(GTK2)
FindResultVariables(HDF5)
FindResultVariables(ImageMagick)
FindResultVariables(Java)
FindResultVariables(OpenSceneGraph)
FindResultVariables(Qt4 QT)
FindResultVariables(wxWidgets)
FindResultVariables(XMLRPC)
HDF5, OpenSceneGraph and XMLRPC aren't installed on my system; my
preliminary findings for the remaining packages are as follows:
(1) Searching unrequested components:
Qt4: Yes.
GTK2,ImageMagick: Partially.
wxWidgets: All components if none are requested.
The remaining modules don't search unrequested components.
(2) Assigning *_*_FOUND variables:
Qt4: Only for modules which are known and found.
ImageMagick: Also for requested but unknown components.
wxWidgets: No *_*_FOUND variables at all but forwards unknown
components to *_LIBRARIES variable without an error.
The remaining modules assign only to *_*_FOUND variables for
components which they know and which have been requested.
(3) Respecting the REQUIRED flag:
wxWidgets: REQUIRED ignored completely.
Boost: SEND_ERROR instead of FATAL_ERROR.
GTK2,Java: Bail out on unknown components even if not REQUIRED.
The remaining modules bail out on unavailable requested components.
(4) Assinging the package-related *_FOUND variable:
Java: No *_FOUND variable at all although it's documented.
wxWidgets: TRUE even if requested components aren't found, see above.
The remaining modules return FALSE if a requested component isn't found.
My comments on these, say, multifarious findings are:
Ad.(1): In general, automatically searching unrequested components
does not mean a harm, but it is also not beneficial at all events:
- No guarantee to catch all components - consider a component added
later to the package - so no guarantee that all later *_*_FOUND
variables have been assigned a definite value by FIND_PACKAGE().
- Complicates find modules / config files due to REQUIRED/QUIET.
- Potentially higher costs due to unneeded search operations.
For the latter loint, there is a not-so-uncommon use case: Suppose
a find module wants to check whether a library matches its header.
Putting away cross-compiling issues for the moment, this requires
building and running a test program. If it is to be performed for
each Qt4 module, e.g., a FIND_PACKAGE(Qt4) invocation would most
certainly be quite expensive. For these reasons, I usually advice
to search only requested components, request all components going
to be used and refer only to components having been requested.
Ad.(2): Due to my guiding principle - refer only to FOUND variables
which have been assigned a definite value by FIND_PACKAGE() - I do
consider as important that a *_*_FOUND variable is assigned to for
each requested component. FindImageMagick.cmake does it right, but
the other modules - except for FindwxWidgets.cmake - have me check
*_*_FOUND variables without a definite value for requested but un-
known components. Again: The latters might become known one day.
Ad.(3): After FIND_PACKAGE(... REQUIRED), I definitely do not want
to check if all requested components including their prerequisites
are actually present. OTOH, the user must have the oppurtunity to
handle a package's or a component's absence by h(is|er)self. Thus,
FIND_PACKAGE() without REQUIRED should never bail out because of
something being not found, but with REQUIRED, it must bail out.
Ad.(4): None of the modules returning *_FOUND==FALSE just because
a component is missing could be turned into a config file at the
moment without changing its behavior. In order to address this
issue in the future, one has to decide if either
- a find module should behave like a config file in this regard and
return *_FOUND==FALSE
Re: [CMake] Functions inherit parent variables?
On 03/01/2012 01:38 AM, Robert Dailey wrote:
I ran a quick test:
function( test )
message( SOME_TEST: ${SOME_TEST} )
endfunction()
function( start )
set( SOME_TEST HELLO WORLD )
test()
endfunction()
start()
Seems like a function has access to the calling scope's defined variables.
I thought because functions created a new scope, that excluded access to
variables defined in the outer scope (i.e. calling scope)
Can someone explain?
The line SOME_TEST: HELLO WORLD is missing, I guess?
As usual with scoping mechanisms, there is access to the outer scope
from within the inner scope: Read access via ordinary dereferencing
and write access via PARENT_SCOPE. It's quite the same as in C/C++
with the { and } tokens; see also the C++ :: operator.
Regards,
Michael
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Visual Studio 10 - GenerateDebugInformation always false
Is anyone having the problem where CMake creates VS10 project files with GenerateDebugInformation set to false for all (including Debug RelWithDebInfo) targets? If I remember correctly, this did not happen when using the VS9 generator, but I don't have VS9 handy to test. -- Johannes -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] How to include the generated header file?
According to the doc, generate_export_header(somelib) generates a file
in the ${CMAKE_CURRENT_BUILD_DIR} called somelib_export.h.
What's the recommended way to include this somelib_export.h.
#include somelib_export.h does not work. And
${CMAKE_CURRENT_BUILD_DIR} is empty too. I am using v2.8.7. The header
file does get generated, only the doc is not very helpful on how to
include it.
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to include the generated header file?
On 03/01/2012 07:21 AM, Tan, Tom (Shanghai) wrote:
According to the doc, generate_export_header(somelib) generates a file
in the ${CMAKE_CURRENT_BUILD_DIR} called somelib_export.h.
What's the recommended way to include this somelib_export.h.
#include somelib_export.h does not work. And
${CMAKE_CURRENT_BUILD_DIR} is empty too. I am using v2.8.7. The header
file does get generated, only the doc is not very helpful on how to
include it.
include_directories(${CMAKE_CURRENT_BINARY_DIR})
That's a bug in the documentation, the variable CMAKE_CURRENT_BUILD_DIR
does not exist (notice the difference is between BUILD and BINARY)...
Michael
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Code and API review request for Qt5 CMake files
Michael Hertling wrote: My main conclusion from the above-noted mess among CMake's current component-aware find modules is that we urgently need a convention how such modules and config files are intended to work. Hopefully, we can take a step forward; Qt5's advent is a good opportunity. Yes, please! And a good start would be cleaning up FindwxWidgets.cmake and porting it to use FPHSA so we get REQUIRED handling for free. Eike signature.asc Description: This is a digitally signed message part. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.7-2951-gab27378
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 ab273783b49f4d3d9b72c5c1d3f83c31638fb425 (commit)
via ab9661c1dd4340af5a84244c920d94bddd1c8e90 (commit)
from 7688b6e6fb404848b815d0efb6fd9c3f365c9d06 (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=ab273783b49f4d3d9b72c5c1d3f83c31638fb425
commit ab273783b49f4d3d9b72c5c1d3f83c31638fb425
Merge: 7688b6e ab9661c
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Feb 29 09:56:58 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 29 09:56:58 2012 -0500
Merge topic 'qt4-deploy' into next
ab9661c Remove QtGui dependency in Qt4Deploy test and verify QtSql
existance.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab9661c1dd4340af5a84244c920d94bddd1c8e90
commit ab9661c1dd4340af5a84244c920d94bddd1c8e90
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Feb 29 07:55:31 2012 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Feb 29 07:55:31 2012 -0700
Remove QtGui dependency in Qt4Deploy test and verify QtSql existance.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cc2ae5e..13e57d9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -268,7 +268,7 @@ IF(BUILD_TESTING)
# run test for DeployQt4 on supported platforms/compilers (which depends
on BundleUtilities)
# this test also depends on the existence of the standard qtiff plugin
-if(QT4_WORKS)
+if(QT4_WORKS AND QT_QTSQL_FOUND)
ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/Qt4Deploy
diff --git a/Tests/Qt4Deploy/CMakeLists.txt b/Tests/Qt4Deploy/CMakeLists.txt
index ccacf74..646ea9f 100644
--- a/Tests/Qt4Deploy/CMakeLists.txt
+++ b/Tests/Qt4Deploy/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
project(Qt4Deploy)
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install)
-find_package(Qt4 REQUIRED QtMain QtCore QtGui QtSql)
+find_package(Qt4 REQUIRED QtMain QtCore QtSql)
include(${QT_USE_FILE})
add_executable(testdeploy MACOSX_BUNDLE testdeploy.cpp)
diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp
index bcf77a2..8b9c8d6 100644
--- a/Tests/Qt4Deploy/testdeploy.cpp
+++ b/Tests/Qt4Deploy/testdeploy.cpp
@@ -1,8 +1,8 @@
#include QCoreApplication
-#include QImageReader
#include QSqlDatabase
#include QLibraryInfo
#include QDebug
+#include QStringList
int main(int argc, char** argv)
{
---
Summary of changes:
Tests/CMakeLists.txt |2 +-
Tests/Qt4Deploy/CMakeLists.txt |2 +-
Tests/Qt4Deploy/testdeploy.cpp |2 +-
3 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.7-2957-g5884dc2
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 5884dc2e1061eda7cffd1d609bb265aa05330664 (commit) via 95f50940cc10c22077435326db14904d1a06408b (commit) from 75a32d8d43ff574021cc71ac18b90c9dce58f646 (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=5884dc2e1061eda7cffd1d609bb265aa05330664 commit 5884dc2e1061eda7cffd1d609bb265aa05330664 Merge: 75a32d8 95f5094 Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Feb 29 12:47:29 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Feb 29 12:47:29 2012 -0500 Merge topic 'document-missing-versions' into next 95f5094 document when version detection will not work http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95f50940cc10c22077435326db14904d1a06408b commit 95f50940cc10c22077435326db14904d1a06408b Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Wed Feb 29 18:46:47 2012 +0100 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Wed Feb 29 18:46:47 2012 +0100 document when version detection will not work diff --git a/Modules/FindGnuplot.cmake b/Modules/FindGnuplot.cmake index 3e36e4b..b8dc3f4 100644 --- a/Modules/FindGnuplot.cmake +++ b/Modules/FindGnuplot.cmake @@ -5,6 +5,8 @@ # GNUPLOT_FOUND - system has Gnuplot # GNUPLOT_EXECUTABLE - the Gnuplot executable # GNUPLOT_VERSION_STRING - the version of Gnuplot found (since CMake 2.8.8) +# +# GNUPLOT_VERSION_STRING will not work for old versions like 3.7.1. #= # Copyright 2002-2009 Kitware, Inc. diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index 52d575b..40760e5 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -27,6 +27,8 @@ # ImageMagick_VERSION_STRING - the version of ImageMagick found # (since CMake 2.8.8) # +# ImageMagick_VERSION_STRING will not work for old versions like 5.2.3. +# # There are also components for the following ImageMagick APIs: # # Magick++ --- Summary of changes: Modules/FindGnuplot.cmake |2 ++ Modules/FindImageMagick.cmake |2 ++ 2 files changed, 4 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.7-2962-g2b89510
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 2b89510c33cec1e66e05d6dfab4630367a08c512 (commit)
via adc2c99065f58223d87f18e3433d65f07daf35c3 (commit)
from 6136b511f868e6636e9cf90fd97f46fa2ea61919 (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=2b89510c33cec1e66e05d6dfab4630367a08c512
commit 2b89510c33cec1e66e05d6dfab4630367a08c512
Merge: 6136b51 adc2c99
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Feb 29 13:39:59 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 29 13:39:59 2012 -0500
Merge topic 'run-vim-spellcheck' into next
adc2c99 Run vim spellcheck on some files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adc2c99065f58223d87f18e3433d65f07daf35c3
commit adc2c99065f58223d87f18e3433d65f07daf35c3
Author: Yury G. Kudryashov urkud.ur...@gmail.com
AuthorDate: Sun Feb 26 22:44:20 2012 +0400
Commit: Yury G. Kudryashov urkud.ur...@gmail.com
CommitDate: Wed Feb 29 00:09:14 2012 +0400
Run vim spellcheck on some files
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 9a075bd..ddff2d9 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -27,7 +27,7 @@
This file computes an ordered list of link items to use when linking a
single target in one configuration. Each link item is identified by
the string naming it. A graph of dependencies is created in which
-each node corresponds to one item and directed eges lead from nodes to
+each node corresponds to one item and directed edges lead from nodes to
those which must *follow* them on the link line. For example, the
graph
@@ -42,7 +42,7 @@ search of the link dependencies starting from the main target.
There are two types of items: those with known direct dependencies and
those without known dependencies. We will call the two types known
-items and unknown items, respecitvely. Known items are those whose
+items and unknown items, respectively. Known items are those whose
names correspond to targets (built or imported) and those for which an
old-style item_LIB_DEPENDS variable is defined. All other items are
unknown and we must infer dependencies for them. For items that look
@@ -150,7 +150,7 @@ times the component needs to be seen (once for trivial
components,
twice for non-trivial). If at any time another component finishes and
re-adds an already pending component, the pending component is reset
so that it needs to be seen in its entirety again. This ensures that
-all dependencies of a component are satisified no matter where it
+all dependencies of a component are satisfied no matter where it
appears.
After the original link line has been completed, we append to it the
diff --git a/Source/cmComputeTargetDepends.cxx
b/Source/cmComputeTargetDepends.cxx
index 8e701c4..ab77c6b 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -31,7 +31,7 @@ dependencies for each target such that no cycles are left and
the
build order is safe.
For most target types cyclic dependencies are not allowed. However
-STATIC libraries may depend on each other in a cyclic fasion. In
+STATIC libraries may depend on each other in a cyclic fashion. In
general the directed dependency graph forms a directed-acyclic-graph
of strongly connected components. All strongly connected components
should consist of only STATIC_LIBRARY targets.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 7d84ba6..48f644b 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -153,11 +153,11 @@ int
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
std::string ccFile = this-BinaryDirectory + /CMakeCache.txt;
cmSystemTools::RemoveFile(ccFile.c_str());
-// we need to create a directory and CMakeList file etc...
+// we need to create a directory and CMakeLists file etc...
// first create the directories
sourceDirectory = this-BinaryDirectory.c_str();
-// now create a CMakeList.txt file in that directory
+// now create a CMakeLists.txt file in that directory
FILE *fout = fopen(outFileName.c_str(),w);
if (!fout)
{
diff --git a/Source/cmCreateTestSourceList.cxx
b/Source/cmCreateTestSourceList.cxx
index 953328a..de20cb7 100644
--- a/Source/cmCreateTestSourceList.cxx
+++ b/Source/cmCreateTestSourceList.cxx
@@ -70,7 +70,7 @@ bool cmCreateTestSourceList
if (cmSystemTools::GetFilenameExtension(*i).size() 2)
{
this-SetError(
- You must specify a file
[Cmake-commits] CMake branch, next, updated. v2.8.7-2964-g7e6b44d
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 7e6b44d849cf8b45f6ed96c059f9fbe67b8b4fff (commit) via 9c1afd6082605af63eebcc290ed70a8d49275961 (commit) from 2b89510c33cec1e66e05d6dfab4630367a08c512 (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=7e6b44d849cf8b45f6ed96c059f9fbe67b8b4fff commit 7e6b44d849cf8b45f6ed96c059f9fbe67b8b4fff Merge: 2b89510 9c1afd6 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Feb 29 14:07:37 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Feb 29 14:07:37 2012 -0500 Merge topic 'run-vim-spellcheck' into next 9c1afd6 cmake.cxx: Fix line-too-long style violation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c1afd6082605af63eebcc290ed70a8d49275961 commit 9c1afd6082605af63eebcc290ed70a8d49275961 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Feb 29 14:07:09 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Feb 29 14:07:09 2012 -0500 cmake.cxx: Fix line-too-long style violation diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 08715f0..0b7a996 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3373,7 +3373,8 @@ void cmake::DefineProperties(cmake *cm) it contains the names of all packages which were found. This is determined using the NAME_FOUND variables. Packages which are searched QUIET are not listed. A project can add its own features to - this list. This property is used by the macros in FeatureSummary.cmake.); + this list. + This property is used by the macros in FeatureSummary.cmake.); cm-DefineProperty (DISABLED_FEATURES, cmProperty::GLOBAL, List of features which are disabled during the CMake run., @@ -3381,7 +3382,8 @@ void cmake::DefineProperties(cmake *cm) it contains the names of all packages which were not found. This is determined using the NAME_FOUND variables. Packages which are searched QUIET are not listed. A project can add its own features to - this list. This property is used by the macros in FeatureSummary.cmake.); + this list. + This property is used by the macros in FeatureSummary.cmake.); cm-DefineProperty (PACKAGES_FOUND, cmProperty::GLOBAL, List of packages which were found during the CMake run., --- Summary of changes: Source/cmake.cxx |6 -- 1 files changed, 4 insertions(+), 2 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.7-2966-gab88aeb
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 ab88aeb57d387c38e878e1535742065f3da8e831 (commit)
via 43d60114a57b12766106cd264f358b9bfa098bba (commit)
from 7e6b44d849cf8b45f6ed96c059f9fbe67b8b4fff (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=ab88aeb57d387c38e878e1535742065f3da8e831
commit ab88aeb57d387c38e878e1535742065f3da8e831
Merge: 7e6b44d 43d6011
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Feb 29 14:08:16 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 29 14:08:16 2012 -0500
Merge topic 'run-vim-spellcheck' into next
43d6011 Run vim spellcheck on some files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43d60114a57b12766106cd264f358b9bfa098bba
commit 43d60114a57b12766106cd264f358b9bfa098bba
Author: Yury G. Kudryashov urkud.ur...@gmail.com
AuthorDate: Sun Feb 26 22:44:20 2012 +0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Feb 29 14:07:50 2012 -0500
Run vim spellcheck on some files
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 9a075bd..ddff2d9 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -27,7 +27,7 @@
This file computes an ordered list of link items to use when linking a
single target in one configuration. Each link item is identified by
the string naming it. A graph of dependencies is created in which
-each node corresponds to one item and directed eges lead from nodes to
+each node corresponds to one item and directed edges lead from nodes to
those which must *follow* them on the link line. For example, the
graph
@@ -42,7 +42,7 @@ search of the link dependencies starting from the main target.
There are two types of items: those with known direct dependencies and
those without known dependencies. We will call the two types known
-items and unknown items, respecitvely. Known items are those whose
+items and unknown items, respectively. Known items are those whose
names correspond to targets (built or imported) and those for which an
old-style item_LIB_DEPENDS variable is defined. All other items are
unknown and we must infer dependencies for them. For items that look
@@ -150,7 +150,7 @@ times the component needs to be seen (once for trivial
components,
twice for non-trivial). If at any time another component finishes and
re-adds an already pending component, the pending component is reset
so that it needs to be seen in its entirety again. This ensures that
-all dependencies of a component are satisified no matter where it
+all dependencies of a component are satisfied no matter where it
appears.
After the original link line has been completed, we append to it the
diff --git a/Source/cmComputeTargetDepends.cxx
b/Source/cmComputeTargetDepends.cxx
index 8e701c4..ab77c6b 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -31,7 +31,7 @@ dependencies for each target such that no cycles are left and
the
build order is safe.
For most target types cyclic dependencies are not allowed. However
-STATIC libraries may depend on each other in a cyclic fasion. In
+STATIC libraries may depend on each other in a cyclic fashion. In
general the directed dependency graph forms a directed-acyclic-graph
of strongly connected components. All strongly connected components
should consist of only STATIC_LIBRARY targets.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 7d84ba6..48f644b 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -153,11 +153,11 @@ int
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
std::string ccFile = this-BinaryDirectory + /CMakeCache.txt;
cmSystemTools::RemoveFile(ccFile.c_str());
-// we need to create a directory and CMakeList file etc...
+// we need to create a directory and CMakeLists file etc...
// first create the directories
sourceDirectory = this-BinaryDirectory.c_str();
-// now create a CMakeList.txt file in that directory
+// now create a CMakeLists.txt file in that directory
FILE *fout = fopen(outFileName.c_str(),w);
if (!fout)
{
diff --git a/Source/cmCreateTestSourceList.cxx
b/Source/cmCreateTestSourceList.cxx
index 953328a..de20cb7 100644
--- a/Source/cmCreateTestSourceList.cxx
+++ b/Source/cmCreateTestSourceList.cxx
@@ -70,7 +70,7 @@ bool cmCreateTestSourceList
if (cmSystemTools::GetFilenameExtension(*i).size() 2)
{
this-SetError(
- You must specify a file extenion
[Cmake-commits] CMake branch, next, updated. v2.8.7-2968-gf857e77
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 f857e77536ad50bc68050d31ab84a15c81a9c017 (commit)
via 7f7679e69a5d1360c1c654248b8b1e67d1dbadf3 (commit)
from ab88aeb57d387c38e878e1535742065f3da8e831 (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=f857e77536ad50bc68050d31ab84a15c81a9c017
commit f857e77536ad50bc68050d31ab84a15c81a9c017
Merge: ab88aeb 7f7679e
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Feb 29 14:39:04 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 29 14:39:04 2012 -0500
Merge topic 'bootstrap-msys-paths' into next
7f7679e bootstrap: Convert MSYS paths to Windows format (#13001)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f7679e69a5d1360c1c654248b8b1e67d1dbadf3
commit 7f7679e69a5d1360c1c654248b8b1e67d1dbadf3
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Feb 29 14:29:16 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Feb 29 14:30:15 2012 -0500
bootstrap: Convert MSYS paths to Windows format (#13001)
We set CMAKE_PREFIX_PATH from the --prefix= option. The calling shell
might not translate /c/... to c:/... paths but we need to store
Windows paths in CMake cache variables. Pass the specified path through
the MSYS shell in a form it will convert to a Windows path using the
MSYS fstab.
diff --git a/bootstrap b/bootstrap
index f5eacbd..c67c28e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -127,10 +127,20 @@ fi
cmake_bootstrap_dir=${cmake_binary_dir}/Bootstrap${_cmk}
# Helper function to fix windows paths.
-cmake_fix_slashes ()
-{
- echo $1 | sed 's/\\/\//g'
-}
+case ${cmake_system} in
+*MINGW*)
+ cmake_fix_slashes()
+ {
+cmd //c echo $(echo $1 | sed 's/\\/\//g') | sed 's/^//;s/$//'
+ }
+ ;;
+*)
+ cmake_fix_slashes()
+ {
+echo $1 | sed 's/\\/\//g'
+ }
+ ;;
+esac
# Choose the default install prefix.
if ${cmake_system_mingw}; then
---
Summary of changes:
bootstrap | 18 ++
1 files changed, 14 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2970-gb71538d
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 b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61 (commit)
via 4689eedcc0a1cd73a95dbce583c9470319312b80 (commit)
from f857e77536ad50bc68050d31ab84a15c81a9c017 (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=b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61
commit b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61
Merge: f857e77 4689eed
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Feb 29 15:37:13 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 29 15:37:13 2012 -0500
Merge topic 'qt4-deploy' into next
4689eed reflect that the QtAutomoc depends on QtGui
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4689eedcc0a1cd73a95dbce583c9470319312b80
commit 4689eedcc0a1cd73a95dbce583c9470319312b80
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Feb 29 21:35:20 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Wed Feb 29 21:35:20 2012 +0100
reflect that the QtAutomoc depends on QtGui
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 13e57d9..7e56588 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -888,7 +888,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
)
LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/Environment)
- IF(QT4_WORKS)
+ IF(QT4_WORKS AND QT_QTGUI_FOUND)
ADD_TEST(QtAutomoc ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/QtAutomoc
---
Summary of changes:
Tests/CMakeLists.txt |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2972-g62bb3fb
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 62bb3fb93b8077a3bdee8566f3d63177bbe088c6 (commit)
via 2557a080543a37f92e1908420842db8c90685304 (commit)
from b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61 (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=62bb3fb93b8077a3bdee8566f3d63177bbe088c6
commit 62bb3fb93b8077a3bdee8566f3d63177bbe088c6
Merge: b71538d 2557a08
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Feb 29 22:29:13 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 29 22:29:13 2012 -0500
Merge topic 'inject_code_via_variable' into next
2557a08 Fix typo in error message, and remove redundent test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2557a080543a37f92e1908420842db8c90685304
commit 2557a080543a37f92e1908420842db8c90685304
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Feb 29 22:28:06 2012 -0500
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Wed Feb 29 22:28:06 2012 -0500
Fix typo in error message, and remove redundent test.
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 4c1abcf..fcf0a49 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -88,7 +88,7 @@ bool cmProjectCommand
if(!readit !cmSystemTools::GetFatalErrorOccured())
{
std::string m =
-could not find load file:\n
+could not find file:\n
;
m += include;
this-SetError(m.c_str());
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 629f578..a1551ca 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -23,8 +23,6 @@ add_CMakeOnly_test(AllFindModules)
add_CMakeOnly_test(TargetScope)
-add_CMakeOnly_test(ProjectInclude)
-
add_test(CMakeOnly.ProjectInclude ${CMAKE_CMAKE_COMMAND}
-DTEST=ProjectInclude
-DCMAKE_ARGS=-DCMAKE_PROJECT_ProjectInclude_INCLUDE=${CMAKE_CURRENT_SOURCE_DIR}/ProjectInclude/include.cmake
---
Summary of changes:
Source/cmProjectCommand.cxx|2 +-
Tests/CMakeOnly/CMakeLists.txt |2 --
2 files changed, 1 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
