Re: [cmake-developers] file(DOWNLOAD) + EXPECTED_HASH security issue
On 19/11/13 16:34, Brad King wrote: * The STATUS variable is not set, therefore it is not useful; * The faulty downloaded file is not removed. So I believe that there is no way to stop CMake, unless you perform another hash check. The this-SetError/return false logic for these errors should be replaced by this-IssueMessage(cmake::FATAL_ERROR,...)/return true to switch it to a fatal error. The signature should be extended to provide an option to get the error information back without causing a CMake Error so that the caller can handle it. What about setting the STATUS variable to some number different from 0;algo check failed instead? In this way the default behaviour won't change and there is no need to extend the signature, but if you check the STATUS variable, you will be able to issue a fatal error. Also if download fails in some other way, the error raised is not fatal, therefore in this way it looks more coherent. Daniele -- 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] Silent failure of attaching custom commands to non existing target
On 19.11.2013 18:34, Brad King wrote: We would need a policy because existing project releases inevitably contain such code by accident need to continue to work, albeit with a policy warning. I created a topic missing-target-error for this but it currently conflicts with constify in Source/cmMakefile.cxx. Nils -- 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] New CPack WiX Generator Component Support
I've staged a new topic wix-components that adds basic component support to the CPack WiX generator: http://cmake.org/gitweb?p=stage/cmake.git;a=shortlog;h=refs/heads/wix-components I would like to encourage anyone interested in this to inspect and/or try out the changes and provide feedback. Would anyone be unhappy if I would postpone support for component inter-dependencies? I haven't yet found a proper way to handle these in WiX. Nils -- 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 0014586]: LLVM platform toolset for Visual Studio
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14586 == Reported By:Daniel Pfeifer Assigned To: == Project:CMake Issue ID: 14586 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2013-11-20 06:19 EST Last Modified: 2013-11-20 06:19 EST == Summary:LLVM platform toolset for Visual Studio Description: When configuring a CMake project with an LLVM toolset, CMake complains about the compiler not being able to compile a simpe test program. The complete output is attached. It seems the problem is the '-g' compile flag. Steps to Reproduce: * Install Visual Studio * Install LLVM from http://llvm.org/builds/ * `cmake -G Visual Studio 12 -T LLVM-vs2013` == Issue History Date ModifiedUsername FieldChange == 2013-11-20 06:19 Daniel Pfeifer New Issue 2013-11-20 06:19 Daniel Pfeifer File Added: output.txt == -- 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] file(DOWNLOAD) + EXPECTED_HASH security issue
On 11/20/2013 04:05 AM, Daniele E. Domenichelli wrote: The this-SetError/return false logic for these errors should be replaced by this-IssueMessage(cmake::FATAL_ERROR,...)/return true to switch it to a fatal error. The signature should be extended to provide an option to get the error information back without causing a CMake Error so that the caller can handle it. What about setting the STATUS variable to some number different from 0;algo check failed instead? In this way the default behaviour won't change and there is no need to extend the signature, but if you check the STATUS variable, you will be able to issue a fatal error. Also if download fails in some other way, the error raised is not fatal, therefore in this way it looks more coherent. Once a command reports an error CMake will not generate the project so it is not worth allowing the configuration to do much after that. Failure of file(DOWNLOAD) should either be a cmake::FATAL_ERROR or just a STATUS setting with no CMake Error. The signature needs a way for CMake to know which one to do. I'm fine with changing the current non-fatal error to a fatal error in the next release. -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
[cmake-developers] [CMake 0014587]: Add support for wxWidgets 3.0.0
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14587 == Reported By:adesmier_fr Assigned To: == Project:CMake Issue ID: 14587 Category: CMake Reproducibility:always Severity: feature Priority: normal Status: new == Date Submitted: 2013-11-20 10:05 EST Last Modified: 2013-11-20 10:05 EST == Summary:Add support for wxWidgets 3.0.0 Description: Currently cmake can not find wxWidgets 3.0.0. Find attached patch that solve this issue == Issue History Date ModifiedUsername FieldChange == 2013-11-20 10:05 adesmier_frNew Issue 2013-11-20 10:05 adesmier_frFile Added: FindwxWidgets.cmake.diff == -- 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] FindBacktrace.cmake
2013/11/19 Vadim Zhukov persg...@gmail.com: 2013/11/19 Brad King brad.k...@kitware.com: On 07/31/2013 10:06 AM, Brad King wrote: The dependency is now in master so please rebase find_backtrace on that so you can use the reset feature. The find_backtrace topic has not yet been merged to 'next' for testing. After the documentation transition I rebased and revised the topic once to use the new documentation system but otherwise did not change it. Has this topic been updated to use the reset feature of CMakePushCheckState? Please check/revise the current topic on the stage and merge to 'next' for testing or remove it if you no longer wish to contribute this module. Sorry for slacking. I've mishandled the topic repo on my side with erroneous git rebase, then was forced to do other things and kept it unupdated for a long time. I'll revise and update the topic today or tomorrow. Thank you for reminding and sorry again. I've pushed the version which uses cmake_push_check_state(RESET). -- WBR, Vadim Zhukov -- 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 --help output indentation (was: RST and documentation)
Brad King wrote: IMO the --help-* command-line options are still present only for basic compatibility with pre-3.0 help and should not be a focus of workflow enhancements. I don't consider --help-command an 'only compatibility' feature. It's the primary way I read cmake documentation. The output of the individual domain objects is still pretty easy to use. By 'domain object', do you mean the individual .rst files? How would you read them without --help-command and without find+cat? How find+cat easier than --help-command? All the other output is just whole man pages which are better viewed with real man page or html viewers. The --help-command option is much more convenient than man cmake-commands /find_package n # enough times to get to the find_package docs, not references to it. It is also a disadvantage that the man context is not the command line context. Think of when you use cat or head instead of vi/less. Are you referring to something more convenient? I'm not a man page expert. There may be another way to get to the find_package docs than the above? 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 --help-custom-modules compatibility
Brad King wrote: On 11/18/2013 04:34 PM, Alexander Neundorf wrote: the author of the --help-custom-modules command line option certainly intended this to be used by other projects. ;-) I don't know whether this is used only in KDE or also in other projects. The solution is still to re-implement the --help-custom-modules myman.1 command-line behavior as a special case with warnings. Alex and Steve will have to work out who takes responsibility for that. I'll defer to Alex on doing that I think. As an unrelated matter, I would like to find out whether any packages in, eg debian fail to build with CMake 3. I'll try to figure out a way to find out. --unknownUnknowns; 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] organizing concept documentation (was: RST and documentation)
Brad King wrote: * cmake_minumum_required/policies This can go in the introduction of the cmake-policies.7 manual page and be linked from the cmake_minumum_required command. Done, but can be expanded more I suppose. * project/languages * cross-compiling/toolchain files etc. How about a cmake-toolchains.7 manual for these two? Sounds good to me. * find_package/Find modules/Config modules * imported and other pseudo/special targets, and exporting them Create a cmake-packages.7 manual that covers these. Ok. I think I'll put the exporting targets section in the below manual though. * build targets, various library types, target properties like PIC etc * usage requirements I think these all belong in a dedicated manual but I can't think of a good name off the top of my head right now. * cmake-targets.7 * cmake-buildsystem.7 -- My preference. * cmake-listsfiles.7 * cmake-outputs.7 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] CPACK_COMPONENT_compName_DEPENDS doesn't work
Hello,
I'm surprised CPACK_RPM_gui_PACKAGE_REQUIRES works , I don't find any
use of CPACK_RPM_compName_REQUIRES in CPackRPM.cmake;
What I can suggest you for generating several packages with different
dependencies is to generate the different packages in multiple steps. If
we suppose you defined 2 components (in the INSTALL commands) called :
binary and devel ,you can then generate the packages (whether deb or
rpm) as follows:
SET(CPACK_INSTALL_CMAKE_PROJECTS
${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME}; ${MYBUILDTYPE};/)
then for the dependencies:
IF(MYBUILDTYPE STREQUAL binary)
SET(CPACK_RPM_PACKAGE_REQUIRES gsl)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS libgsl0-dev)
ELSE()
SET(CPACK_RPM_PACKAGE_REQUIRES gsl-devel)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS libgsl0-dev)
ENDIF()
Then the packages are generated with:
cmake -DMYBUILDTYPE=binary make package
cmake -DMYBUILDTYPE=devel make package
best;
Jeremy.
On 11/20/2013 03:51 AM, j...@linuxwest.com wrote:
Hello CMake group,
I'm trying to do a component-based install that will produce multiple
packages, where one package depends on another. I am using cmake
version 2.8.12.1. Have multiple packages working well but the
dependencies have not been easy.
The variable CPACK_COMPONENT_compName_DEPENDS, given by the command
`cpack --help-variable-list`, as far as I can tell, does nothing.
Surprisingly, what ended up doing the trick on an RPM-based system is:
SET(CPACK_RPM_gui_PACKAGE_REQUIRES my-lib = 0.1.1)
Why does this work? This is inconsistent with the documentation.
The bigger problem, I'm trying to solve at the moment, is how to make
component dependencies work on Debian. I have tried every combination
of cpack variable + component name and nothing stops an install with a
message like, Unable to install gui because it depends on my-lib
(because my-lib doesn't exist so it should halt the installer).
Does component-based install even work for Debian (actually, I'm on
ubuntu but whatever)? I saw about two references to it on the entire
Internet so a good resource is hard to find, currently. It would be
idea if I can use CPACK_COMPONENT_compName_DEPENDS for both deb and
rpm but as I said, it doesn't work.
Thank you for any help/guidance.
Jeff
--
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
--
Jérémy Fix (PhD)
Assistant Professor
Supélec
2 rue Edouard Belin
57070 Metz, France
Tél: +33(0)387 76 47 79
Fax: +33(0)387764700
Email: jeremy@supelec.fr
Homepage : http://malis.metz.supelec.fr/~fix_jer
--
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] Select the Visual C++ Compiler November 2013 CTP with CMake generated projects?
Yup, AFAIK, -T is not represented in the GUI yet. Petr On Tue, Nov 19, 2013 at 6:16 PM, Thompson, K T k...@lanl.gov wrote: That did the trick. Thank you. I was looking to set the Toolset from within the GUI, but it doesn’t appear that CMake current supports this operation. -kt *From:* Petr Kmoch [mailto:petr.km...@gmail.com] *Sent:* Tuesday, November 19, 2013 9:28 AM *To:* Thompson, K T *Cc:* cmake@cmake.org *Subject:* Re: [CMake] Select the Visual C++ Compiler November 2013 CTP with CMake generated projects? Hi Kelly. This should be possible using CMake's command-line option -T which specifies the toolset to use. Petr On Tue, Nov 19, 2013 at 4:41 PM, Thompson, K T k...@lanl.gov wrote: Hi, Is there a way to tell CMake to generate Visual Studio 2013 projects that use the November 2013 CTP version of the compiler [1]? It looks like I can modify each project in my VS solution manually [2] but this is not particularly convenient when CMake is used to generate the solution files. [1] http://blogs.msdn.com/b/vcblog/archive/2013/11/18/announcing-the-visual-c-compiler-november-2013-ctp.aspx [2] For each project, edit the properties and set Platform Toolset to Visual C++ Compiler Nov 2013 CTP (CTP_Nov2013). -kt Kelly Thompson k...@lanl.gov -- 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 -- 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] CPACK_COMPONENT_compName_DEPENDS doesn't work
2013/11/20 Jeremy Fix jeremy@supelec.fr:
Hello,
I'm surprised CPACK_RPM_gui_PACKAGE_REQUIRES works , I don't find any use of
CPACK_RPM_compName_REQUIRES in CPackRPM.cmake;
Yes there is for all
URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV
AUTOREQ AUTOREQPROV
see lines 555 and following we check for component specific value first:
if(DEFINED CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER})
then
else()
if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER})
However we may have check the definition of
CPACK_COMPONENT_compName_DEPENDS first
in order to fill-in CPACK_RPM_compName_REQUIRES.
This is not done.
Moreover I'm not sure this could be easily factoired out since the
syntax for dependency specification
may well be package type specific (different name or syntax for DEB or
RPM for example).
What I can suggest you for generating several packages with different
dependencies is to generate the different packages in multiple steps. If we
suppose you defined 2 components (in the INSTALL commands) called : binary
and devel ,you can then generate the packages (whether deb or rpm) as
follows:
SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME};
${MYBUILDTYPE};/)
then for the dependencies:
IF(MYBUILDTYPE STREQUAL binary)
SET(CPACK_RPM_PACKAGE_REQUIRES gsl)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS libgsl0-dev)
ELSE()
SET(CPACK_RPM_PACKAGE_REQUIRES gsl-devel)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS libgsl0-dev)
ENDIF()
Then the packages are generated with:
cmake -DMYBUILDTYPE=binary make package
cmake -DMYBUILDTYPE=devel make package
You should be able to do that with component packaging and a
CPACK_PROJECT_CONFIG_FILE.
--
Erk
L'élection n'est pas la démocratie -- http://www.le-message.org
--
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] CPACK_COMPONENT_compName_DEPENDS doesn't work
On 11/20/2013 09:52 AM, Eric Noulard wrote:
2013/11/20 Jeremy Fix jeremy@supelec.fr:
Hello,
I'm surprised CPACK_RPM_gui_PACKAGE_REQUIRES works , I don't find any use of
CPACK_RPM_compName_REQUIRES in CPackRPM.cmake;
Yes there is for all
URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV
AUTOREQ AUTOREQPROV
see lines 555 and following we check for component specific value first:
if(DEFINED CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER})
then
else()
if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER})
However we may have check the definition of
CPACK_COMPONENT_compName_DEPENDS first
in order to fill-in CPACK_RPM_compName_REQUIRES.
This is not done.
Moreover I'm not sure this could be easily factoired out since the
syntax for dependency specification
may well be package type specific (different name or syntax for DEB or
RPM for example).
What I can suggest you for generating several packages with different
dependencies is to generate the different packages in multiple steps. If we
suppose you defined 2 components (in the INSTALL commands) called : binary
and devel ,you can then generate the packages (whether deb or rpm) as
follows:
SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME};
${MYBUILDTYPE};/)
then for the dependencies:
IF(MYBUILDTYPE STREQUAL binary)
SET(CPACK_RPM_PACKAGE_REQUIRES gsl)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS libgsl0-dev)
ELSE()
SET(CPACK_RPM_PACKAGE_REQUIRES gsl-devel)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS libgsl0-dev)
ENDIF()
Then the packages are generated with:
cmake -DMYBUILDTYPE=binary make package
cmake -DMYBUILDTYPE=devel make package
You should be able to do that with component packaging and a
CPACK_PROJECT_CONFIG_FILE.
I'm not familiar with CPACK_PROJECT_CONFIG_FILE;
I had issues with the package names generated with component packaging
as the component name is added at the end of the package name; I
prefered to generate the components in two steps to tweak the
CPACK_RPM_PACKAGE_NAME and I use some commands a bit more complicated
than the above;
IF(MYBUILDTYPE STREQUAL binary)
SET(CPACK_RPM_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
SET(CPACK_DEBIAN_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
SET(CPACK_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR})
SET(CPACK_INSTALL_CMAKE_PROJECTS
${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME};binary;/)
ELSEIF(MYBUILDTYPE STREQUAL devel)
SET(CPACK_RPM_PACKAGE_NAME ${CMAKE_PROJECT_NAME}-devel)
SET(CPACK_DEBIAN_PACKAGE_NAME ${CMAKE_PROJECT_NAME}-devel)
SET(CPACK_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-devel-${PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR})
SET(CPACK_INSTALL_CMAKE_PROJECTS
${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME}-devel;devel;/)
ENDIF()
This is just to ensure consistency between the field Name: in the
autogenerated spec file is :pkg and pkg-devel ;
and the generated RPM (or deb) filenames: pkg-1.00-i686.rpm and
pkg-devel-1.00-i686.rpm
jeremy.
--
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] New CPack WiX Generator Component Support
I've staged a new topic wix-components that adds basic component support to the CPack WiX generator: http://cmake.org/gitweb?p=stage/cmake.git;a=shortlog;h=refs/heads/wix-components I would like to encourage anyone interested in this to inspect and/or try out the changes and provide feedback. Would anyone be unhappy if I would postpone support for component inter-dependencies? I haven't yet found a proper way to handle these in WiX. Nils -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Building Matlab Mex extensions that link to ITK?
Kent,
It appears that you are trying to link of all of ITK. SimpleITK ITK took the
approach of producing a library that fully encapsulates ITK. So that a single
shared library could be produced and not depend on ITK. While you could use
SimpleITK's library and try to use the infrastructure to customize if for you
needs. I doubt that is what you need... ( But it'd be very cool IMO ).
What you may consider is compiling ITK as static and creating a facade
interface which only exposes your code and methods you need. This facade
interface would be compiled into a self contained shared library. So you only
need to link the mex stuff to this library and not all of ITK. Hence just
simplify the process by encapsulating ITK.
If you want any further info just let me know.
Brad
On Nov 19, 2013, at 12:59 PM, Williams, Norman K
norman-k-willi...@uiowa.edu wrote:
Has anyone else come up with an elegant solution for this?
If I want to call ITK from a Matlab MEX extension written in C++, I run
into problems with telling it the libraries with which to link.
The ITK_LIBRARIES variable is a list of imported library targets which
CMake converts to actual library paths when it links a library or
executable.
But to compile a MEX file, we're using a custom command along the lines of
add_custom_command(OUTPUT ${MEX_PREFIX}.${MATLAB_MEX_EXT}
COMMAND ${MATLAB_MEX_PATH} -cxx
${CMAKE_CXX_FLAGS_Release} ${MEX_SRC_PATH}
${ITK_INCLUDES} ${ITK_LIBRARIES}
-I${Teem_INCLUDE_DIR} -L${Teem_LIBRARY_DIR} -lteem
${ZLIB_LIBRARY}
DEPENDS ${MEX_SRC_PATH}
IMPLICIT_DEPENDS C ${MEX_SRC_PATH}
COMMENT BUILDING MEX_FILE: ${MEX_SRC_PATH} )
But that doesn't work because CMake gives the target names in
ITK_LIBRARIES instead of the actual libraries.
I tried this:
find_package(ITK NO_MODULE REQUIRED)
include(${ITK_USE_FILE})
set(ITK_LOCAL_LIBS)
foreach(lib ${ITK_LIBRARIES})
get_target_property(_lib ${lib} IMPORTED_LOCATION)
list(APPEND ITK_LOCAL_LIBS ${_lib})endforeach()
But all the IMPORTED_LOCATION for ITK libraries is _lib-NOTFOUND
--
Kent Williams norman-k-willi...@uiowa.edu
Notice: This UI Health Care e-mail (including attachments) is covered by the
Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential
and may be legally privileged. If you are not the intended recipient, you
are hereby notified that any retention, dissemination, distribution, or
copying of this communication is strictly prohibited. Please reply to the
sender that you have received the message in error, then delete it. Thank
you.
--
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] Building Matlab Mex extensions that link to ITK?
The problem is even stranger than that.
In my CMakeLists.txt I am using (sort of) the 'stub + library' method
suggested by Matt McCormick. But I'm not doing exactly what he did; I try
and get all the libraries needed to link and pass them in to MEX. This
ALMOST works, but ITK_LIBRARIES doesn't list all the libraries needed,
hence I still get undefined externals -- stuff from vnl and gdcm.
Apparently there are library dependencies that are handled down in the
murk of CMake's build logic.
CMAKELISTS.TXT---
find_package(Matlab REQUIRED)
set(MEX_SOURCES nrrdLoadWithMetadata nrrdSaveWithMetadata
itkLoadWithMetadata itkSaveWithMetadata)
set(MEX_SHARED_OBJECTS )
# get library locations for ITK libraries
set(_ITK_LIBS)
foreach(itklib ${ITK_LIBRARIES})
if(TARGET ${itklib})
get_property(itk_lib_path TARGET ${itklib} PROPERTY LOCATION)
list(APPEND _ITK_LIBS ${itk_lib_path})
else()
list(APPEND _ITK_LIBS ${itklib})
endif()
endforeach()
foreach(MEX_PREFIX ${MEX_SOURCES})
# stick actual code in static lib
add_library(${MEX_PREFIX} STATIC ${MEX_PREFIX}.cxx)
# link in all necessary libraries
target_link_libraries(${MEX_PREFIX} ${Teem_LIBRARIES}
${ITK_LIBRARIES}
${ZLIB_LIBRARY})
get_property(mex_lib_path TARGET ${MEX_PREFIX} PROPERTY LOCATION)
set(MEX_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_PREFIX}Stub.cxx)
set(MEX_OBJECT_NAME ${MEX_PREFIX}.${MATLAB_MEX_EXT})
list(APPEND MEX_SHARED_OBJECTS ${MEX_OBJECT_NAME})
add_custom_command(OUTPUT ${MEX_PREFIX}.${MATLAB_MEX_EXT}
## HACK: The next line needs to be more general
COMMAND ${MATLAB_MEX_PATH} -cxx ${CMAKE_CXX_FLAGS_Release}
${MEX_SRC_PATH}
${mex_lib_path}
${_ITK_LIBS}
-L${Teem_LIBRARY_DIR} -lteem
${ZLIB_LIBRARY}
DEPENDS ${MEX_PREFIX} ${MEX_SRC_PATH}
IMPLICIT_DEPENDS C ${MEX_SRC_PATH}
WORKING_DIRECTORY ${${PRIMARY_PROJECT_NAME}_SOURCE_DIR}/MATLAB_SCRIPTS
COMMENT BUILDING MEX_FILE: ${MEX_SRC_PATH} )
endforeach()
add_custom_target(MEX_BLD ALL
DEPENDS ${MEX_SHARED_OBJECTS}
#[WORKING_DIRECTORY dir]
COMMENT BUILDING TARGET MEX_FILE: ${MEX_SRC}
SOURCES ${MATLAB_MEX_PATH} )
-Build
Output-
make-- Configuring done
-- Generating done
-- Build files have been written to:
/Volumes/scratch/kent/CompressedSensingDWI/build/CompressedSensingDWI-build
[ 0%] Built target CompressedSensingDWIFetchData
[ 11%] Built target itkSaveWithMetadata
[ 22%] Built target nrrdSaveWithMetadata
[ 33%] Built target nrrdLoadWithMetadata
[ 44%] Built target itkLoadWithMetadata
[ 55%] BUILDING MEX_FILE:
/Volumes/scratch/kent/CompressedSensingDWI/CompressedSensingDWI/mexFiles/it
kSaveWithMetadataStub.cxx
[ 66%] BUILDING MEX_FILE:
/Volumes/scratch/kent/CompressedSensingDWI/CompressedSensingDWI/mexFiles/nr
rdLoadWithMetadataStub.cxx
[ 77%] BUILDING MEX_FILE:
/Volumes/scratch/kent/CompressedSensingDWI/CompressedSensingDWI/mexFiles/nr
rdSaveWithMetadataStub.cxx
[ 88%] BUILDING MEX_FILE:
/Volumes/scratch/kent/CompressedSensingDWI/CompressedSensingDWI/mexFiles/it
kLoadWithMetadataStub.cxx
Undefined symbols for architecture x86_64:
vnl_vectorchar::set_size(unsigned int), referenced from:
itk::Arraychar::SetSize(unsigned int) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorchar::vnl_vector(vnl_vectorchar const), referenced from:
itk::Arraychar::Array(itk::Arraychar const) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorchar::vnl_vector(unsigned int), referenced from:
itk::Arraychar::Array(unsigned int) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorchar::~vnl_vector(), referenced from:
itk::Arraychar::~Array() in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorchar::operator=(vnl_vectorchar const), referenced from:
itk::Arraychar::operator=(itk::Arraychar const) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorshort::set_size(unsigned int), referenced from:
itk::Arrayshort::SetSize(unsigned int) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorshort::vnl_vector(vnl_vectorshort const), referenced
from:
itk::Arrayshort::Array(itk::Arrayshort const) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorshort::vnl_vector(unsigned int), referenced from:
itk::Arrayshort::Array(unsigned int) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorshort::~vnl_vector(), referenced from:
itk::Arrayshort::~Array() in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
vnl_vectorshort::operator=(vnl_vectorshort const), referenced
from:
itk::Arrayshort::operator=(itk::Arrayshort const) in
libITKIOHDF5-4.5.a(itkHDF5ImageIO.cxx.o)
gdcm::DataElement::SetVLToUndefined(), referenced from:
gdcm::ImageHelper::SetSpacingValue(gdcm::DataSet,
std::vectordouble, std::allocatordouble const) in
libitkgdcmMSFF-4.5.a(gdcmImageHelper.cxx.o)
gdcm::SetDataElementInSQAsItemNumber(gdcm::DataSet,
gdcm::DataElement const, gdcm::Tag
Re: [CMake] Experimental builds not always shown in CDash
On 20.11.2013 17:23, NoRulez wrote: Now the problem is, that sometimes the experimental entry are shown in CDash, but not every time when I call the CTest script. I don't know when it was shown or not. Did I need to configure some additional settings to get it to work? I use CMake 2.8.12 on Windows 7. Maybe the script itself intermittently fails before or during submission (ctest_submit())? Nils -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Experimental builds not always shown in CDash
Hello,
in my CTestScript I have the following:
set(MODEL Experimental)
ctest_start(${MODEL} TRACK ${MODEL})
.
.
.
The script is called from a scheduler every 30 minutes:
ctest -S CTestScript.cmake
Now the problem is, that sometimes the experimental entry are shown in CDash,
but not every time when I call the CTest script.
I don't know when it was shown or not.
Did I need to configure some additional settings to get it to work?
I use CMake 2.8.12 on Windows 7.
Thanks in advance
--
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] [Insight-developers] [ITK Community] Building Matlab Mex extensions that link to ITK?
Another thing -- the FindMatlabMex.cmake/UseMatlabMex.cmake stuff in VTK is out of date and broken, and apparently no one uses it or it would have been noticed a long time ago. -- Kent Williams norman-k-willi...@uiowa.edu Notice: This UI Health Care e-mail (including attachments) is covered by the Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential and may be legally privileged. If you are not the intended recipient, you are hereby notified that any retention, dissemination, distribution, or copying of this communication is strictly prohibited. Please reply to the sender that you have received the message in error, then delete it. Thank you. -- 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] Experimental builds not always shown in CDash
When I run ctest -V -S CTestScript.cmake then everything is done successfully, except that I doesn't see the build under CDash. Am 20.11.2013 um 17:30 schrieb Nils Gladitz nilsglad...@gmail.com: On 20.11.2013 17:23, NoRulez wrote: Now the problem is, that sometimes the experimental entry are shown in CDash, but not every time when I call the CTest script. I don't know when it was shown or not. Did I need to configure some additional settings to get it to work? I use CMake 2.8.12 on Windows 7. Maybe the script itself intermittently fails before or during submission (ctest_submit())? Nils -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] simple program, os x library archive error, linux no issues
OK, thanks.
But somehow complicated. I wonder If I couldn't (miss)use the UPDATE_COMMAND
for this.
Can I use a macro as UPDATE_COMMAND?
My CMakeLists.txt looks like that right now:
include(ExternalProject)
SET(subprojects core0 core1 core2)
foreach(MYPROJ ${subprojects})
ExternalProject_Add(
${MYPROJ}
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${MYPROJ}
CMAKE_ARGS
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/MyToolChain.cmake
UPDATE_COMMAND
INSTALL_COMMAND
)
ExternalProject_Add_Step(${MYPROJ} rescan
COMMAND ${CMAKE_COMMAND} -E touch
${CMAKE_CURRENT_SOURCE_DIR}/${MYPROJ}/CMakeLists.txt
DEPENDEES forcebuild
DEPENDERS build
ALWAYS 1
)
ExternalProject_Add_Step(${MYPROJ} forcebuild
COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BUILD_DIR}/${MYPROJ}-prefix/src/${MYPROJ}-stamp/${MYPROJ}-build
DEPENDEES configure
DEPENDERS rescan
ALWAYS 1
)
endforeach(MYPROJ)
I tried to play a little bit around with the prefix dir to make this a little
bit more sens full,
but not a real success so far. Any better Idea?
Next I need to link the Outputs of the three cores together.
Can I somehow automatically get the targets from each subproject?
I also like to improve the touch thing for my globbing procedure, but maybe I
will discuss this
separately in an other thread.
thanks
Arne
--
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] multi core project
OK, thanks.
But somehow complicated. I wonder If I couldn't (miss)use the UPDATE_COMMAND
for this.
Can I use a macro as UPDATE_COMMAND?
My CMakeLists.txt looks like that right now:
include(ExternalProject)
SET(subprojects core0 core1 core2)
foreach(MYPROJ ${subprojects})
ExternalProject_Add(
${MYPROJ}
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${MYPROJ}
CMAKE_ARGS
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/MyToolChain.cmake
UPDATE_COMMAND
INSTALL_COMMAND
)
ExternalProject_Add_Step(${MYPROJ} rescan
COMMAND ${CMAKE_COMMAND} -E touch
${CMAKE_CURRENT_SOURCE_DIR}/${MYPROJ}/CMakeLists.txt
DEPENDEES forcebuild
DEPENDERS build
ALWAYS 1
)
ExternalProject_Add_Step(${MYPROJ} forcebuild
COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BUILD_DIR}/${MYPROJ}-prefix/src/${MYPROJ}-stamp/${MYPROJ}-build
DEPENDEES configure
DEPENDERS rescan
ALWAYS 1
)
endforeach(MYPROJ)
I tried to play a little bit around with the prefix dir to make this a little
bit more sens full,
but not a real success so far. Any better Idea?
Next I need to link the Outputs of the three cores together.
Can I somehow automatically get the targets from each subproject?
I also like to improve the touch thing for my globbing procedure, but maybe I
will discuss this
separately in an other thread.
thanks
Arne
--
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] simple program, os x library archive error, linux no issues
sorry, it seems that I replyed to the wrong thread... -- 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] Experimental builds not always shown in CDash
On 11/20/2013 06:08 PM, NoRulez wrote: When I run ctest -V -S CTestScript.cmake then everything is done successfully, except that I doesn't see the build under CDash. Am 20.11.2013 um 17:30 schrieb Nils Gladitz nilsglad...@gmail.com: On 20.11.2013 17:23, NoRulez wrote: Now the problem is, that sometimes the experimental entry are shown in CDash, but not every time when I call the CTest script. I don't know when it was shown or not. Did I need to configure some additional settings to get it to work? I use CMake 2.8.12 on Windows 7. Maybe the script itself intermittently fails before or during submission (ctest_submit())? Nils -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake Have you checked the logs from the webserver running CDash? I once had failing submissions because the xml file reached the post limit of the nginx server. You can also check the logs binary_build_dir/Testing/Temporary/LastSubmit* to see what errors emerged during submit. hth, Micha signature.asc Description: OpenPGP digital signature -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] building a library named 'general'
Yes, that works. On Tue, Nov 19, 2013 at 7:21 PM, Matthew Woehlke matthew.woeh...@kitware.com wrote: On 2013-11-19 19:07, Michael DiCuccio wrote: Suppose you have a library named general: - add_library(general foo bar) - and then try to link it into an application: - add_executable(myapp baz) target_link_libraries(myapp general) - cmake complains about the fact that 'general' is a reserved keyword, and I have found no way to force or finagle linkage against a library named 'libgeneral'. Name the target something else (e.g. 'libgeneral') and modify its OUTPUT_NAME? (See set_target_properties and the OUTPUT_NAME property.) If all you need is to produce a 'libgeneral.so', that may suffice. If you also need the target name to be 'general'... -- 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 -- 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] CPack - disable CPACK_RESOURCE_FILE_README
Hi, When using the PackageMaker generator with CPack on OSX is there a way to disable CPACK_RESOURCE_FILE_README? When using the PackageMaker interface these files and the corresponding install wizard pages are optional. Glenn -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Why change option in Cmake -GUI does not require re-configuration?
Is this expected behavior? I remember using old version and update of the variable in the gui leaded to disabling generate button Alex On Mon, Nov 18, 2013 at 4:31 PM, Alex Malyushytskyy alexmal...@gmail.comwrote: I downloaded CMake 2.8.12 and faced the following behavior with Cmake -GUI which can be reproduced if: After initial configuration click configurations until all options are not marked as red. Then change one the options. Now you are able to click Generate and skip Configure. This leads to the wrong project file generated , if last changed option was incompatible with previously set options. This does not happen with ccmake., which enforces configuration after any change. It looks like as a bug to me. Regards, 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] Why change option in Cmake -GUI does not require re-configuration?
- Original Message - I downloaded CMake 2.8.12 and faced the following behavior with Cmake -GUI which can be reproduced if: After initial configuration click configurations until all options are not marked as red. Then change one the options. Now you are able to click Generate and skip Configure. This leads to the wrong project file generated , if last changed option was incompatible with previously set options. This does not happen with ccmake. , which enforces configuration after any change. It looks like as a bug to me. Yes, its a bug. Thanks for reporting and its fixed here. http://cmake.org/gitweb?p=cmake.git;a=commit;h=b5669873 Clint -- 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.1-5491-g5d52400
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 5d524003ea7ee45e7391528cbbb4a7aac7836c20 (commit)
via bedeade06b55f475c1c028c1f72c10244302c6fa (commit)
via a08248bb7d04331c5816ae598c44011cf1011c78 (commit)
via b7cecfcb21c60a3e9a989dabdd411c306e7b9e51 (commit)
from dea2575980a97200067418058c1d6fcdcf394acb (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=5d524003ea7ee45e7391528cbbb4a7aac7836c20
commit 5d524003ea7ee45e7391528cbbb4a7aac7836c20
Merge: dea2575 bedeade
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 06:42:30 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 06:42:30 2013 -0500
Merge topic 'add-cmLiteralNCompare' into next
bedeade Use new cmLiteralNCompare function
a08248b cmStandardIncludes: Add new cmLiteralNCompare function.
b7cecfc CMake Nightly Date Stamp
diff --cc Source/cmTarget.cxx
index 6533404,dda9f51..083a784
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -2418,10 -2276,10 +2418,10 @@@ static void cmTargetCheckINTERFACE_LINK
}
//
-void cmTarget::CheckProperty(const char* prop, cmMakefile* context)
+void cmTarget::CheckProperty(const char* prop, cmMakefile* context) const
{
// Certain properties need checking.
- if(strncmp(prop, LINK_INTERFACE_LIBRARIES, 24) == 0)
+ if(cmLiteralNCompare(prop, LINK_INTERFACE_LIBRARIES) == 0)
{
if(const char* value = this-GetProperty(prop))
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bedeade06b55f475c1c028c1f72c10244302c6fa
commit bedeade06b55f475c1c028c1f72c10244302c6fa
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 02:12:00 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Nov 20 12:41:48 2013 +0100
Use new cmLiteralNCompare function
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 39eeb70..85d7c2b 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -763,7 +763,7 @@ void
cmCTestBuildHandler::GenerateXMLLaunchedFragment(std::ostream os,
bool cmCTestBuildHandler::IsLaunchedErrorFile(const char* fname)
{
// error-{hash}.xml
- return (strncmp(fname, error-, 6) == 0
+ return (cmLiteralNCompare(fname, error-) == 0
strcmp(fname+strlen(fname)-4, .xml) == 0);
}
@@ -771,7 +771,7 @@ bool cmCTestBuildHandler::IsLaunchedErrorFile(const char*
fname)
bool cmCTestBuildHandler::IsLaunchedWarningFile(const char* fname)
{
// warning-{hash}.xml
- return (strncmp(fname, warning-, 8) == 0
+ return (cmLiteralNCompare(fname, warning-) == 0
strcmp(fname+strlen(fname)-4, .xml) == 0);
}
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 5b34491..4fe40d3 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -536,11 +536,11 @@ private:
void DoHeaderLine()
{
// Look for header fields that we need.
-if(strncmp(this-Line.c_str(), commit , 7) == 0)
+if(cmLiteralNCompare(this-Line.c_str(), commit ) == 0)
{
this-Rev.Rev = this-Line.c_str()+7;
}
-else if(strncmp(this-Line.c_str(), author , 7) == 0)
+else if(cmLiteralNCompare(this-Line.c_str(), author ) == 0)
{
Person author;
this-ParsePerson(this-Line.c_str()+7, author);
@@ -548,7 +548,7 @@ private:
this-Rev.EMail = author.EMail;
this-Rev.Date = this-FormatDateTime(author);
}
-else if(strncmp(this-Line.c_str(), committer , 10) == 0)
+else if(cmLiteralNCompare(this-Line.c_str(), committer ) == 0)
{
Person committer;
this-ParsePerson(this-Line.c_str()+10, committer);
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index bfabc9f..6c77b9f 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1131,11 +1131,11 @@ int cmCTest::GetTestModelFromString(const char* str)
return cmCTest::EXPERIMENTAL;
}
std::string rstr = cmSystemTools::LowerCase(str);
- if ( strncmp(rstr.c_str(), cont, 4) == 0 )
+ if ( cmLiteralNCompare(rstr.c_str(), cont) == 0 )
{
return cmCTest::CONTINUOUS;
}
- if ( strncmp(rstr.c_str(), nigh, 4) == 0 )
+ if ( cmLiteralNCompare(rstr.c_str(), nigh) == 0 )
{
return cmCTest::NIGHTLY;
}
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index fdc075e..fa54077 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -240,7 +240,7 @@
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5494-g7528481
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 75284810e82b79feb44d6c59fcb84b0ca4633ba1 (commit) via 623f41084149f9d92826fbcf2454fdcd894f5bd9 (commit) via 6fc4ab9b28054a0d2f6c5fc63ddd860eeed1ac64 (commit) from 5d524003ea7ee45e7391528cbbb4a7aac7836c20 (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=75284810e82b79feb44d6c59fcb84b0ca4633ba1 commit 75284810e82b79feb44d6c59fcb84b0ca4633ba1 Merge: 5d52400 623f410 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Nov 20 08:41:35 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Nov 20 08:41:35 2013 -0500 Merge topic 'cmake-credits' into next 623f410 Credit the Qt Project as licenced under LGPLv2.1 for cmake-gui 6fc4ab9 Credit Kitware and csimsoft for their maintenance roles http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=623f41084149f9d92826fbcf2454fdcd894f5bd9 commit 623f41084149f9d92826fbcf2454fdcd894f5bd9 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 19 16:40:22 2013 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 19 18:13:38 2013 -0500 Credit the Qt Project as licenced under LGPLv2.1 for cmake-gui Extract LICENSE.LGPL from https://git.gitorious.org/qt/qt5.git commit ecd64f62 (Add license files mandated by (L)GPL, 2013-05-29). Remove trailing whitespace and blank lines from the end of the file. Place it as Licenses/Qt/LICENSE.LGPL within our source tree. When the cmake-gui is built, install the license file under CMAKE_ROOT. Teach cmake-gui to display the Qt copyright and the path to the licence file in its About dialog. diff --git a/Licenses/Qt/LICENSE.LGPL b/Licenses/Qt/LICENSE.LGPL new file mode 100644 index 000..e7a9e59 --- /dev/null +++ b/Licenses/Qt/LICENSE.LGPL @@ -0,0 +1,512 @@ + GNU LESSER GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal + + You may use, distribute and copy the Qt GUI Toolkit under the terms of + GNU Lesser General Public License version 2.1, which is displayed below. + +- + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after
[Cmake-commits] CMake branch, master, updated. v2.8.12.1-711-g5f4e31c
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 5f4e31ce3b28c4a884b4ff5f7e8216fa6b257204 (commit) via 07674740704c59d587c977d37bd0b9e517a58dd4 (commit) from b7cecfcb21c60a3e9a989dabdd411c306e7b9e51 (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=5f4e31ce3b28c4a884b4ff5f7e8216fa6b257204 commit 5f4e31ce3b28c4a884b4ff5f7e8216fa6b257204 Merge: b7cecfc 0767474 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Nov 20 09:07:31 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Nov 20 09:07:31 2013 -0500 Merge topic 'FindLATEX-ps2pdf' 0767474 FindLATEX: Find ps2pdf with MikTeX. --- Summary of changes: Modules/FindLATEX.cmake |3 ++- 1 files changed, 2 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.1-713-ga20fd85
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 a20fd85519bc866717cadb8bcfb585fd1243e39c (commit) via bf1db4963fe9b71a2a4bd7232604ccea730ef4d2 (commit) from 5f4e31ce3b28c4a884b4ff5f7e8216fa6b257204 (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=a20fd85519bc866717cadb8bcfb585fd1243e39c commit a20fd85519bc866717cadb8bcfb585fd1243e39c Merge: 5f4e31c bf1db49 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Nov 20 09:07:52 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Nov 20 09:07:52 2013 -0500 Merge topic 'vs9-map-Fd' bf1db49 VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577) --- Summary of changes: Source/cmLocalVisualStudio7Generator.cxx |2 ++ 1 files changed, 2 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, master, updated. v2.8.12.1-722-g7df3a10
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 7df3a10a5e414960633f401151d6042b64375c3a (commit) via a990722b5a8fc15058e7024ec54885ec24ed4bbf (commit) via 51726cce64ee8bce1115f3c6d092b4ae6f43d714 (commit) via 4a352d43bbe3c8726046683e7dbc89a55b5e1c67 (commit) from 483b7e709396122c2e235972902a65e34878ae2a (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=7df3a10a5e414960633f401151d6042b64375c3a commit 7df3a10a5e414960633f401151d6042b64375c3a Merge: 483b7e7 a990722 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Nov 20 09:08:34 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Nov 20 09:08:34 2013 -0500 Merge topic 'dev/better-eclipse-language-support' a990722 eclipse: Support custom natures via a global property 51726cc eclipse: Add natures for Eclipse based on enabled languages 4a352d4 Notify extra generators about languages --- Summary of changes: Help/manual/cmake-properties.7.rst|1 + Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst |8 Source/cmExternalMakefileProjectGenerator.cxx |6 +++ Source/cmExternalMakefileProjectGenerator.h |2 + Source/cmExtraEclipseCDT4Generator.cxx| 50 ++--- Source/cmExtraEclipseCDT4Generator.h |3 + Source/cmGlobalGenerator.cxx |5 ++ 7 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst 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.1-5507-g9b73875
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 9b738751915c7e085ea54591a4573c81add38c09 (commit)
via 648cc28d5b57ca1879830f2f13f882dffe0f8d66 (commit)
from c4a07ded25bc750562815c859f55ab7cd78feec9 (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=9b738751915c7e085ea54591a4573c81add38c09
commit 9b738751915c7e085ea54591a4573c81add38c09
Merge: c4a07de 648cc28
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Wed Nov 20 10:44:25 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 10:44:25 2013 -0500
Merge topic 'missing-target-error' into next
648cc28 CustomCommand: error on custom command being added to non-existent
target
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=648cc28d5b57ca1879830f2f13f882dffe0f8d66
commit 648cc28d5b57ca1879830f2f13f882dffe0f8d66
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Wed Nov 20 09:53:06 2013 +0100
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Wed Nov 20 16:35:47 2013 +0100
CustomCommand: error on custom command being added to non-existent target
diff --git a/Help/policy/CMP0040.rst b/Help/policy/CMP0040.rst
new file mode 100644
index 000..99b54ff
--- /dev/null
+++ b/Help/policy/CMP0040.rst
@@ -0,0 +1,16 @@
+CMP0040
+---
+
+The target in the TARGET signature of add_custom_command() must exist.
+
+CMake 2.8.12 and lower silently ignored a custom command created with
+the TARGET signature of :command:`add_custom_command`
+if the target is unknown.
+
+The OLD behavior for this policy is to ignore custom commands
+for unknown targets. The NEW behavior for this policy is to report and error
+if the target referenced in :command:`add_custom_command` is unknown.
+
+This policy was introduced in CMake version 3.0.0. CMake version
+|release| warns when the policy is not set and uses OLD behavior. Use
+the cmake_policy command to set it to OLD or NEW explicitly.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6be1fdd..e073f76 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -884,34 +884,61 @@ cmMakefile::AddCustomCommandToTarget(const char* target,
{
// Find the target to which to add the custom command.
cmTargets::iterator ti = this-Targets.find(target);
- if(ti != this-Targets.end())
+
+ if(ti == this-Targets.end())
{
-if(ti-second.GetType() == cmTarget::OBJECT_LIBRARY)
+cmake::MessageType messageType = cmake::AUTHOR_WARNING;
+bool issueMessage = false;
+switch(this-GetPolicyStatus(cmPolicies::CMP0040))
{
- cmOStringStream e;
- e Target \ target \ is an OBJECT library
-that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands.;
- this-IssueMessage(cmake::FATAL_ERROR, e.str());
- return;
+ case cmPolicies::WARN:
+issueMessage = true;
+ case cmPolicies::OLD:
+break;
+ case cmPolicies::NEW:
+ case cmPolicies::REQUIRED_IF_USED:
+ case cmPolicies::REQUIRED_ALWAYS:
+issueMessage = true;
+messageType = cmake::FATAL_ERROR;
}
-// Add the command to the appropriate build step for the target.
-std::vectorstd::string no_output;
-cmCustomCommand cc(this, no_output, depends,
- commandLines, comment, workingDir);
-cc.SetEscapeOldStyle(escapeOldStyle);
-cc.SetEscapeAllowMakeVars(true);
-switch(type)
+
+if(issueMessage)
{
- case cmTarget::PRE_BUILD:
-ti-second.AddPreBuildCommand(cc);
-break;
- case cmTarget::PRE_LINK:
-ti-second.AddPreLinkCommand(cc);
-break;
- case cmTarget::POST_BUILD:
-ti-second.AddPostBuildCommand(cc);
-break;
+ cmOStringStream e;
+ e (this-GetPolicies()
+-GetPolicyWarning(cmPolicies::CMP0040)) \n;
+ e The target name \ target \ is unknown in this context.;
+ IssueMessage(messageType, e.str().c_str());
}
+
+ return;
+}
+
+ if(ti-second.GetType() == cmTarget::OBJECT_LIBRARY)
+{
+cmOStringStream e;
+e Target \ target \ is an OBJECT library
+ that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands.;
+this-IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
+}
+ // Add the command to the appropriate build step for the target.
+ std::vectorstd::string no_output;
+ cmCustomCommand cc(this, no_output, depends,
+ commandLines, comment, workingDir);
+ cc.SetEscapeOldStyle(escapeOldStyle);
+ cc.SetEscapeAllowMakeVars(true);
+ switch(type)
+{
+case cmTarget::PRE_BUILD:
+
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5509-geac613f
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 eac613f02cf842245cc1833863b173ca88e5ddc3 (commit) via 1887a4c622addb1bd5bee0f0b6b6d1a116a5d40d (commit) from 9b738751915c7e085ea54591a4573c81add38c09 (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=eac613f02cf842245cc1833863b173ca88e5ddc3 commit eac613f02cf842245cc1833863b173ca88e5ddc3 Merge: 9b73875 1887a4c Author: Nils Gladitz nilsglad...@gmail.com AuthorDate: Wed Nov 20 10:52:31 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Nov 20 10:52:31 2013 -0500 Merge topic 'missing-target-error' into next 1887a4c Policy: added CMP0040 to toctree http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1887a4c622addb1bd5bee0f0b6b6d1a116a5d40d commit 1887a4c622addb1bd5bee0f0b6b6d1a116a5d40d Author: Nils Gladitz nilsglad...@gmail.com AuthorDate: Wed Nov 20 16:52:01 2013 +0100 Commit: Nils Gladitz nilsglad...@gmail.com CommitDate: Wed Nov 20 16:52:01 2013 +0100 Policy: added CMP0040 to toctree diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 2430ee9..e954a86 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -73,3 +73,4 @@ All Policies /policy/CMP0037 /policy/CMP0038 /policy/CMP0039 + /policy/CMP0040 --- Summary of changes: Help/manual/cmake-policies.7.rst |1 + 1 files changed, 1 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.1-5511-ga5b7212
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 a5b7212ae40e1abe397a2e95a3f12b4a14410ea7 (commit)
via 940229c9192de8d4213c8ed17cdc4ba267e596e6 (commit)
from eac613f02cf842245cc1833863b173ca88e5ddc3 (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=a5b7212ae40e1abe397a2e95a3f12b4a14410ea7
commit a5b7212ae40e1abe397a2e95a3f12b4a14410ea7
Merge: eac613f 940229c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 10:59:29 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 10:59:29 2013 -0500
Merge topic 'use-generator-target' into next
940229c Order cmGeneratorTargets deterministically.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=940229c9192de8d4213c8ed17cdc4ba267e596e6
commit 940229c9192de8d4213c8ed17cdc4ba267e596e6
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 16:58:01 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Nov 20 16:58:01 2013 +0100
Order cmGeneratorTargets deterministically.
Use a string as the key in a map, instead of a cmTarget*.
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx
b/Source/cmExtraEclipseCDT4Generator.cxx
index 676d4ed..2fd77d4 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -914,7 +914,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
for (cmGeneratorTargetsType::iterator l = targets.begin();
l != targets.end(); ++l)
{
- if (l-first-IsImported())
+ if (l-second-Target-IsImported())
{
continue;
}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 177bc25..5ed3213 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -100,6 +100,6 @@ private:
void operator=(cmGeneratorTarget const);
};
-typedef std::mapcmTarget*, cmGeneratorTarget* cmGeneratorTargetsType;
+typedef std::mapstd::string, cmGeneratorTarget* cmGeneratorTargetsType;
#endif
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 65a7118..bc4ab52 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1341,8 +1341,8 @@ void cmGlobalGenerator::CreateGeneratorTargets()
{
cmTarget* t = ti-second;
cmGeneratorTarget* gt = new cmGeneratorTarget(t);
- this-GeneratorTargets[t] = gt;
- generatorTargets[t] = gt;
+ this-GeneratorTargets[t-GetName()] = gt;
+ generatorTargets[t-GetName()] = gt;
}
for(std::vectorcmTarget*::const_iterator
@@ -1350,8 +1350,8 @@ void cmGlobalGenerator::CreateGeneratorTargets()
j != mf-GetOwnedImportedTargets().end(); ++j)
{
cmGeneratorTarget* gt = new cmGeneratorTarget(*j);
- this-GeneratorTargets[*j] = gt;
- generatorTargets[*j] = gt;
+ this-GeneratorTargets[(*j)-GetName()] = gt;
+ generatorTargets[(*j)-GetName()] = gt;
}
mf-SetGeneratorTargets(generatorTargets);
@@ -1424,7 +1424,8 @@ void cmGlobalGenerator::ClearGeneratorMembers()
//
cmGeneratorTarget* cmGlobalGenerator::GetGeneratorTarget(cmTarget* t) const
{
- cmGeneratorTargetsType::const_iterator ti = this-GeneratorTargets.find(t);
+ cmGeneratorTargetsType::const_iterator ti =
+this-GeneratorTargets.find(t-GetName());
if(ti == this-GeneratorTargets.end())
{
this-CMakeInstance-IssueMessage(
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index cac4eef..6333873 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -820,7 +820,7 @@ cmGlobalUnixMakefileGenerator3
commands.push_back(progCmd.str());
}
progressDir = Built target ;
-progressDir += t-first-GetName();
+progressDir += t-second-GetName();
lg-AppendEcho(commands,progressDir.c_str());
}
else
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 63ec576..3871cad 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -744,7 +744,7 @@ void cmLocalGenerator
for(cmGeneratorTargetsType::iterator l = tgts.begin();
l != tgts.end(); l++)
{
-if (l-first-IsImported())
+if (l-second-Target-IsImported())
{
continue;
}
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 7d7cf0b..158d714 100644
---
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5513-gdadc524
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 dadc524debfc785f4ebc96ac9bee338fcaf6bbda (commit)
via 2cd559789b1315d85ae1221941b5a4359e36d552 (commit)
from a5b7212ae40e1abe397a2e95a3f12b4a14410ea7 (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=dadc524debfc785f4ebc96ac9bee338fcaf6bbda
commit dadc524debfc785f4ebc96ac9bee338fcaf6bbda
Merge: a5b7212 2cd5597
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Nov 20 11:02:09 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 11:02:09 2013 -0500
Merge topic 'FindwxWidgets-3.0.0' into next
2cd5597 FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cd559789b1315d85ae1221941b5a4359e36d552
commit 2cd559789b1315d85ae1221941b5a4359e36d552
Author: Arnaud Desmier arnaud.desm...@free.fr
AuthorDate: Wed Nov 20 16:43:24 2013 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Nov 20 10:51:55 2013 -0500
FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)
Add the wxWidgets-3.0.0 path suffix and the 30 library names.
While at it, add the wxWidgets-2.9.5 suffix too.
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 4ecab62..3c664e7 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -303,6 +303,7 @@ if(wxWidgets_FIND_STYLE STREQUAL win32)
# Find wxWidgets multilib base libraries.
find_library(WX_base${_DBG}
NAMES
+ wxbase30${_UCD}${_DBG}
wxbase29${_UCD}${_DBG}
wxbase28${_UCD}${_DBG}
wxbase27${_UCD}${_DBG}
@@ -315,6 +316,7 @@ if(wxWidgets_FIND_STYLE STREQUAL win32)
foreach(LIB net odbc xml)
find_library(WX_${LIB}${_DBG}
NAMES
+wxbase30${_UCD}${_DBG}_${LIB}
wxbase29${_UCD}${_DBG}_${LIB}
wxbase28${_UCD}${_DBG}_${LIB}
wxbase27${_UCD}${_DBG}_${LIB}
@@ -329,6 +331,7 @@ if(wxWidgets_FIND_STYLE STREQUAL win32)
# Find wxWidgets monolithic library.
find_library(WX_mono${_DBG}
NAMES
+ wxmsw${_UNV}30${_UCD}${_DBG}
wxmsw${_UNV}29${_UCD}${_DBG}
wxmsw${_UNV}28${_UCD}${_DBG}
wxmsw${_UNV}27${_UCD}${_DBG}
@@ -344,6 +347,7 @@ if(wxWidgets_FIND_STYLE STREQUAL win32)
stc ribbon propgrid webview)
find_library(WX_${LIB}${_DBG}
NAMES
+wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
@@ -457,6 +461,8 @@ if(wxWidgets_FIND_STYLE STREQUAL win32)
D:/
ENV ProgramFiles
PATH_SUFFIXES
+ wxWidgets-3.0.0
+ wxWidgets-2.9.5
wxWidgets-2.9.4
wxWidgets-2.9.3
wxWidgets-2.9.2
---
Summary of changes:
Modules/FindwxWidgets.cmake |6 ++
1 files changed, 6 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.1-5516-g534ca7e
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 534ca7e23e05b341d5695546bf0f11a89e4440e1 (commit)
via e0253f7016ec0ccd94be952ec812a18a616dec0e (commit)
via 26ed7d047620dc9b6acadf3e5ac82fe123aa86a3 (commit)
from dadc524debfc785f4ebc96ac9bee338fcaf6bbda (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=534ca7e23e05b341d5695546bf0f11a89e4440e1
commit 534ca7e23e05b341d5695546bf0f11a89e4440e1
Merge: dadc524 e0253f7
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 11:09:34 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 11:09:34 2013 -0500
Merge topic 'add-cmLiteralNCompare' into next
e0253f7 Rename interface.
26ed7d0 Use macro literal compare on Borland.
diff --cc Source/cmTarget.cxx
index 083a784,4fa0e75..2ef1790
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -2418,10 -2276,10 +2418,10 @@@ static void cmTargetCheckINTERFACE_LINK
}
//
-void cmTarget::CheckProperty(const char* prop, cmMakefile* context)
+void cmTarget::CheckProperty(const char* prop, cmMakefile* context) const
{
// Certain properties need checking.
- if(cmLiteralNCompare(prop, LINK_INTERFACE_LIBRARIES) == 0)
+ if(cmHasLiteralPrefix(prop, LINK_INTERFACE_LIBRARIES) == 0)
{
if(const char* value = this-GetProperty(prop))
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0253f7016ec0ccd94be952ec812a18a616dec0e
commit e0253f7016ec0ccd94be952ec812a18a616dec0e
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 17:07:11 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Nov 20 17:08:54 2013 +0100
Rename interface.
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 85d7c2b..f0c8f06 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -763,7 +763,7 @@ void
cmCTestBuildHandler::GenerateXMLLaunchedFragment(std::ostream os,
bool cmCTestBuildHandler::IsLaunchedErrorFile(const char* fname)
{
// error-{hash}.xml
- return (cmLiteralNCompare(fname, error-) == 0
+ return (cmHasLiteralPrefix(fname, error-) == 0
strcmp(fname+strlen(fname)-4, .xml) == 0);
}
@@ -771,7 +771,7 @@ bool cmCTestBuildHandler::IsLaunchedErrorFile(const char*
fname)
bool cmCTestBuildHandler::IsLaunchedWarningFile(const char* fname)
{
// warning-{hash}.xml
- return (cmLiteralNCompare(fname, warning-) == 0
+ return (cmHasLiteralPrefix(fname, warning-) == 0
strcmp(fname+strlen(fname)-4, .xml) == 0);
}
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 4fe40d3..60fcc13 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -536,11 +536,11 @@ private:
void DoHeaderLine()
{
// Look for header fields that we need.
-if(cmLiteralNCompare(this-Line.c_str(), commit ) == 0)
+if(cmHasLiteralPrefix(this-Line.c_str(), commit ) == 0)
{
this-Rev.Rev = this-Line.c_str()+7;
}
-else if(cmLiteralNCompare(this-Line.c_str(), author ) == 0)
+else if(cmHasLiteralPrefix(this-Line.c_str(), author ) == 0)
{
Person author;
this-ParsePerson(this-Line.c_str()+7, author);
@@ -548,7 +548,7 @@ private:
this-Rev.EMail = author.EMail;
this-Rev.Date = this-FormatDateTime(author);
}
-else if(cmLiteralNCompare(this-Line.c_str(), committer ) == 0)
+else if(cmHasLiteralPrefix(this-Line.c_str(), committer ) == 0)
{
Person committer;
this-ParsePerson(this-Line.c_str()+10, committer);
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 6c77b9f..3ada064 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1131,11 +1131,11 @@ int cmCTest::GetTestModelFromString(const char* str)
return cmCTest::EXPERIMENTAL;
}
std::string rstr = cmSystemTools::LowerCase(str);
- if ( cmLiteralNCompare(rstr.c_str(), cont) == 0 )
+ if ( cmHasLiteralPrefix(rstr.c_str(), cont) == 0 )
{
return cmCTest::CONTINUOUS;
}
- if ( cmLiteralNCompare(rstr.c_str(), nigh) == 0 )
+ if ( cmHasLiteralPrefix(rstr.c_str(), nigh) == 0 )
{
return cmCTest::NIGHTLY;
}
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index fa54077..46ded1c 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -240,7 +240,7 @@ static bool checkInterfaceDirs(const std::string prepro,
{
continue;
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5518-gad057a1
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 ad057a104e2340e50cb08b95e8afbb92592bd112 (commit)
via c6f339ceb84876a865ae96cf3db4c1ff856c65be (commit)
from 534ca7e23e05b341d5695546bf0f11a89e4440e1 (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=ad057a104e2340e50cb08b95e8afbb92592bd112
commit ad057a104e2340e50cb08b95e8afbb92592bd112
Merge: 534ca7e c6f339c
Author: Vadim Zhukov persg...@gmail.com
AuthorDate: Wed Nov 20 16:01:27 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 16:01:27 2013 -0500
Merge topic 'find_backtrace' into next
c6f339c Add FindBacktrace.cmake module.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6f339ceb84876a865ae96cf3db4c1ff856c65be
commit c6f339ceb84876a865ae96cf3db4c1ff856c65be
Author: Vadim Zhukov persg...@gmail.com
AuthorDate: Sun Jul 28 14:31:30 2013 +0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Oct 16 10:53:01 2013 -0400
Add FindBacktrace.cmake module.
It designed to search for implementation of backtrace(3) routine.
Currently it is used in OpenBSD Ports for building Clementine
music player.
A lot of input from brad.king@ and neundorf@.
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index da518d3..9235b8c 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -70,6 +70,7 @@ All Modules
/module/FindAVIFile
/module/FindBISON
/module/FindBLAS
+ /module/FindBacktrace
/module/FindBoost
/module/FindBullet
/module/FindBZip2
diff --git a/Help/module/FindBacktrace.rst b/Help/module/FindBacktrace.rst
new file mode 100644
index 000..e1ca48c
--- /dev/null
+++ b/Help/module/FindBacktrace.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/FindBacktrace.cmake
diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake
new file mode 100644
index 000..56e739e
--- /dev/null
+++ b/Modules/FindBacktrace.cmake
@@ -0,0 +1,91 @@
+#.rst:
+# FindBacktrace
+# -
+#
+# Find provider for backtrace(3).
+#
+# Checks if OS supports backtrace(3) via either libc or custom library.
+# This module defines the following variables::
+#
+# Backtrace_HEADER - The header file needed for backtrace(3). Cached.
+# Could be forcibly set by user.
+# Backtrace_INCLUDE_DIRS - The include directories needed to use backtrace(3)
header.
+# Backtrace_LIBRARIES- The libraries (linker flags) needed to use
backtrace(3), if any.
+# Backtrace_FOUND- Is set if and only if backtrace(3) support
detected.
+#
+# The following cache variables are also available to set or use::
+#
+# Backtrace_LIBRARY - The external library providing backtrace, if any.
+# Backtrace_INCLUDE_DIR - The directory holding the backtrace(3) header.
+#
+# Typical usage is to generate of header file using configure_file() with the
+# contents like the following::
+#
+# #cmakedefine01 Backtrace_FOUND
+# #if Backtrace_FOUND
+# # include ${Backtrace_HEADER}
+# #endif
+#
+# And then reference that generated header file in actual source.
+
+#=
+# Copyright 2013 Vadim Zhukov
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+
+include(CMakePushCheckState)
+include(CheckSymbolExists)
+include(FindPackageHandleStandardArgs)
+
+# List of variables to be provided to find_package_handle_standard_args()
+set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR)
+
+if(Backtrace_HEADER)
+ set(_Backtrace_HEADER_TRY ${Backtrace_HEADER})
+else(Backtrace_HEADER)
+ set(_Backtrace_HEADER_TRY execinfo.h)
+endif(Backtrace_HEADER)
+
+find_path(Backtrace_INCLUDE_DIR ${_Backtrace_HEADER_TRY})
+set(Backtrace_INCLUDE_DIRS ${Backtrace_INCLUDE_DIR})
+
+# First, check if we already have backtrace(), e.g., in libc
+cmake_push_check_state(RESET)
+set(CMAKE_REQUIRED_INCLUDES ${Backtrace_INCLUDE_DIRS})
+check_symbol_exists(backtrace ${_Backtrace_HEADER_TRY}
_Backtrace_SYM_FOUND)
+cmake_pop_check_state()
+
+if(_Backtrace_SYM_FOUND)
+ set(Backtrace_LIBRARY)
+ if(NOT
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5525-g5571e74
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 5571e74c4e0756ca8b6639d3c1f88da881e45e1d (commit)
via d9c87ca822e78ccea41c004e62d39d387baf0790 (commit)
via c1ad8478b9b2f3e7b0da2a90748d251dca07c231 (commit)
via 8451e4d91310cefeec706b7f82d5ea1fec26c24b (commit)
from 0551e9f7e9cbf53542c15b02a25643cb9d94c3e6 (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=5571e74c4e0756ca8b6639d3c1f88da881e45e1d
commit 5571e74c4e0756ca8b6639d3c1f88da881e45e1d
Merge: 0551e9f d9c87ca
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 18:17:08 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 18:17:08 2013 -0500
Merge topic 'use-generator-target' into next
d9c87ca Port some of the generator API to cmGeneratorTarget.
c1ad847 Add a null check to the generator target accessor.
8451e4d Order cmGeneratorTargets deterministically.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9c87ca822e78ccea41c004e62d39d387baf0790
commit d9c87ca822e78ccea41c004e62d39d387baf0790
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 10 21:32:37 2012 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Nov 21 00:16:16 2013 +0100
Port some of the generator API to cmGeneratorTarget.
Just enough to reach the BuildMacContentDirectory method and the
NeedRelinkBeforeInstall methods.
In the future, those methods can be moved to cmGeneratorTarget.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index e1af2f9..6333873 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -471,23 +471,29 @@ cmGlobalUnixMakefileGenerator3
// The directory-level rule should depend on the target-level rules
// for all targets in the directory.
std::vectorstd::string depends;
- for(cmTargets::iterator l = lg-GetMakefile()-GetTargets().begin();
- l != lg-GetMakefile()-GetTargets().end(); ++l)
+ cmGeneratorTargetsType targets = lg-GetMakefile()-GetGeneratorTargets();
+ for(cmGeneratorTargetsType::iterator l = targets.begin();
+ l != targets.end(); ++l)
{
-if((l-second.GetType() == cmTarget::EXECUTABLE) ||
- (l-second.GetType() == cmTarget::STATIC_LIBRARY) ||
- (l-second.GetType() == cmTarget::SHARED_LIBRARY) ||
- (l-second.GetType() == cmTarget::MODULE_LIBRARY) ||
- (l-second.GetType() == cmTarget::OBJECT_LIBRARY) ||
- (l-second.GetType() == cmTarget::INTERFACE_LIBRARY) ||
- (l-second.GetType() == cmTarget::UTILITY))
+if((l-second-GetType() == cmTarget::EXECUTABLE) ||
+ (l-second-GetType() == cmTarget::STATIC_LIBRARY) ||
+ (l-second-GetType() == cmTarget::SHARED_LIBRARY) ||
+ (l-second-GetType() == cmTarget::MODULE_LIBRARY) ||
+ (l-second-GetType() == cmTarget::OBJECT_LIBRARY) ||
+ (l-second-GetType() == cmTarget::INTERFACE_LIBRARY) ||
+ (l-second-GetType() == cmTarget::UTILITY))
{
+ if(l-second-Target-IsImported())
+{
+continue;
+}
// Add this to the list of depends rules in this directory.
- if((!check_all || !l-second.GetPropertyAsBool(EXCLUDE_FROM_ALL))
+ if((!check_all || !l-second-GetPropertyAsBool(EXCLUDE_FROM_ALL))
(!check_relink ||
- l-second.NeedRelinkBeforeInstall(lg-ConfigurationName.c_str(
+ l-second-Target
+ -NeedRelinkBeforeInstall(lg-ConfigurationName.c_str(
{
-std::string tname = lg-GetRelativeTargetDirectory(l-second);
+std::string tname = lg-GetRelativeTargetDirectory(*l-second-Target);
tname += /;
tname += pass;
depends.push_back(tname);
@@ -632,49 +638,55 @@ cmGlobalUnixMakefileGenerator3
lg = static_castcmLocalUnixMakefileGenerator3 *
(this-LocalGenerators[i]);
// for each target Generate the rule files for each target.
-cmTargets targets = lg-GetMakefile()-GetTargets();
-for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
+cmGeneratorTargetsType targets = lg-GetMakefile()-GetGeneratorTargets();
+for(cmGeneratorTargetsType::iterator t = targets.begin();
+t != targets.end(); ++t)
{
+ if(t-second-Target-IsImported())
+{
+continue;
+}
// Don't emit the same rule twice (e.g. two targets with the same
// simple name)
- if(t-second.GetName()
- strlen(t-second.GetName())
- emitted.insert(t-second.GetName()).second
+
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5528-gf8ef84c
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 f8ef84cc33e751f75326d789694734dd4d79b42d (commit)
via fab732b09b769e3fe5c8ecc05d605d2fde4dd0db (commit)
via 1cb01ac80c9b60a111e0ac6090e8398382ef672f (commit)
from 5571e74c4e0756ca8b6639d3c1f88da881e45e1d (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=f8ef84cc33e751f75326d789694734dd4d79b42d
commit f8ef84cc33e751f75326d789694734dd4d79b42d
Merge: 5571e74 fab732b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 18:18:37 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 18:18:37 2013 -0500
Merge topic 'target_compile_features' into next
fab732b Don't run the CxxDialect test if CMP0025 is not set on APPLE.
1cb01ac Make the error output more-easy for the regex engine to handle.
diff --cc Tests/CMakeLists.txt
index ab17902,223da03..6220ca7
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@@ -269,12 -269,18 +269,19 @@@ if(BUILD_TESTING
ADD_TEST_MACRO(CompileOptions CompileOptions)
ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
ADD_TEST_MACRO(AliasTarget AliasTarget)
+ ADD_TEST_MACRO(StagingPrefix StagingPrefix)
ADD_TEST_MACRO(InterfaceLibrary InterfaceLibrary)
- if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
- AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
- OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
+ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU
+ AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+ set(runCxxDialectTest 1)
+ endif()
+ if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9))
+ if(NOT APPLE OR POLICY CMP0025)
+ set(runCxxDialectTest 1)
+ endif()
+ endif()
+ if(runCxxDialectTest)
ADD_TEST_MACRO(CxxDialect CxxDialect)
endif()
set_tests_properties(EmptyLibrary PROPERTIES
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fab732b09b769e3fe5c8ecc05d605d2fde4dd0db
commit fab732b09b769e3fe5c8ecc05d605d2fde4dd0db
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 16:37:16 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Nov 20 16:37:16 2013 +0100
Don't run the CxxDialect test if CMP0025 is not set on APPLE.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3ac7c8a..223da03 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -270,10 +270,17 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
ADD_TEST_MACRO(AliasTarget AliasTarget)
ADD_TEST_MACRO(InterfaceLibrary InterfaceLibrary)
- if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
-AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
- OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
+ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU
+ AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+set(runCxxDialectTest 1)
+ endif()
+ if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9))
+if(NOT APPLE OR POLICY CMP0025)
+ set(runCxxDialectTest 1)
+endif()
+ endif()
+ if(runCxxDialectTest)
ADD_TEST_MACRO(CxxDialect CxxDialect)
endif()
set_tests_properties(EmptyLibrary PROPERTIES
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cb01ac80c9b60a111e0ac6090e8398382ef672f
commit 1cb01ac80c9b60a111e0ac6090e8398382ef672f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 20 16:32:58 2013 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Nov 20 16:32:58 2013 +0100
Make the error output more-easy for the regex engine to handle.
Apparently it can not handle lines ending in .
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0de7b66..17ce8ee 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4484,8 +4484,8 @@ AddRequiredTargetFeature(cmTarget *target, const char
*feature) const
{
cmOStringStream e;
e The compiler feature \ feature
- \ is not known to compiler \
- this-GetDefinition(CMAKE_CXX_COMPILER_ID) \ version
+ \ is not known to compiler\n\
+ this-GetDefinition(CMAKE_CXX_COMPILER_ID) \\nversion
this-GetDefinition(CMAKE_CXX_COMPILER_VERSION) .;
this-IssueMessage(cmake::FATAL_ERROR, e.str().c_str());
return false;
diff --git
a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt
b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt
index 4df6ee4..a8f60c7 100644
--- a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt
+++
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5557-g84d9e6d
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 84d9e6d72183560c036523e7fda33afb2acb3de8 (commit) via ee18a74fc6e0046ce1c15b5bce0a628cace1be55 (commit) via 640d3e4d3bc8546d0b78dd746506dc78d93d78dc (commit) via 8abfe8909c878d6552304603b1d50808e002498b (commit) via 90e98fc42b682b7a16fa765c7f9151a915e89501 (commit) from a42d4495ef5deb15f409f3b8fcc411c790fdb8a6 (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=84d9e6d72183560c036523e7fda33afb2acb3de8 commit 84d9e6d72183560c036523e7fda33afb2acb3de8 Merge: a42d449 ee18a74 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Nov 20 18:40:48 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Nov 20 18:40:48 2013 -0500 Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next ee18a74 QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property. 640d3e4 QtAutoUic: Handle new -include command line parameter. 8abfe89 Genex: Add LOWER_CASE and MAKE_C_IDENTIFIER string manipulators. 90e98fc Help: Reformat the generator expression documentation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee18a74fc6e0046ce1c15b5bce0a628cace1be55 commit ee18a74fc6e0046ce1c15b5bce0a628cace1be55 Author: Stephen Kelly steve...@gmail.com AuthorDate: Wed Nov 20 14:54:39 2013 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu Nov 21 00:38:41 2013 +0100 QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property. Transitively consume the property from linked dependents. Implement configuration-specific support by following the pattern set out for compile definitions and includes in cmQtAutoGenerators. Implement support for origin-tracking with CMAKE_DEBUG_TARGET_PROPERTIES. This is motivated by the needs of KDE, which provides a separate translation system based on gettext instead of the Qt linguist translation system. The Qt uic tool provides command line options for configuring the method used to translate text, and to add an include directive to the generated file to provide the method. http://thread.gmane.org/gmane.comp.kde.devel.frameworks/7930/focus=7992 Implement the interface to provide the uic options as a usage-requirement on the KI18n target, as designed for KDE. diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index e3a4cf8..7caf73d 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -141,6 +141,7 @@ Properties on Targets /prop_tgt/INSTALL_NAME_DIR /prop_tgt/INSTALL_RPATH /prop_tgt/INSTALL_RPATH_USE_LINK_PATH + /prop_tgt/INTERFACE_AUTOUIC_OPTIONS /prop_tgt/INTERFACE_COMPILE_DEFINITIONS /prop_tgt/INTERFACE_COMPILE_OPTIONS /prop_tgt/INTERFACE_INCLUDE_DIRECTORIES diff --git a/Help/prop_tgt/AUTOUIC_OPTIONS.rst b/Help/prop_tgt/AUTOUIC_OPTIONS.rst index c6cf885..aeec38b 100644 --- a/Help/prop_tgt/AUTOUIC_OPTIONS.rst +++ b/Help/prop_tgt/AUTOUIC_OPTIONS.rst @@ -15,3 +15,7 @@ This property is initialized by the value of the variable The options set on the target may be overridden by :prop_sf:`AUTOUIC_OPTIONS` set on the .ui source file. + +This property may use generator expressions with the syntax $ +See the :manual:`cmake-generator-expressions(7)` manual for available +expressions. diff --git a/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst b/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst new file mode 100644 index 000..1f63f00 --- /dev/null +++ b/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst @@ -0,0 +1,12 @@ +INTERFACE_AUTOUIC_OPTIONS +- + +List of interface options to pass to uic. + +Targets may populate this property to publish the options +required to use when invoking uic. Consuming targets can add entries to their +own :prop_tgt:`AUTOUIC_OPTIONS` property such as $TARGET_PROPERTY:foo,INTERFACE_AUTOUIC_OPTIONS +to use the uic options specified in the interface of ``foo``. + +This property supports generator expressions. See the +:manual:`cmake-generator-expressions(7)` manual for available expressions. diff --git a/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst b/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst index 2ded823..6b17f6e 100644 --- a/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst +++ b/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst @@ -6,6 +6,6 @@ Enables tracing output for target properties. This variable can be populated with a list of properties to generate debug output for when evaluating target properties. Currently it can only be used
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5572-gbe5a136
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 be5a1368299743dccb7a4d7abfb6bde99cdc4170 (commit)
via b56698737463b2cfcc282c2ef412e89fb28d2c9e (commit)
from 7c2c3741568795e99273170c5189ff3445e92b0e (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=be5a1368299743dccb7a4d7abfb6bde99cdc4170
commit be5a1368299743dccb7a4d7abfb6bde99cdc4170
Merge: 7c2c374 b566987
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Nov 20 23:26:39 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 23:26:39 2013 -0500
Merge topic 'qt-dialog-reconfigure' into next
b566987 cmake-gui: Configure again if a variable is changed before Generate
is pushed.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b56698737463b2cfcc282c2ef412e89fb28d2c9e
commit b56698737463b2cfcc282c2ef412e89fb28d2c9e
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Nov 20 21:24:54 2013 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Nov 20 21:24:54 2013 -0700
cmake-gui: Configure again if a variable is changed before Generate is
pushed.
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index a7665c8..c146bc5 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -946,6 +946,7 @@ void CMakeSetupDialog::saveBuildPaths(const QStringList
paths)
void CMakeSetupDialog::setCacheModified()
{
this-CacheModified = true;
+ this-ConfigureNeeded = true;
this-enterState(ReadyConfigure);
}
---
Summary of changes:
Source/QtDialog/CMakeSetupDialog.cxx |1 +
1 files changed, 1 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
