[cmake-developers] ExternalProject: using the same argument multiple times
Hi Dave, I want to wrap the externalproject_add() function, so that in the normal case only the git URL has to be specified, and all other arguments have been already set. But it should still be possible to override my default arguments. So I had a look how the argument parsing is done in ExternalProject.cmake When a value for a keyword is found, set_property(APPEND) is used. This means that if I do externalproject_add(INSTALL_DIR /opt/foo INSTALL_DIR /opt/bar ) then INSTALL_DIR will be /opt/foo;/opt/bar . I'd like to change this so that the second argument will override the first one (I saw that this appending is also used to append the multiple arguments for one keyword to the property of this keyword, so I will not break this). What do you think ? Are there use cases where I would actually want to split my arguments into multiple parts and have them concatenated ? Alex ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] ExternalProject: using the same argument multiple times
It is unexpected (and user/pilot error, if encountered) to have multiple INSTALL_DIR arguments to ExternalProject_Add. Why do you have to override the function in order to achieve your goal? Most ExternalProject arguments have reasonable default values for the corresponding properties, and can simply be left off if they do not need overriding. Which ones do not? I'm pretty sure the internal details of stringing multiple COMMAND arguments together rely on the append behavior, but it's been a while since I had to analyze/think about that code... I'd be happy to analyze a patch, but I'm not promising I'll be happy about changing the low level beehavior of ExternalProject_Add unless it's pretty much guaranteed not to break any current real-world usage of it. Thanks, Dave On Mon, Jun 13, 2011 at 8:44 AM, Alexander Neundorf neund...@kde.org wrote: Hi Dave, I want to wrap the externalproject_add() function, so that in the normal case only the git URL has to be specified, and all other arguments have been already set. But it should still be possible to override my default arguments. So I had a look how the argument parsing is done in ExternalProject.cmake When a value for a keyword is found, set_property(APPEND) is used. This means that if I do externalproject_add(INSTALL_DIR /opt/foo INSTALL_DIR /opt/bar ) then INSTALL_DIR will be /opt/foo;/opt/bar . I'd like to change this so that the second argument will override the first one (I saw that this appending is also used to append the multiple arguments for one keyword to the property of this keyword, so I will not break this). What do you think ? Are there use cases where I would actually want to split my arguments into multiple parts and have them concatenated ? Alex ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] I want to use CMake in Solaris10 x86
Hi I cannot find insall packet in download list,only Solaris spack packet can be found.How to solve this question ,thanks 2011-06-14 feng.zhou ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] I want to use CMake in Solaris10 x86
On 2011-06-14 10:37+0800 feng.zhou wrote: Hi I cannot find insall packet in download list,only Solaris spack packet can be found.How to solve this question ,thanks Try building cmake from the source code using the bootstrap method (i.e. running the bootstrap script in the top-level source tree directory following the directions in Readme.txt in that directory). Alan __ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); PLplot scientific plotting software package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __ Linux-powered Science __ ___ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [CMake] installing without building the whole project
On Thursday 09 June 2011, Michael Hertling wrote:
On 06/09/2011 03:34 PM, Dominik Szczerba wrote:
Hi,
I have a big project with several subfolders. In one subfolder's cmake
file I have e.g.
INSTALL(TARGETS test DESTINATION ${CMAKE_INSTALL_PREFIX} CONFIGURATIONS
RELEASE)
Now when I call make install on linux or build INSTALL project in
MSVC the whole project is built prior to installation of test. How
would I force to only build test in this case?
Many thanks for any hints,
Dominik
Since the general install target always depends on the general all
target,
This dependency can be disabled by setting:
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE)
You can also do make install/fast, which skips that dependency.
Using make install/local only stuff from the current directory is installed,
but not from subdirs.
Alex
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] ccmake options organization
On Friday 10 June 2011, Tim Gallagher wrote: Hi all, We have a code that has a lot of options to enable/disable at compile time, and we'd also like to use ccmake to generate input files to run the code (possibly several hundred options combined). But the way the curses gui organizes things makes it really hard/tedious to keep track of things. Has anybody looked into creating something akin to tabs to organize options? A simple way, for example, would be to put options with a common prefix on it's own tab so they stay organized. So anything with CMAKE_ would be on a CMake tab, anything with MPI_ would be on an MPI tab, and so on. cmake-gui, the really graphical client, does that already in the Grouped View mode. I'm not sure much work will still go into ccmake. Alex ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] CMAKE internal variables, files and scope
I would like to know if there is a list of all variables defined by cmake internally. ie. variables created by the various cmake supplied platform files etc. and internal to the application but not by the various find modules etc. that are explicitly invoked. I would like to know for each variable: 1) When does it get created? 2) Is it a cache variable? 3) Where it gets modified and why/how. 4) Is there anything special about the variable (like it's scope for example) To my knowledge some files inside modules/platform/ and the toolchain file are the files that get invoked. In addition some files get invoked with PROJECT() or ENABLE_LANGUAGE() commands. If these files can be listed as well it would helpful. So far, the only thing i know for sure is that the files 1) modules/platform/CMAKE_SYSTEM_NAME.cmake 2) modules/platform/CMAKE_SYSTEM_NAME-CMAKE_COMPILER_SUITE.cmake 3) modules/platform/CMAKE_SYSTEM_NAME-CMAKE_COMPILER_SUITE- CMAKE_SYSTEM_PROCESSOR.cmake get invoked in nested scope. ie. variables defined in 1 can be seen in 2 and 3 and variables defined in 2 can be seen in 3. Also, it seems that these files are invoked when encountering the first call to PROJECT() (or ENABLE_LANGUAGE()) in the projects CMakeLists.txt files. Further, I think the toolchain file is invoked even before the top level CMakeLists.txt and is executed in independent scope. ie. All non cache variables declared in it are limited to the file itself. Example: Despite the above knowledge i am often surprised. For example, i use the following line of code in Modules/Platform/Generic-gcc.cmake LIST(APPEND CMAKE_C_SOURCE_FILE_EXTENSIONS S) As expected in my embedded system projects, all ASM files with a .S extension get compiled by gcc instead of as. However, putting the same line fo code in either the toolchain file or the top level CMakeLists.txt (either before or after PROJECT()) does no good. Placing the code just before the PROJECT() call causes it to be overwritten to include just c when checked after PROJECT() call. This whole thing is very confusing and some documentation would help. -- Cheers! Kishore ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] ccmake options organization
I agree, I much prefer it too. But the bigger issue for us is that our builds are on remote machines that we cannot X-forward, so the gui isn't even an option. We've been hearing people in our lab say It would be nice if... and so I thought I'd throw it out there to see what others thought and if our guys are just lazy/crazy :) Tim - Original Message - From: Michael Wild them...@gmail.com To: cmake@cmake.org Sent: Monday, June 13, 2011 6:09:07 AM Subject: Re: [CMake] ccmake options organization On 06/13/2011 11:01 AM, Alexander Neundorf wrote: On Friday 10 June 2011, Tim Gallagher wrote: Hi all, We have a code that has a lot of options to enable/disable at compile time, and we'd also like to use ccmake to generate input files to run the code (possibly several hundred options combined). But the way the curses gui organizes things makes it really hard/tedious to keep track of things. Has anybody looked into creating something akin to tabs to organize options? A simple way, for example, would be to put options with a common prefix on it's own tab so they stay organized. So anything with CMAKE_ would be on a CMake tab, anything with MPI_ would be on an MPI tab, and so on. cmake-gui, the really graphical client, does that already in the Grouped View mode. I'm not sure much work will still go into ccmake. Alex Perhaps other people will tune in, so I just want to say that I much prefer ccmake over cmake-gui personally. Despite all its quirks which I would love to see fixed it allows for much faster editing without forcing me to tediously point and click with the mouse. But then, I'm also a Vim user... Although the grouping would be a nice feature to have in ccmake, it doesn't bother me since I use the search feature to achieve much the same. Instead of the grouping, I perhaps would even prefer a filter feature. Searching and filtering should IMHO support regexes (or globbing). Michael ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] ccmake options organization
I would also very much like to see some form of grouping to be possible in ccmake. Right now, the only way to avoid clutter is to mark the large majority of the variables as advanced and keep only the ones that would be used frequently used and this is still just a half-baked solution. One neat way would be to have a tree-like structure (like aptitude) based on variable prefix or even manually listed grouping would be very helpful. -- Szilárd On Mon, Jun 13, 2011 at 4:03 PM, Tim Gallagher tim.gallag...@gatech.edu wrote: I agree, I much prefer it too. But the bigger issue for us is that our builds are on remote machines that we cannot X-forward, so the gui isn't even an option. We've been hearing people in our lab say It would be nice if... and so I thought I'd throw it out there to see what others thought and if our guys are just lazy/crazy :) Tim - Original Message - From: Michael Wild them...@gmail.com To: cmake@cmake.org Sent: Monday, June 13, 2011 6:09:07 AM Subject: Re: [CMake] ccmake options organization On 06/13/2011 11:01 AM, Alexander Neundorf wrote: On Friday 10 June 2011, Tim Gallagher wrote: Hi all, We have a code that has a lot of options to enable/disable at compile time, and we'd also like to use ccmake to generate input files to run the code (possibly several hundred options combined). But the way the curses gui organizes things makes it really hard/tedious to keep track of things. Has anybody looked into creating something akin to tabs to organize options? A simple way, for example, would be to put options with a common prefix on it's own tab so they stay organized. So anything with CMAKE_ would be on a CMake tab, anything with MPI_ would be on an MPI tab, and so on. cmake-gui, the really graphical client, does that already in the Grouped View mode. I'm not sure much work will still go into ccmake. Alex Perhaps other people will tune in, so I just want to say that I much prefer ccmake over cmake-gui personally. Despite all its quirks which I would love to see fixed it allows for much faster editing without forcing me to tediously point and click with the mouse. But then, I'm also a Vim user... Although the grouping would be a nice feature to have in ccmake, it doesn't bother me since I use the search feature to achieve much the same. Instead of the grouping, I perhaps would even prefer a filter feature. Searching and filtering should IMHO support regexes (or globbing). Michael ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] (no subject)
Hello I have the following stupid problem with cmake: I want CMAKE_BUILD_TOOL or the deprecated CMAKE_MAKE_PROGRAM to be set to /usr/bin/make -j12 (for multithreaded build) how can we pass arguments to the build tool (make)? in eclipse that does not work because in the .cproject file there is a target now defined as target name=: all path= targetID=org.eclipse.cdt.make.MakeTargetBuilder buildCommand/usr/bin/make -j12/buildCommand buildTargetrebuild_cache/buildTarget stopOnErrortrue/stopOnError useDefaultCommandfalse/useDefaultCommand runAllBuilderstrue/runAllBuilders /target which can not be executed!! but to correctly execute the target in eclipse it should be: target name=: rebuild_cache path= targetID=org.eclipse.cdt.make.MakeTargetBuilder buildCommand/usr/bin/make/buildCommand buildArguments -j12/buildArguments buildTargetrebuild_cache/buildTarget stopOnErrortrue/stopOnError useDefaultCommandfalse/useDefaultCommand runAllBuilderstrue/runAllBuilders /target Can anyone help me how to do this properly? thanks alot! -- NEU: FreePhone - kostenlos mobil telefonieren! Jetzt informieren: http://www.gmx.net/de/go/freephone ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] ccmake options organization
On 6/13/2011 11:02 AM, Szilárd Páll wrote: I would also very much like to see some form of grouping to be possible in ccmake. Right now, the only way to avoid clutter is to mark the large majority of the variables as advanced and keep only the ones that would be used frequently used and this is still just a half-baked solution. One neat way would be to have a tree-like structure (like aptitude) based on variable prefix or even manually listed grouping would be very helpful. We would be very interested in added features to ccmake. However, we really do not have a curses expert on the team at the moment. If someone has that experience and would like to contribute, that would be great. Other than that, I don't think much will happen to ccmake. -Bill ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] (no subject)
On Monday 13 June 2011, Gabriel Nützi wrote: Hello I have the following stupid problem with cmake: I want CMAKE_BUILD_TOOL or the deprecated CMAKE_MAKE_PROGRAM to be set to /usr/bin/make -j12(for multithreaded build) how can we pass arguments to the build tool (make)? in eclipse that does not work because in the .cproject file there is a target now defined as target name=: all path= targetID=org.eclipse.cdt.make.MakeTargetBuilder buildCommand/usr/bin/make -j12/buildCommand buildTargetrebuild_cache/buildTarget stopOnErrortrue/stopOnError useDefaultCommandfalse/useDefaultCommand runAllBuilderstrue/runAllBuilders /target which can not be executed!! but to correctly execute the target in eclipse it should be: target name=: rebuild_cache path= targetID=org.eclipse.cdt.make.MakeTargetBuilder buildCommand/usr/bin/make/buildCommand buildArguments -j12/buildArguments buildTargetrebuild_cache/buildTarget stopOnErrortrue/stopOnError useDefaultCommandfalse/useDefaultCommand runAllBuilderstrue/runAllBuilders /target Can anyone help me how to do this properly? Are you using the Eclipse project generator ? Then you can set the variable CMAKE_ECLIPSE_MAKE_ARGUMENTS to -j12 via cmake-gui or ccmake. Alex ___ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Dealing with down servers when using FindSubversion.cmake
I use code like the following to append a version to my applications
based on the current svn rev.
FIND_PACKAGE(Subversion)
IF(Subversion_FOUND)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Current revision is ${Project_WC_REVISION})
Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Last changed log is ${Project_LAST_CHANGED_LOG})
set (${PROJECT_NAME}_VERSION_PATCH
${${PROJECT_NAME}_VERSION_PATCH}.${Project_WC_REVISION})
ENDIF(Subversion_FOUND)
The problem is if the server is down it prevented me from working
since the failure to get a version ends up blocking the generate so I
added an option to disable the appending if I disable the option:
FIND_PACKAGE(Subversion)
IF(Subversion_FOUND)
OPTION(APPEND_SVN_REV Append subversion rev to application version ON)
IF(APPEND_SVN_REV)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Current revision is ${Project_WC_REVISION})
Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Last changed log is ${Project_LAST_CHANGED_LOG})
set (${PROJECT_NAME}_VERSION_PATCH
${${PROJECT_NAME}_VERSION_PATCH}.${Project_WC_REVISION})
ENDIF(APPEND_SVN_REV)
ENDIF(Subversion_FOUND)
Is there an easy way it can just cache result of these checks and if
the server is down just use the cache instead of being fatal so I do
not have to use the switch to turn off this when the server is down?
--
John M. Drescher
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Link flags not applied to static library
Hello all,
I'm using CMake 2.8.4 and am seeing an odd differenc between static
and shared libraries in regard to the LINK_FLAGS property. In
particular, I'm enabling Whole program optimization in Visual Studio
2010, which is done by add /GL as a compiler flag and /LTCG as a
linker flag for the release configuration. However, the link flag is
not used for static libraries, leading to a build warning about
compiling with /GL but linking without /LTCG.
Here's an example:
cmake_minimum_required (VERSION 2.8)
project (link_test)
set (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} /GL)
add_library (static_test STATIC a.cpp)
set_target_properties (
static_test
PROPERTIES
LINK_FLAGS_RELEASE /LTCG
)
add_library (shared_test SHARED a.cpp)
set_target_properties (
shared_test
PROPERTIES
LINK_FLAGS_RELEASE /LTCG
)
Just add an empty file called a.cpp to the directory, then build the
whole project in release configuration. You'll get a warning like this
for the static_test library:
2 a.obj : MSIL .netmodule or module compiled with /GL found;
restarting link with /LTCG; add /LTCG to the link command line to
improve
Why is CMake not applying LINK_FLAGS_RELEASE to the static library?
Thanks,
Ben
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Determine Installer Build Configuration in Visual Studio
On Fri, Jun 10, 2011 at 11:02 AM, Jason Gochanour jrgoc...@lanl.gov wrote:
I think you may be right. CMAKE_INSTALL_CONFIG_NAME doesn't contain a
value
when I run a fresh build of the PACKAGE project in Visual Studio.
If it isn't possible to tell CPack what build configuration the user
chooses
in the IDE is there any way to have it just package the required DLLs
automatically, without having to manually specify their paths? CPack will
package the correct versions of the executables, and even the .libs if I
choose, but I can't figure out how to get .dll files packaged at all.
On 6/9/2011 8:50 PM, J Decker wrote:
You probably need to escape it... so it is kept as
${CMAKE_INSTALL_CONFIG_NAME}
or I think it only ends up working for the initial configuration
chosen when the .sln is made...
On Thu, Jun 9, 2011 at 6:22 PM, J Deckerd3c...@gmail.com wrote:
if(SUPPORTS_PARALLEL_BUILD_TYPE)
CMAKE_INSTALL_CONFIG_NAME is set to the current configuration name
(DEbug, release, minsizerel) as chosen in the visual studio
environment so to choose which you build - you choose which you
build.
It doesn't package multiple configurations at once into a single NSIS,
but it will package any single configuration.
?
On Thu, Jun 9, 2011 at 2:12 PM, Jason Gochanourjrgoc...@lanl.gov
wrote:
I've managed to get an NSIS project up and running in VIsual Studio
with
CPack, but I can't figure out how to determine which configuration type
is
being built. Is it possible to write up a CMakeLists that will run
through
different conditionals based off of the Build Configuration Type
selected in
Visual Studio? If a user selects a Debug build I'd like to be able to
tell
the installer to be built with the Debug libraries instead of the
Release.
That is what it does. When debug is selected in Visual Studio and you
build the PACKAGE project it will build this using debug libs.
John
Thank you for the response John. When I first setup CPack it built
both
Release and Debug, but it didn't package the required DLLs in the
installer. I did some searching and came across the GetPrerequisites
module. I had this scan the executables I wanted to package up to
create a
list of the DLLs I needed. I had to manually specify the directory
however,
because I'm not sure how to tell CPack what configuration the user
wants
to
build. I have a feeling there's a better way around this, but I
haven't
figure it out yet.
Here's the code for one of the executables in the package.
## INSTALLER ##
IF(INSTALLER_WITH_PROGRAM)
# Add Microsoft DLLs to Installer
INCLUDE(InstallRequiredSystemLibraries)
include(GetPrerequisites)
# Clear Path Variable
set(PATH_TO_FILE ${PATH_TO_FILE}-NOTFOUND)
set(DLL DLL-NOTFOUND)
# Scan the executable for required DLLs
IF(EXISTS ${EXECUTABLE_OUTPUT_PATH}/Release/Program.exe)
GET_PREREQUISITES(${EXECUTABLE_OUTPUT_PATH}/Release/Program.exe
DEPENDENCIES 1 1 )
# Scan for each DLL
FOREACH(DEPENDENCY ${DEPENDENCIES})
FOREACH(PATH_TO_FILE ${CMAKE_MODULE_PATH})
find_file(DLL ${DEPENDENCY} ${PATH_TO_FILE}/bin})
ENDFOREACH(PATH_TO_FILE)
# Add discovered DLL to Installer
install(FILES ${DLL} DESTINATION bin )
# Reset DLL Variable
set(DLL DLL-NOTFOUND)
ENDFOREACH(DEPENDENCY)
# Add Release TS Executable
install(TARGETS Program RUNTIME DESTINATION bin)
ELSE()
message(Please build
${EXECUTABLE_OUTPUT_PATH}/Release/Program.exe
and run CMake again.)
ENDIF(EXISTS ${EXECUTABLE_OUTPUT_PATH}/Release/Program.exe)
ENDIF(INSTALLER_WITH_PROGRAM)
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
What version of CMake are you using? At the top of the latest
InstallRequiredSystemLibraries.cmake are the following comments:
# If CMAKE_INSTALL_DEBUG_LIBRARIES is set and it is the MSVC
# compiler, then the debug libraries are installed when available.
# If CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY is set then only the debug
# libraries are installed when both debug and release are available.
The problem is: the debug libraries for MSVC are not redistributable. You're
not *supposed* to package them from a
Re: [CMake] Dealing with down servers when using FindSubversion.cmake
Am Montag, 13. Juni 2011, 13:02:34 schrieb John Drescher:
I use code like the following to append a version to my applications
based on the current svn rev.
FIND_PACKAGE(Subversion)
IF(Subversion_FOUND)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Current revision is ${Project_WC_REVISION})
Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Last changed log is ${Project_LAST_CHANGED_LOG})
set (${PROJECT_NAME}_VERSION_PATCH
${${PROJECT_NAME}_VERSION_PATCH}.${Project_WC_REVISION})
ENDIF(Subversion_FOUND)
The problem is if the server is down it prevented me from working
since the failure to get a version ends up blocking the generate so I
added an option to disable the appending if I disable the option:
I think your problem is not the version, but the log. The log is fetched from
the server, the revisions of the files are stored inside the working copy and
therefore are available offline, too. Just remove that log thing.
Eike
signature.asc
Description: This is a digitally signed message part.
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Dealing with down servers when using FindSubversion.cmake
On Mon, Jun 13, 2011 at 3:16 PM, Rolf Eike Beer e...@sf-mail.de wrote:
Am Montag, 13. Juni 2011, 13:02:34 schrieb John Drescher:
I use code like the following to append a version to my applications
based on the current svn rev.
FIND_PACKAGE(Subversion)
IF(Subversion_FOUND)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Current revision is ${Project_WC_REVISION})
Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
MESSAGE(Last changed log is ${Project_LAST_CHANGED_LOG})
set (${PROJECT_NAME}_VERSION_PATCH
${${PROJECT_NAME}_VERSION_PATCH}.${Project_WC_REVISION})
ENDIF(Subversion_FOUND)
The problem is if the server is down it prevented me from working
since the failure to get a version ends up blocking the generate so I
added an option to disable the appending if I disable the option:
I think your problem is not the version, but the log. The log is fetched from
the server, the revisions of the files are stored inside the working copy and
therefore are available offline, too. Just remove that log thing.
Thanks, I will try that. I am trying to remember why I put the log
part in there. I know it was nice to see the last commit in the
cmake-gui but if that holds me up no reason for that..
John
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] install python module
Hi,
I am creating my python modules like:
VTK_WRAP_PYTHON3 (vtkmyFilteringPython FilteringPython_SRCS ${SOURCES})
ADD_LIBRARY (vtkmyFilteringPythonD ${FilteringPython_SRCS})
TARGET_LINK_LIBRARIES(vtkmyFilteringPythonD vtkmyFiltering
vtkFilteringPythonD vtkImagingPythonD ${LIBS_VTKMYFILTERING})
PYTHON_ADD_MODULE(vtkmyFilteringPython vtkmyFilteringPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyFilteringPython vtkmyFilteringPythonD)
and trying to install like:
INSTALL(TARGETS vtkmyFiltering RUNTIME DESTINATION
${CMAKE_INSTALL_PREFIX}/bin LIBRARY DESTINATION
${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS RELEASE)
INSTALL(TARGETS vtkmyFilteringPython LIBRARY DESTINATION
${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS RELEASE)
INSTALL(TARGETS vtkmyFilteringPythonD LIBRARY DESTINATION
${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS RELEASE)
Problem is that only vtkmyFiltering*.so files are installed, but not
the also needed libvtkmyFilteringPython* files. Is there anything
special to fully install the created module?
Regards,
Dominik
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] include_directories(SYSTEM, GNU.cmake and -isystem for C (not CXX)
On 06/11/2011 02:08 AM, Campbell Barton wrote: To follow up on this, I tested this on a test project and found the problem was in my own macro which wasn't initializing an include list. So only the set(CMAKE_INCLUDE_SYSTEM_FLAG_C -isystem ) remains which should be fixed in CMake but is easy to workaround. I updated your bug report here: http://www.cmake.org/Bug/view.php?id=12258#c26851 but for purposes of this list archive: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33f5a83a -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://www.cmake.org/mailman/listinfo/cmake
[CMake] Errors using CMAKE for cross compiling.
Try cross compiling using CMAKE, target tool chain is ARM RVCT4, got errors on
both Windows and Ubuntu.
Please help, thanks in advance.
1. On Ubuntu.
ADD_EXECUTABLE(hello main.c)
Fatal error: C3900U: Unrecognized option '-rdynamic'.
ADD_EXECUTABLE(hello SHARED main.c)
Fatal error: C3900U: Unrecognized option '-fPIC'.
My question:
I don't know why such compiling options have been added automatically by CMAKE?
armcc doesn't recognize it.
2. On Windows XP.
My Question:
I have set CMAKE_C_COMPILER already, why does it still can't find it?
G:\t2\buildcmake -G Unix Makefiles VERBOSE=1 .. make VERBOSE=1
-- The C compiler identification is unknown
-- The CXX compiler identification is unknown
CMake Error: your C compiler: CMAKE_C_COMPILER-NOTFOUND was not found.
Please set CMAKE_C_COMPILER to a valid compiler path or name.
CMake Error: your CXX compiler: CMAKE_CXX_COMPILER-NOTFOUND was not found.
Please set CMAKE_CXX_COMPILER to a valid compiler path or name.
CMakeLists:
cmake_minimum_required(VERSION 2.8)
PROJECT (HELLO)
set(RVCT40BIN $ENV{RVCT40BIN})
set(RVCT40INC $ENV{RVCT40INC})
set(RVCT40LIB $ENV{RVCT40LIB})
SET (CMAKE_SYSTEM_PROCESSOR arm)
SET (CMAKE_CROSSCOMPILING 1)
SET(CMAKE_C_COMPILER ${RVCT40BIN}/armcc)
SET(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER})
SET (CMAKE_C_FLAGS --thumb --cpp -c --cpu ARM9TDMI --apcs
/noropi/interwork/norwpi --littleend --split_sections --diag_suppress
177,1165,997,611,68,161,2548 --fpu=softvfp -Ospace -O2)
SET (CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
SET (CMAKE_C_CREATE_STATIC_LIBRARY CMAKE_AR --create -cr LINK_FLAGS
TARGET OBJECTS)
SET (CMAKE_CXX_CREATE_STATIC_LIBRARY CMAKE_AR --create -cr LINK_FLAGS
TARGET OBJECTS)
INCLUDE_DIRECTORIES(${RVCT40INC})
LINK_DIRECTORIES(${RVCT40LIB}/armlib ${RVCT40LIB}/cpplib)
ADD_EXECUTABLE(hello main.c)
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Errors using CMAKE for cross compiling.
On Tuesday 14 Jun 2011 9:46:56 AM jianhua wrote:
Try cross compiling using CMAKE, target tool chain is ARM RVCT4, got errors
on both Windows and Ubuntu.
Please help, thanks in advance.
1. On Ubuntu.
ADD_EXECUTABLE(hello main.c)
Fatal error: C3900U: Unrecognized option '-rdynamic'.
ADD_EXECUTABLE(hello SHARED main.c)
Fatal error: C3900U: Unrecognized option '-fPIC'.
My question:
I don't know why such compiling options have been added automatically by
CMAKE? armcc doesn't recognize it.
2. On Windows XP.
My Question:
I have set CMAKE_C_COMPILER already, why does it still can't find it?
G:\t2\buildcmake -G Unix Makefiles VERBOSE=1 .. make VERBOSE=1
-- The C compiler identification is unknown
-- The CXX compiler identification is unknown
CMake Error: your C compiler: CMAKE_C_COMPILER-NOTFOUND was not found.
Please set CMAKE_C_COMPILER to a valid compiler path or name. CMake Error:
your CXX compiler: CMAKE_CXX_COMPILER-NOTFOUND was not found. Please
set CMAKE_CXX_COMPILER to a valid compiler path or name.
CMakeLists:
cmake_minimum_required(VERSION 2.8)
PROJECT (HELLO)
set(RVCT40BIN $ENV{RVCT40BIN})
set(RVCT40INC $ENV{RVCT40INC})
set(RVCT40LIB $ENV{RVCT40LIB})
SET (CMAKE_SYSTEM_PROCESSOR arm)
SET (CMAKE_CROSSCOMPILING 1)
SET(CMAKE_C_COMPILER ${RVCT40BIN}/armcc)
SET(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER})
The above cross compiler settings should occur before the PROJECT() statement
and ideally in a toolchain file. For start, just move the above PROJECT()
statement to the place of this comment and try again.
SET (CMAKE_C_FLAGS --thumb --cpp -c --cpu ARM9TDMI --apcs
/noropi/interwork/norwpi --littleend --split_sections --diag_suppress
177,1165,997,611,68,161,2548 --fpu=softvfp -Ospace -O2) SET
(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
SET (CMAKE_C_CREATE_STATIC_LIBRARY CMAKE_AR --create -cr LINK_FLAGS
TARGET OBJECTS) SET (CMAKE_CXX_CREATE_STATIC_LIBRARY CMAKE_AR
--create -cr LINK_FLAGS TARGET OBJECTS)
INCLUDE_DIRECTORIES(${RVCT40INC})
LINK_DIRECTORIES(${RVCT40LIB}/armlib ${RVCT40LIB}/cpplib)
ADD_EXECUTABLE(hello main.c)
--
Cheers!
Kishore
___
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.4-1733-g412fbe5
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 412fbe5892aa00eea675a464130c75b20d2765a5 (commit) via 1ed19bcb25edc5f1911b5d0237db34426e747cd2 (commit) from 9faa59d3e89e47e24b9deb535d00070b65e9a017 (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=412fbe5892aa00eea675a464130c75b20d2765a5 commit 412fbe5892aa00eea675a464130c75b20d2765a5 Merge: 9faa59d 1ed19bc Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jun 13 11:38:06 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jun 13 11:38:06 2011 -0400 Merge topic 'library-multiarch-issue-12037' into next 1ed19bc multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ed19bcb25edc5f1911b5d0237db34426e747cd2 commit 1ed19bcb25edc5f1911b5d0237db34426e747cd2 Author: Modestas Vainius mo...@debian.org AuthorDate: Sun Jun 12 17:40:01 2011 +0300 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jun 13 11:12:23 2011 -0400 multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD * Fix linux CMAKE_LIBRARY_ARCHITECTURE_REGEX to support armel-linux-gnueabi. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on kFreeBSD. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on GNU (Hurd). Also regex is improved to support quadlets. Even if I have not seen this in the wild yet, reportedly they are possible. diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake index e0ed86c..4bcfd51 100644 --- a/Modules/Platform/GNU.cmake +++ b/Modules/Platform/GNU.cmake @@ -8,4 +8,6 @@ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG -Wl,-rpath-link,) SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG -Wl,-soname,) SET(CMAKE_EXE_EXPORTS_C_FLAG -Wl,--export-dynamic) +SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX [a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*) + INCLUDE(Platform/UnixPaths) diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake index 57d1b34..38f469b 100644 --- a/Modules/Platform/Linux.cmake +++ b/Modules/Platform/Linux.cmake @@ -46,7 +46,7 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE) ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) # Match multiarch library directory names. -SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX [a-z0-9_]+-linux-gnu) +SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX [a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*) INCLUDE(Platform/UnixPaths) diff --git a/Modules/Platform/kFreeBSD.cmake b/Modules/Platform/kFreeBSD.cmake index ff050de..c1295fb 100644 --- a/Modules/Platform/kFreeBSD.cmake +++ b/Modules/Platform/kFreeBSD.cmake @@ -1,2 +1,4 @@ # kFreeBSD looks just like Linux. INCLUDE(Platform/Linux) + +SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX [a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*) --- Summary of changes: Modules/Platform/GNU.cmake |2 ++ Modules/Platform/Linux.cmake|2 +- Modules/Platform/kFreeBSD.cmake |2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.4-1735-gadf9c1e
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 adf9c1e330975d8611b406d1611b086cb0e4f564 (commit) via 46e3a6c9b9019ac5e23ecf013503d04a8683bbb4 (commit) from 412fbe5892aa00eea675a464130c75b20d2765a5 (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=adf9c1e330975d8611b406d1611b086cb0e4f564 commit adf9c1e330975d8611b406d1611b086cb0e4f564 Merge: 412fbe5 46e3a6c Author: Brad King brad.k...@kitware.com AuthorDate: Mon Jun 13 17:47:40 2011 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Jun 13 17:47:40 2011 -0400 Merge branch 'master' into next --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.4-1737-gcdab855
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 cdab85513cc99e396d0f5ea2aff8834170fab1e4 (commit)
via 33f5a83a5d7aa4c5a021c33a3fa55069da5eeed8 (commit)
from adf9c1e330975d8611b406d1611b086cb0e4f564 (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=cdab85513cc99e396d0f5ea2aff8834170fab1e4
commit cdab85513cc99e396d0f5ea2aff8834170fab1e4
Merge: adf9c1e 33f5a83
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 13 17:56:46 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 13 17:56:46 2011 -0400
Merge topic 'gnu-isystem-flag-issue-12258' into next
33f5a83 GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_lang value (#12258)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33f5a83a5d7aa4c5a021c33a3fa55069da5eeed8
commit 33f5a83a5d7aa4c5a021c33a3fa55069da5eeed8
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 13 17:48:20 2011 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 13 17:54:36 2011 -0400
GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_lang value (#12258)
Fix typo introduced by commit e28c16b4 (Split GNU compiler information
files, 2009-12-02).
Reported-by: Campbell Barton ideasma...@gmail.com
Suggested-by: Michael Hertling mhertl...@online.de
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index 0bb31f9..8d6f5df 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -33,6 +33,6 @@ macro(__compiler_gnu lang)
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE CMAKE_${lang}_COMPILER
DEFINES FLAGS -E SOURCE PREPROCESSED_SOURCE)
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE CMAKE_${lang}_COMPILER DEFINES
FLAGS -S SOURCE -o ASSEMBLY_SOURCE)
if(NOT APPLE)
-set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX -isystem )
+set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} -isystem )
endif(NOT APPLE)
endmacro()
---
Summary of changes:
Modules/Compiler/GNU.cmake |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.4-1739-gcd41daa
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 cd41daa4457439d282bb59f216d1bcf0dc744ef0 (commit)
via e7f05d9759ec5bc393760daee91bb7223f6c56d0 (commit)
from cdab85513cc99e396d0f5ea2aff8834170fab1e4 (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=cd41daa4457439d282bb59f216d1bcf0dc744ef0
commit cd41daa4457439d282bb59f216d1bcf0dc744ef0
Merge: cdab855 e7f05d9
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 13 19:22:35 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 13 19:22:35 2011 -0400
Merge topic 'qt4-import-targets-mac' into next
e7f05d9 Add imported targets support for frameworks on Mac.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7f05d9759ec5bc393760daee91bb7223f6c56d0
commit e7f05d9759ec5bc393760daee91bb7223f6c56d0
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 13 17:21:41 2011 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jun 13 17:21:41 2011 -0600
Add imported targets support for frameworks on Mac.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 0a11cfb..86fce9d 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -375,12 +375,20 @@ MACRO (_QT4_ADJUST_LIB_VARS _camelCaseBasename)
IF (QT_${basename}_LIBRARY_RELEASE)
SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
-SET_PROPERTY(TARGET Qt4::${_camelCaseBasename}PROPERTY
IMPORTED_LOCATION_RELEASE ${QT_${basename}_LIBRARY_RELEASE} )
+if(QT_USE_FRAMEWORKS)
+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename}PROPERTY
IMPORTED_LOCATION_RELEASE
${QT_${basename}_LIBRARY_RELEASE}/${_camelCaseBasename} )
+else()
+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename}PROPERTY
IMPORTED_LOCATION_RELEASE ${QT_${basename}_LIBRARY_RELEASE} )
+endif()
ENDIF (QT_${basename}_LIBRARY_RELEASE)
IF (QT_${basename}_LIBRARY_DEBUG)
SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} APPEND PROPERTY
IMPORTED_CONFIGURATIONS DEBUG)
-SET_PROPERTY(TARGET Qt4::${_camelCaseBasename}PROPERTY
IMPORTED_LOCATION_DEBUG ${QT_${basename}_LIBRARY_DEBUG} )
+if(QT_USE_FRAMEWORKS)
+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename}PROPERTY
IMPORTED_LOCATION_DEBUG ${QT_${basename}_LIBRARY_DEBUG}/${_camelCaseBasename}
)
+else()
+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename}PROPERTY
IMPORTED_LOCATION_DEBUG ${QT_${basename}_LIBRARY_DEBUG} )
+endif()
ENDIF (QT_${basename}_LIBRARY_DEBUG)
ENDIF(NOT TARGET Qt4::${_camelCaseBasename})
@@ -535,7 +543,7 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
# ask qmake for the library dir as a hint, then search for QtCore library
and use that as a reference for finding the
# others and for setting QT_LIBRARY_DIR
- IF (NOT QT_QTCORE_LIBRARY OR QT_QMAKE_CHANGED)
+ IF (NOT (QT_QTCORE_LIBRARY_RELEASE OR QT_QTCORE_LIBRARY_DEBUG) OR
QT_QMAKE_CHANGED)
_qt4_query_qmake(QT_INSTALL_LIBS QT_LIBRARY_DIR_TMP)
SET(QT_QTCORE_LIBRARY_RELEASE NOTFOUND)
SET(QT_QTCORE_LIBRARY_DEBUG NOTFOUND)
@@ -568,7 +576,18 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
ENDIF(EXISTS ${QT_LIBRARY_DIR_TMP}/libqtmain.a)
ENDIF(NOT QT_QTCORE_LIBRARY_RELEASE AND MSVC)
- ENDIF (NOT QT_QTCORE_LIBRARY OR QT_QMAKE_CHANGED)
+ ENDIF ()
+
+ IF (APPLE)
+SET(CMAKE_FIND_FRAMEWORK_OLD ${CMAKE_FIND_FRAMEWORK})
+IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+ SET(QT_USE_FRAMEWORKS ON CACHE INTERNAL FORCE)
+ SET(CMAKE_FIND_FRAMEWORK FIRST)
+ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+ SET(QT_USE_FRAMEWORKS OFF CACHE INTERNAL FORCE)
+ SET(CMAKE_FIND_FRAMEWORK LAST)
+ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+ ENDIF (APPLE)
_QT4_ADJUST_LIB_VARS(QtCore)
@@ -589,18 +608,6 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
ENDIF(Qt4_FIND_REQUIRED)
ENDIF()
- IF (APPLE)
-SET(CMAKE_FIND_FRAMEWORK_OLD ${CMAKE_FIND_FRAMEWORK})
-IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
- SET(QT_USE_FRAMEWORKS ON CACHE INTERNAL FORCE)
- SET(CMAKE_FIND_FRAMEWORK FIRST)
-ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
- SET(QT_USE_FRAMEWORKS OFF CACHE INTERNAL FORCE)
- SET(CMAKE_FIND_FRAMEWORK LAST)
-ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-MARK_AS_ADVANCED(QT_USE_FRAMEWORKS)
- ENDIF (APPLE)
-
# ask qmake for the binary dir
IF (NOT QT_BINARY_DIR OR QT_QMAKE_CHANGED)
[Cmake-commits] CMake branch, next, updated. v2.8.4-1741-g4b204f7
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 4b204f779172439f8bb2224ee473a449a9e96058 (commit) via 5f983d1706ad99b529cc987a4015844483555ff8 (commit) from cd41daa4457439d282bb59f216d1bcf0dc744ef0 (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=4b204f779172439f8bb2224ee473a449a9e96058 commit 4b204f779172439f8bb2224ee473a449a9e96058 Merge: cd41daa 5f983d1 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Mon Jun 13 19:38:04 2011 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Jun 13 19:38:04 2011 -0400 Merge topic 'qt4-useqt-module-deps' into next 5f983d1 Qt4: complete module dependencies in UseQt4.cmake http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f983d1706ad99b529cc987a4015844483555ff8 commit 5f983d1706ad99b529cc987a4015844483555ff8 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Mon Jun 13 17:37:26 2011 -0600 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Mon Jun 13 17:37:26 2011 -0600 Qt4: complete module dependencies in UseQt4.cmake diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index ab028ed..9ce475c 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -66,6 +66,13 @@ SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE) SET(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE) SET(QT_QTDECLARATIVE_MODULE_DEPENDS QTWEBKIT QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTXML QTOPENGL QTGUI QTNETWORK QTCORE) SET(QT_QTMULTIMEDIA_MODULE_DEPENDS QTGUI QTCORE) +SET(QT_QTOPENGL_MODULE_DEPENDS QTGUI QTCORE) +SET(QT_QTSCRIPT_MODULE_DEPENDS QTCORE) +SET(QT_QTGUI_MODULE_DEPENDS QTCORE) +SET(QT_QTTEST_MODULE_DEPENDS QTCORE) +SET(QT_QTXML_MODULE_DEPENDS QTCORE) +SET(QT_QTSQL_MODULE_DEPENDS QTCORE) +SET(QT_QTNETWORK_MODULE_DEPENDS QTCORE) # Qt modules (in order of dependence) FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN --- Summary of changes: Modules/UseQt4.cmake |7 +++ 1 files changed, 7 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
