Re: [CMake] CMAKE 2.8.9 not observing CMAKE_FILES_DIRECTORY?
2012/8/24 Jason T. Slack-Moehrle slackmoeh...@gmail.com:
Hello
OS X 10.8, CMAKE 2.8.9.
In CMAKE 2.8.9 it seems that CMAKE_FILES_DIRECTORY
SET( PROJECT_BINARY_DIR . )
SET( CMAKE_FILES_DIRECTORY ${PROJECT_BINARY_DIR}/output/CMakeFiles )
SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin )
I dont see an 'output/CMakeFiles' created but I do see a 'bin' where
my executable is put.
What makes you think that PROJECT_BINARY_DIR or
CMAKE_FILES_DIRECTORY may be modified?
AFAIK those are read-only variable setup by CMake itself.
i.e.:
cmake --help-variable PROJECT_BINARY_DIR
PROJECT_BINARY_DIR
Full path to build directory for project.
This is the binary directory of the most recent PROJECT command.
CMAKE_FILES_DIRECTORY, is not documented at all and
since it's define in void cmMakefile::AddDefaultDefinitions()
I doubt it was meant to be user-modified.
Did you manage to do that with any CMake version before 2.8.9 ?
If yes which one(s)?
--
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.org
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] RPM package %config noreplace causes conflict
Hi, i use install(FILE ..) to install a configuration file config.txt by both RPM packages A.rpm and B.rpm, due to the name and version in config.txt, the config.txt is not exactly the same in A.rpm and B.rpm. Now I've got an file conflict error when A.rpm was installed, B.rpm failed the installation. I actually don't mind if the config.txt can be overriten or not as long as it is there. The install(FILE ...) actually generates %config config.txt in the spec for not overwriting the file if the file exists. I guess because those two config.txt are different which causing conflic error. But I actually don't mind if the config.txt can be overriten or not as long as it is there. I know I can use --force in rpm command to force installation, but don't want to tell every body to use extra parameter to install packages. Is there any function in cmake I can use to force overwriting the configuration file if it exists? Thank you. Kind regards, Jupiter -- View this message in context: http://cmake.3232098.n2.nabble.com/RPM-package-config-noreplace-causes-conflict-tp7581368.html Sent from the CMake mailing list archive at Nabble.com. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] RPM package %config noreplace causes conflict
2012/8/24 hce jupiter@gmail.com: Hi, i use install(FILE ..) to install a configuration file config.txt by both RPM packages A.rpm and B.rpm, due to the name and version in config.txt, the config.txt is not exactly the same in A.rpm and B.rpm. Now I've got an file conflict error when A.rpm was installed, B.rpm failed the installation. I actually don't mind if the config.txt can be overriten or not as long as it is there. The install(FILE ...) actually generates %config config.txt in the spec for not overwriting the file if the file exists. It generates such %config directive because the file is installed with an absolute destination like: install(FILE config.txt DESTINATION /etc/mysoftware) if it was installed with relative path you don't (automatically) get the %config, anyway the %config is not really the issue here. I guess because those two config.txt are different which causing conflic error. Nope, probably not. The conflict is because two differents packages (A and B) wan't to install a file at the very same place in the filesystem. RPM don't care about the content. But I actually don't mind if the config.txt can be overriten or not as long as it is there. I know I can use --force in rpm command to force installation, but don't want to tell every body to use extra parameter to install packages. Is there any function in cmake I can use to force overwriting the configuration file if it exists? The problem is not really with CMake but with RPM. I can see 2 solutions to this problem: 1) Create 3 packages A,B and common-config. common-config containing the shared config file and make A and B depends on common-config. see cpack --help-variable CPACK_RPM_PACKAGE_REQUIRES for specifying the dependency. 2) Install the config file in a separate location for each package install(FILE config.txt config/A) for package A install(FILE config.txt config/B) for package B then use a post-install script that put the config file at the wanted shared location. The post-install script shall do appropriate action if another file is already there (replace, do nothing , merge ) see: cpack --help-variable CPACK_RPM_POST_INSTALL_SCRIPT_FILE Hope this helps. -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Setting CTEST_BUILD_NAME from cmake config
Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). Thanks a lot, Michele -- 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] Setting CTEST_BUILD_NAME from cmake config
I set the build name and site in my CMakeLists.txt before calling include(CTest) and it works. Sent from my iPhone On Aug 24, 2012, at 9:01, Michele Dolfi dolfim...@gmail.com wrote: Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). Thanks a lot, Michele -- 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] Setting CTEST_BUILD_NAME from cmake config
On Fri, Aug 24, 2012 at 9:07 AM, Leif Walsh leif.wa...@gmail.com wrote: I set the build name and site in my CMakeLists.txt before calling include(CTest) and it works. But then you can only submit dashboards from one site with that CMakeLists file...? Anybody else submitting a dashboard for your project will pick up the same site and build names. Sent from my iPhone On Aug 24, 2012, at 9:01, Michele Dolfi dolfim...@gmail.com wrote: Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). You should set those variables in the ctest -S script. A ctest -S script is typically coupled to the specific machine and build that it represents, so it's the right place to set those variables. Thanks a lot, Michele -- 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
Re: [CMake] Setting CTEST_BUILD_NAME from cmake config
They are generated from facts I detect about the os Sent from my iPhone On Aug 24, 2012, at 9:24, David Cole david.c...@kitware.com wrote: On Fri, Aug 24, 2012 at 9:07 AM, Leif Walsh leif.wa...@gmail.com wrote: I set the build name and site in my CMakeLists.txt before calling include(CTest) and it works. But then you can only submit dashboards from one site with that CMakeLists file...? Anybody else submitting a dashboard for your project will pick up the same site and build names. Sent from my iPhone On Aug 24, 2012, at 9:01, Michele Dolfi dolfim...@gmail.com wrote: Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). You should set those variables in the ctest -S script. A ctest -S script is typically coupled to the specific machine and build that it represents, so it's the right place to set those variables. Thanks a lot, Michele -- 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
Re: [CMake] Setting CTEST_BUILD_NAME from cmake config
On Fri, Aug 24, 2012 at 9:34 AM, Leif Walsh leif.wa...@gmail.com wrote: They are generated from facts I detect about the os Ah ok. Better then. :-) You could do the same thing in a ctest script. A lot of the projects we work on at Kitware share a common script for the project that is included by all the dashboard scripts that run. You could put general code into one of them, too, but since it's common for people to want to customize these variables on a per-submission basis, we typically just require them to be set in the wrapper scripts that are machine-specific. Cheers, David Sent from my iPhone On Aug 24, 2012, at 9:24, David Cole david.c...@kitware.com wrote: On Fri, Aug 24, 2012 at 9:07 AM, Leif Walsh leif.wa...@gmail.com wrote: I set the build name and site in my CMakeLists.txt before calling include(CTest) and it works. But then you can only submit dashboards from one site with that CMakeLists file...? Anybody else submitting a dashboard for your project will pick up the same site and build names. Sent from my iPhone On Aug 24, 2012, at 9:01, Michele Dolfi dolfim...@gmail.com wrote: Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). You should set those variables in the ctest -S script. A ctest -S script is typically coupled to the specific machine and build that it represents, so it's the right place to set those variables. Thanks a lot, Michele -- 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
Re: [CMake] Setting CTEST_BUILD_NAME from cmake config
On Fri, Aug 24, 2012 at 3:24 PM, David Cole david.c...@kitware.com wrote: On Aug 24, 2012, at 9:01, Michele Dolfi dolfim...@gmail.com wrote: Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). You should set those variables in the ctest -S script. A ctest -S script is typically coupled to the specific machine and build that it represents, so it's the right place to set those variables. So, since the basic config option (e.g. compiler, in case I want to test more) has to be set in the ctest -S script, I can just use this info to generate the name from there? In my case I would like to put some library version number in the BUILDNAME, in order to easily filter the results in the dashboard. Doing it in the ctest -S means invoking find_library(), i.e. perming the config in two different places. Michele -- 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] Setting CTEST_BUILD_NAME from cmake config
On Fri, Aug 24, 2012 at 9:45 AM, Michele Dolfi dolfim...@gmail.com wrote: On Fri, Aug 24, 2012 at 3:24 PM, David Cole david.c...@kitware.comwrote: On Aug 24, 2012, at 9:01, Michele Dolfi dolfim...@gmail.com wrote: Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). You should set those variables in the ctest -S script. A ctest -S script is typically coupled to the specific machine and build that it represents, so it's the right place to set those variables. So, since the basic config option (e.g. compiler, in case I want to test more) has to be set in the ctest -S script, I can just use this info to generate the name from there? In my case I would like to put some library version number in the BUILDNAME, in order to easily filter the results in the dashboard. Doing it in the ctest -S means invoking find_library(), i.e. perming the config in two different places. Michele Well, maybe you *should* do it in the CMakeLists then. You can't run find_library in a ctest -S script. -- 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] Accessing cache variable from CTest script
Hello everyone, I have tried asking this question on stackoverflow [1] without much luck, so here we go: My project links to a third-party library that comes with a valgrind suppression file, as well as a CMake script. The script stores the location of the suppression file in a CMake cache variable. I have written a CTest script to build and test my project and I would like to use the suppression file during the memory-checking stage. Unfortunately, the CTest script does not seem to know anything about the CMake cache. How can I access the CMake cache variable from my CTest script? Thanks in advance for the help. Davide [1] http://stackoverflow.com/questions/12108741/access-cmake-cache-variable-from-ctest-script -- 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] Setting CTEST_BUILD_NAME from cmake config
Then I cannot use the subproject separation, right? It seems this is feature that got lost with the new style: http://www.cmake.org/Wiki/CMake_Scripting_Of_CTest#Continuous_Builds_.28old_Style.29 Michele On Fri, Aug 24, 2012 at 3:51 PM, David Cole david.c...@kitware.com wrote: On Fri, Aug 24, 2012 at 9:45 AM, Michele Dolfi dolfim...@gmail.comwrote: On Fri, Aug 24, 2012 at 3:24 PM, David Cole david.c...@kitware.comwrote: On Aug 24, 2012, at 9:01, Michele Dolfi dolfim...@gmail.com wrote: Hi all, I started using CMake, CTest and CDash, with the simple targets Nightly, Continuous and Experimental: it works very well. Now I would like to divide my project in subproject, so that a failure in compiling one small test is not affecting the full dashboard report. I read that ctest driver files are the way to go. I quickly realized that include(CTest) was automatically setting many variables that are not there in a ctest driver script, i.e. CTEST_SITE, CTEST_BUILD_NAME. Specially for the latter one, I go used to tune the default naming, by looking at my cmake options and some library info (e.g. Boost version). In the ctest script I use ctest_empty_binary_directory(), and I create a basic CMakeCache.txt to start the ctest_configure() afterwards. How can I read cmake options before ctest_start() (at this point I need BUILDNAME to be set!). You should set those variables in the ctest -S script. A ctest -S script is typically coupled to the specific machine and build that it represents, so it's the right place to set those variables. So, since the basic config option (e.g. compiler, in case I want to test more) has to be set in the ctest -S script, I can just use this info to generate the name from there? In my case I would like to put some library version number in the BUILDNAME, in order to easily filter the results in the dashboard. Doing it in the ctest -S means invoking find_library(), i.e. perming the config in two different places. Michele Well, maybe you *should* do it in the CMakeLists then. You can't run find_library in a ctest -S script. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMAKE 2.8.9 not observing CMAKE_FILES_DIRECTORY?
Hi Eric,
OS X 10.8, CMAKE 2.8.9.
In CMAKE 2.8.9 it seems that CMAKE_FILES_DIRECTORY
SET( PROJECT_BINARY_DIR . )
SET( CMAKE_FILES_DIRECTORY ${PROJECT_BINARY_DIR}/output/CMakeFiles )
SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin )
I dont see an 'output/CMakeFiles' created but I do see a 'bin' where
my executable is put.
What makes you think that PROJECT_BINARY_DIR or
CMAKE_FILES_DIRECTORY may be modified?
Ah, well, I had no idea that it was a read-only variable.
So how do people move the location of CMakeFiles and the cache, etc
away from the root? I dont want all the clutter there...
-Jason
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMAKE 2.8.9 not observing CMAKE_FILES_DIRECTORY?
2012/8/24 Jason T. Slack-Moehrle slackmoeh...@gmail.com:
Hi Eric,
OS X 10.8, CMAKE 2.8.9.
In CMAKE 2.8.9 it seems that CMAKE_FILES_DIRECTORY
SET( PROJECT_BINARY_DIR . )
SET( CMAKE_FILES_DIRECTORY ${PROJECT_BINARY_DIR}/output/CMakeFiles )
SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin )
I dont see an 'output/CMakeFiles' created but I do see a 'bin' where
my executable is put.
What makes you think that PROJECT_BINARY_DIR or
CMAKE_FILES_DIRECTORY may be modified?
Ah, well, I had no idea that it was a read-only variable.
So how do people move the location of CMakeFiles and the cache, etc
away from the root? I dont want all the clutter there...
I guess 'root' means your source tree right?
Usually you use out-of-source build:
http://www.cmake.org/Wiki/CMake_FAQ#Out-of-source_build_trees
that way the build tree (a.k.a: PROJECT_BINARY_DIR)
is separated from source tree ((a.k.a: PROJECT_SOURCE_DIR).
That way all generated files goes into the build tree and your source
tree remains clean, i.e. it only contains manually added/modified file.
--
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.org
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Accessing cache variable from CTest script
On Fri, Aug 24, 2012 at 9:46 AM, Davide Mancusi are...@gmail.com wrote:
Hello everyone,
I have tried asking this question on stackoverflow [1] without much
luck, so here we go:
My project links to a third-party library that comes with a valgrind
suppression file, as well as a CMake script. The script stores the
location of the suppression file in a CMake cache variable.
I have written a CTest script to build and test my project and I would
like to use the suppression file during the memory-checking stage.
Unfortunately, the CTest script does not seem to know anything about
the CMake cache. How can I access the CMake cache variable from my
CTest script?
Thanks in advance for the help.
Davide
[1]
http://stackoverflow.com/questions/12108741/access-cmake-cache-variable-from-ctest-script
--
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
I've answered on stackoverflow directly.
For the mailing list record, here's the initial answer I gave there:
You can't directly access CMake cache variables from the ctest -S script.
However, you could possibly:
(1) include the third party CMake script in the ctest -S script with
include (after the update step, so the source tree is up to date)
(2) read the CMakeCache.txt file after the configure step to pull out
the cache variable of interest
For (1), the code would be something like:
include(${CTEST_SOURCE_DIRECTORY}/path/to/3rdParty/script.cmake)
This would only be realistically possible if the script does only
simple things like set variable values that you can then reference. If
it does any CMake-configure-time things like find_library or
add_executable, then you shouldn't do this.
For (2):
file(STRINGS ${CTEST_BINARY_DIRECTORY}/CMakeCache.txt result
REGEX ^CURSES_LIBRARY:FILEPATH=(.*)$)
message(result='${result}')
string(REGEX REPLACE ^CURSES_LIBRARY:FILEPATH=(.*)$ \\1
filename ${result})
message(filename='${filename}')
--
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] Accessing cache variable from CTest script
On Fri, Aug 24, 2012 at 10:42 AM, David Cole david.c...@kitware.com wrote:
On Fri, Aug 24, 2012 at 9:46 AM, Davide Mancusi are...@gmail.com wrote:
Hello everyone,
I have tried asking this question on stackoverflow [1] without much
luck, so here we go:
My project links to a third-party library that comes with a valgrind
suppression file, as well as a CMake script. The script stores the
location of the suppression file in a CMake cache variable.
I have written a CTest script to build and test my project and I would
like to use the suppression file during the memory-checking stage.
Unfortunately, the CTest script does not seem to know anything about
the CMake cache. How can I access the CMake cache variable from my
CTest script?
Thanks in advance for the help.
Davide
[1]
http://stackoverflow.com/questions/12108741/access-cmake-cache-variable-from-ctest-script
--
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
I've answered on stackoverflow directly.
For the mailing list record, here's the initial answer I gave there:
You can't directly access CMake cache variables from the ctest -S script.
However, you could possibly:
(1) include the third party CMake script in the ctest -S script with
include (after the update step, so the source tree is up to date)
(2) read the CMakeCache.txt file after the configure step to pull out
the cache variable of interest
For (1), the code would be something like:
include(${CTEST_SOURCE_DIRECTORY}/path/to/3rdParty/script.cmake)
This would only be realistically possible if the script does only
simple things like set variable values that you can then reference. If
it does any CMake-configure-time things like find_library or
add_executable, then you shouldn't do this.
For (2):
file(STRINGS ${CTEST_BINARY_DIRECTORY}/CMakeCache.txt result
REGEX ^CURSES_LIBRARY:FILEPATH=(.*)$)
message(result='${result}')
string(REGEX REPLACE ^CURSES_LIBRARY:FILEPATH=(.*)$ \\1
filename ${result})
message(filename='${filename}')
Solution (3) also may be a possibility that some would prefer over the
first two suggested:
http://stackoverflow.com/a/12111587/236192
Cheers,
David
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Bug? add_custom_command() ignores head file outputs
Hello all,
I'm relatively new to CMake but I've encountered some unexpected behavior.
Perhaps it's by design or perhaps it's a bug - you tell me. The short story is
this:
It appears that add_custom_command() is ignored if the only OUTPUT is a C
header file (.h). The generated makefiles do not include the custom command.
However, if I also list a C source file (.c) as a second output, the makefiles
get the command.
Here's a simplified setup to reproduce the problem:
-project_dir/---
CMakeLists.txt
hello.c
hello.h
update_hello_h.sh
CMakeLists.txt-
cmake_minimum_required(VERSION 2.8)
project(cmake_test)
set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM ON) #so hello.h never gets
cleaned away
add_custom_command(OUTPUT hello.h COMMAND ./update_hello_h.sh DEPENDS
update_hello_h.sh)
add_executable(hello hello.c)
hello.c
#include stdio.h
#include hello.h
int main(int argc, char ** argv)
{
printf(HELLO_MSG \n);
return 0;
}
---hello.h
#define HELLO_MSG Hello Fri Aug 24 09:01:53 PDT 2012
---update_hello_h.sh-
#!/bin/sh
echo #define HELLO_MSG \Hello `date`\ hello.h
--
What I would expect is for CMake to add a makefile rule to execute
./update_hello_h.sh if it's newer than hello.h. No such rule gets generated.
However, if you add hello.c like so:
add_custom_command(OUTPUT hello.h hello.c COMMAND ./update_hello_h.sh
DEPENDS update_hello_h.sh)
Then a rule gets generated. Is this a bug or am I missing something? I feel
like I'm lying to CMake by telling it that hello.c is an output when it really
isn't.
I'm using CMake 2.8.0 on Ubuntu 10.04.
Much thanks!
- Adam B.
Videx, Inc. | 1105 NE Circle Blvd. | Corvallis, OR 97330 | (541) 738-5500
This email is intended only for the addressee(s) and may include material that
is privileged, confidential, and protected from disclosure. No contract is
intended. ©2012 Videx, Inc.
--
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] Bug? add_custom_command() ignores head file outputs
Adam B wrote: Hello all, I'm relatively new to CMake but I've encountered some unexpected behavior. Perhaps it's by design or perhaps it's a bug - you tell me. The short story is this: It appears that add_custom_command() is ignored if the only OUTPUT is a C header file (.h). The generated makefiles do not include the custom command. However, if I also list a C source file (.c) as a second output, the makefiles get the command. Here's a simplified setup to reproduce the problem: -project_dir/--- CMakeLists.txt hello.c hello.h update_hello_h.sh CMakeLists.txt- cmake_minimum_required(VERSION 2.8) project(cmake_test) set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM ON) #so hello.h never gets cleaned away Who cares, noone builds in the source directory anyway, hm? ;) add_custom_command(OUTPUT hello.h COMMAND ./update_hello_h.sh DEPENDS update_hello_h.sh) add_executable(hello hello.c) Adding hello.h here may fix your problem. 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] Bug? add_custom_command() ignores head file outputs
Hi, On Fri, Aug 24, 2012 at 7:27 PM, Adam B ad...@videx.com wrote: Hello all, I'm relatively new to CMake but I've encountered some unexpected behavior. Perhaps it's by design or perhaps it's a bug - you tell me. The short story is this: It is a bug, but not in CMake, its in your cmake code. It appears that add_custom_command() is ignored if the only OUTPUT is a C header file (.h). The generated makefiles do not include the custom command. However, if I also list a C source file (.c) as a second output, the makefiles get the command. If you look at the add_custom_command documentation you'll notice that it says if a target defined in the same directory depends on the output of a custom command a dependency rule is set up so the custom command runs before the target is being built (slightly different wording, written from the top of my head). Your target however only has the .c file in its source list and hence nothing in your target depends on an output of the custom command and hence no such rule is set up. You can either include the .h file in the list of sources for your target (CMake does not generate compile-rules for files it recognizes as C/C++ headers), you can setup a custom target that depends on the .h file and has some no-op as command and make your executable depend on the custom target or (as you already did) have the .c file in the output of the custom command. Andreas -- 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] Getting started with CMake
Hi, I'm trying to get up and running with CMake for a project I'm working on. The online documentation seems to describe how to write the script/configuration files; I'm trying to first get my head around a more basic overview. Suppose I have a minimal project called foo, that just consists of a single C++ source file, foo.cc. I write the code and put something or other in a source distribution file called foo-1.0.tgz. A potential user downloads this to a plain-vanilla Linux box. At this stage, the user expects to type: tar xzf foo-1.0.tgz cd foo-1.0 ./configure make sudo make install And end up with a binary: /usr/local/bin/foo How does this work with a CMake project? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Getting started with CMake
On Friday 24 August 2012, Russell Wallace wrote: Hi, I'm trying to get up and running with CMake for a project I'm working on. The online documentation seems to describe how to write the script/configuration files; I'm trying to first get my head around a more basic overview. Suppose I have a minimal project called foo, that just consists of a single C++ source file, foo.cc. I write the code and put something or other in a source distribution file called foo-1.0.tgz. A potential user downloads this to a plain-vanilla Linux box. At this stage, the user expects to type: tar xzf foo-1.0.tgz cd foo-1.0 ./configure Here he does cmake . (or better mkdir build cd build cmake .. ) The rest is the same. 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] Getting started with CMake
2012/8/24 Russell Wallace russell.wall...@gmail.com: Hi, I'm trying to get up and running with CMake for a project I'm working on. The online documentation seems to describe how to write the script/configuration files; I'm trying to first get my head around a more basic overview. There several CMake tutorials out there, see: http://www.cmake.org/Wiki/CMake#Tutorials This one: https://github.com/TheErk/CMake-tutorial contains basic example and command line indication as well. Suppose I have a minimal project called foo, that just consists of a single C++ source file, foo.cc. I write the code and put something or other in a source distribution file called foo-1.0.tgz. A potential user downloads this to a plain-vanilla Linux box. At this stage, the user expects to type: tar xzf foo-1.0.tgz cd foo-1.0 ./configure make sudo make install And end up with a binary: /usr/local/bin/foo How does this work with a CMake project? Alex did answer that one already. You may find some relatively generic example here as well http://www.nongnu.org/certi/certi_doc/Install/html/build.html -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Bug? add_custom_command() ignores head file outputs
On 08/24/2012 11:09 AM, Andreas Pakulat wrote: Hi, On Fri, Aug 24, 2012 at 7:27 PM, Adam Bad...@videx.com wrote: Hello all, I'm relatively new to CMake but I've encountered some unexpected behavior. Perhaps it's by design or perhaps it's a bug - you tell me. The short story is this: It is a bug, but not in CMake, its in your cmake code. It appears that add_custom_command() is ignored if the only OUTPUT is a C header file (.h). The generated makefiles do not include the custom command. However, if I also list a C source file (.c) as a second output, the makefiles get the command. If you look at the add_custom_command documentation you'll notice that it says if a target defined in the same directory depends on the output of a custom command a dependency rule is set up so the custom command runs before the target is being built (slightly different wording, written from the top of my head). Your target however only has the .c file in its source list and hence nothing in your target depends on an output of the custom command and hence no such rule is set up. You can either include the .h file in the list of sources for your target (CMake does not generate compile-rules for files it recognizes as C/C++ headers), you can setup a custom target that depends on the .h file and has some no-op as command and make your executable depend on the custom target or (as you already did) have the .c file in the output of the custom command. The light comes on! Thanks for the detailed explanation, Andreas. Adding the .h file to the executable sources list did the trick. (And thank you Eike for suggesting that too.) Andreas Videx, Inc. | 1105 NE Circle Blvd. | Corvallis, OR 97330 | (541) 738-5500 This email is intended only for the addressee(s) and may include material that is privileged, confidential, and protected from disclosure. No contract is intended. ©2012 Videx, Inc. -- 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] Getting started with CMake
Thanks! That's clearer now. I guess using a separate build subdirectory has an advantage in that if something goes wrong you can just scrub that whole subdirectory and try again. a couple of dead links from http://www.cmake.org/Wiki/CMake#Tutorials - the following give 404: http://snikt.net/index.php/2010/04/01/howto-use-cmake-with-cc-projects http://hackerwithin.org/thw/plugin_wiki/page/buildsystems -- 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-developers] [CMake 0013488]: Patch for CPack Debian generator (fix to the auto-dependecy support via dpkg-shlibdeps)
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13488 == Reported By:Stanislav Ravas Assigned To: == Project:CMake Issue ID: 13488 Category: CPack Reproducibility:always Severity: major Priority: normal Status: new == Date Submitted: 2012-08-24 04:57 EDT Last Modified: 2012-08-24 04:57 EDT == Summary:Patch for CPack Debian generator (fix to the auto-dependecy support via dpkg-shlibdeps) Description: When the package contains no binary files, dpkg-shlibdeps is run without executable path(mandatory argument) and fails, package build is aborted. This is especially a problem when building multiple packages per project (component install). I attach the patch: When there are no binary files, dpkg-shlibdeps is not run at all. Steps to Reproduce: Create cmake project with multiple components. Ensure that at least one component contains no binary files (contains doc, sources, ...). When you run cpack -G DEB(or make package), build fails. == Issue History Date ModifiedUsername FieldChange == 2012-08-24 04:57 Stanislav RavasNew Issue 2012-08-24 04:57 Stanislav RavasFile Added: cpackdeb.patch == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Patch to support SVN externals in CTest update
Hello, I have split my changes in a series of small patches. Please find them in attachment. I have made sure that everything is compiling correctly and that the CTest.UpdateSVN test runs successfully between each of them. Some comments about the testing: - Most of the code path added by these patches is executed by the current test. Indeed with this design, the root svn repository and the svn external repositories just use the same SVNInfo structure and the same function calls. - The issue (ie incorrect author and revision number for each modified file) is currently not tested for any of the version control system. Probably this should be added, but this requires some work. - The current organization of the ctest_update() testing uses some common scripts between the different version control system. I don't know yet if it is possible to add tests with svn externals in this organization without breaking the test for the other VC. If I am not too busy, I will try to follow up on the testing part in the coming weeks. Let me know if you have any question or comment. Xavier On Mon, Jul 30, 2012 at 3:56 PM, Brad King brad.k...@kitware.com wrote: On 07/30/2012 09:45 AM, Xavier Besseron wrote: I am affected by the issue in bug 12630 (http://public.kitware.com/Bug/view.php?id=12630), so I prepared a patch. Thanks for working on this! This patch adds support for svn externals during CTest update. I tested it successfully with svn 1.6/1.7, Linux/Windows and with nested externals as well. Summary of the modifications: - Add SVNInfo structure to hold info about each repository - Get the list of external repositories (using 'svn status' and ExternalParser) - Run 'svn info' for all repositories, before and after the update - Run 'svn log' for all repositories - Build the correct path for all updated files (ie add the external prefix and remove the svn base) Let me know if you have any questions or comments. The changes will be much easier to review in smaller pieces. Please split this patch into a series. For example, the first patch should add the SVNInfo infrastructure with no functional changes. Each step in the series should still compile and pass the UpdateSVN test. Separately, please also extend the UpdateSVN test to exercise the new functionality. Thanks, -Brad 0001-Add-the-new-SVNInfo-structure.patch Description: Binary data 0002-Extend-the-SVN-Revision-structure-to-include-info-ab.patch Description: Binary data 0003-Add-the-Repositories-list-and-the-RootInfo-pointer.patch Description: Binary data 0004-Create-the-SVNInfo-for-the-root-repository.patch Description: Binary data 0005-Use-the-SVNInfo-structure-instead-of-the-fields-URL-.patch Description: Binary data 0006-Add-a-LoadExternal-function-and-an-ExternalParser-cl.patch Description: Binary data 0007-Call-LoadExternals-and-perform-operations-on-all-ele.patch Description: Binary data -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Patch to support SVN externals in CTest update
On 08/24/2012 08:50 AM, Xavier Besseron wrote:
I have split my changes in a series of small patches. Please find them
in attachment.
I have made sure that everything is compiling correctly and that the
CTest.UpdateSVN test runs successfully between each of them.
Very nice, the series looks good. Please rewrite the commits to
wrap all C++ code to 79 columns or less. This should be blank:
git log origin/master.. --pickaxe-regex -S'.{80}'
Also do not add a trailing blank line in the first commit to
cmCTestSVN.cxx.
Some comments about the testing:
- Most of the code path added by these patches is executed by the
current test. Indeed with this design, the root svn repository and the
svn external repositories just use the same SVNInfo structure and the
same function calls.
- The issue (ie incorrect author and revision number for each modified
file) is currently not tested for any of the version control system.
Probably this should be added, but this requires some work.
- The current organization of the ctest_update() testing uses some
common scripts between the different version control system. I don't
know yet if it is possible to add tests with svn externals in this
organization without breaking the test for the other VC.
If I am not too busy, I will try to follow up on the testing part in
the coming weeks.
The Git update test has a submodule, so you can look at how that
works without disrupting the common test code.
Thanks,
-Brad
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] Fwd: [cfe-dev] Warm Fuzzies
Go CMake! - sent from my open source android phone. -- Forwarded message -- From: Jordan Rose jordan_r...@apple.com Date: Aug 24, 2012 4:28 PM Subject: [cfe-dev] Warm Fuzzies To: cfe-...@cs.uiuc.edu Developers cfe-...@cs.uiuc.edu Now that the mailing list is back up, I can share this testimonial from my friend: Wow, most impressive. Compiling LLVM + Clang, on Windows. With Visual Studio 2008. It's cross-platform software, without the *nix crap. Calling it straightforward or painless is an understatement. Even _without_ reading the documentation I was _twice_ warned to read, I easily: - Downloaded the source (10 MB archives each, impressive by itself) - Generated the project files with CMake - Compiled in Visual Studio 2008 Total time spent: ~2 hours, from scratch. Oh, and it supports C++11 almost completely. Even Visual Studio doesn't, and neither does GCC. And guess what? Not a _single_ error when compiling it. Binaries work 100% flawlessly. Heck, they even give _colored_ console output. ... on Windows. Oh, and did I mention the source code is outstandingly well-written, readable C++? It almost makes Java look worse. GCC, on the other hand... exact opposite in every way. I don't even know how to begin describing it. Even _with_ reading the documentation (which documentation?), I never once managed to compile it on Windows. That is, _after_ it made me wait _overnight_ on several occasions, with _zero_ payoff for me, and lots of wasted time. I can't find the right words, other than to say... _This_ is how cross-platform is supposed to work. /Massive/ props to the team for the solid work. I won't comment on his actual choice of feedback, but I thought I'd share with everyone. Nice work especially to our heroic VS builders when the majority of us work on Mac or Linux. Jordan ___ cfe-dev mailing list cfe-...@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev -- 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-commits] CMake branch, master, updated. v2.8.9-141-g6dab13c
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 6dab13c56e731d3d8ed6a751a6e0735835acc76f (commit) via a20c41d0328f6a4557789bb382c9b3f69b76ea30 (commit) from 19d9f5908b541a3d61361cbfd1a315ac3f512543 (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=6dab13c56e731d3d8ed6a751a6e0735835acc76f commit 6dab13c56e731d3d8ed6a751a6e0735835acc76f Merge: 19d9f59 a20c41d Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:23:21 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:23:21 2012 -0400 Merge topic 'topics/FindCUDA/Fix-g3-again' a20c41d Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA 3.0. --- Summary of changes: Modules/FindCUDA.cmake | 12 +++- 1 files changed, 11 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-143-gbc147d9
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 bc147d99caa9186b2dc0a431bd6c0f49a1ded594 (commit) via 94c08b368c40da4f39a506440d0c5cf3c4c23c48 (commit) from 6dab13c56e731d3d8ed6a751a6e0735835acc76f (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=bc147d99caa9186b2dc0a431bd6c0f49a1ded594 commit bc147d99caa9186b2dc0a431bd6c0f49a1ded594 Merge: 6dab13c 94c08b3 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:23:33 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:23:33 2012 -0400 Merge topic 'test-ObjectLibrary-lang' 94c08b3 Tests/ObjectLibrary: Do not enable CXX in subdirectories --- Summary of changes: Tests/ObjectLibrary/A/CMakeLists.txt |2 +- Tests/ObjectLibrary/B/CMakeLists.txt |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-147-g6d4a305
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 6d4a3053e63e00f0b0d002ddecd81ff489c97355 (commit) via 8aed02ae0f753dce76a167367ecf54be1d04de2b (commit) via 7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea (commit) via 87fe4286bdb3f4faffbc603697b4a6f3343fb4ec (commit) from bc147d99caa9186b2dc0a431bd6c0f49a1ded594 (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=6d4a3053e63e00f0b0d002ddecd81ff489c97355 commit 6d4a3053e63e00f0b0d002ddecd81ff489c97355 Merge: bc147d9 8aed02a Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:23:42 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:23:42 2012 -0400 Merge topic 'DependencyScanning_13474' 8aed02a -fix Java dependency scanning, broken in previous commit 7ae4479 -fix line length 87fe428 fix #13474: also rescan dependencies if the depender does not exist --- Summary of changes: Source/cmDepends.cxx | 63 + Source/cmDepends.h |1 + Source/cmDependsJava.cxx |2 +- Source/cmDependsJava.h |3 +- 4 files changed, 50 insertions(+), 19 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-152-g4f7731d
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 4f7731d814d4228165c70ec9fd6b580e5541ddc6 (commit) via ee949d8871ababb7bde5c03b9ac77c4b15b3f786 (commit) via ecc1acb94cbfa12045ec94e11013cbfe6a3bd136 (commit) via 805f5e5c1e32c878b63e10f167e667a05a460f3e (commit) via 389d42317743952e2e78393601c20b826ce95d30 (commit) from 6d4a3053e63e00f0b0d002ddecd81ff489c97355 (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=4f7731d814d4228165c70ec9fd6b580e5541ddc6 commit 4f7731d814d4228165c70ec9fd6b580e5541ddc6 Merge: 6d4a305 ee949d8 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:23:52 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:23:52 2012 -0400 Merge topic 'minor-docs-fixes' ee949d8 Remove duplicate 'of' from docs. ecc1acb Remove incorrect doc string for link type enum 805f5e5 Fix some typos in the docs. 389d423 Add missing whitespace to docs. --- Summary of changes: Source/cmDocumentVariables.cxx |6 +++--- Source/cmTarget.cxx|2 +- Source/cmTarget.h |3 --- 3 files changed, 4 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-154-g56591cb
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 56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d (commit) via c82fbe0c1f9c39db2421afc1079e2aa071f50a37 (commit) from 4f7731d814d4228165c70ec9fd6b580e5541ddc6 (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=56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d commit 56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d Merge: 4f7731d c82fbe0 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:24:01 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:24:01 2012 -0400 Merge topic 'pic-docs' c82fbe0 Fix unfortunate documentation error for PIC feature. --- Summary of changes: Source/cmDocumentVariables.cxx |2 +- Source/cmTarget.cxx|5 - 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-167-ga9a3b3b
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 a9a3b3b8972d741d1607e25b1ee5739742e9cb6c (commit) via 4c9ae472ecb1a2b8e8ce0b115d0f54bf5f875fb1 (commit) from ed01420c2337bd641a62d6ae5e7d81eb81d41cac (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=a9a3b3b8972d741d1607e25b1ee5739742e9cb6c commit a9a3b3b8972d741d1607e25b1ee5739742e9cb6c Merge: ed01420 4c9ae47 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:24:46 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:24:46 2012 -0400 Merge topic 'VS11-WinRT-project-issue-12930' 4c9ae47 VS11: Rename 'Immersive' to 'WindowsAppContainer' (#12930) --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx |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.9-169-g38876a3
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 38876a39036eaa2bdcc187aac93c96c6e8d6c95f (commit) via f0ae381c73dd2b421cb7df407152ad4498428fc2 (commit) from a9a3b3b8972d741d1607e25b1ee5739742e9cb6c (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=38876a39036eaa2bdcc187aac93c96c6e8d6c95f commit 38876a39036eaa2bdcc187aac93c96c6e8d6c95f Merge: a9a3b3b f0ae381 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:24:58 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:24:58 2012 -0400 Merge topic 'VS10-PrecompiledHeader-default' f0ae381 VS: Disable precompiled headers unless enabled by project (#12930) --- Summary of changes: Source/cmVisualStudio10TargetGenerator.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
[Cmake-commits] CMake branch, master, updated. v2.8.9-172-g4ac85d0
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 4ac85d07766ff2bb51493b0f6ddcef2cb59805e4 (commit)
via 9b2dda5db57415e6f8b910e0fa3d770ec478e9f3 (commit)
via 4cb99b1dbc3932a74a7c34b0b31187e0e913d625 (commit)
from 38876a39036eaa2bdcc187aac93c96c6e8d6c95f (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=4ac85d07766ff2bb51493b0f6ddcef2cb59805e4
commit 4ac85d07766ff2bb51493b0f6ddcef2cb59805e4
Merge: 38876a3 9b2dda5
Author: David Cole david.c...@kitware.com
AuthorDate: Fri Aug 24 14:25:12 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 24 14:25:12 2012 -0400
Merge topic 'vs11-flag-table'
9b2dda5 VS11: Generate flag tables from MSBuild V110 tool files
4cb99b1 cmparseMSBuildXML: Include DisplayName in the output
---
Summary of changes:
.../{cmVS10CLFlagTable.h = cmVS11CLFlagTable.h} | 31 ++--
.../{cmVS10LibFlagTable.h = cmVS11LibFlagTable.h} |4 +-
...cmVS10LinkFlagTable.h = cmVS11LinkFlagTable.h} | 50 +--
Source/cmVisualStudio10TargetGenerator.cxx | 35 --
Source/cmparseMSBuildXML.py| 25 ++
5 files changed, 117 insertions(+), 28 deletions(-)
copy Source/{cmVS10CLFlagTable.h = cmVS11CLFlagTable.h} (89%)
copy Source/{cmVS10LibFlagTable.h = cmVS11LibFlagTable.h} (98%)
copy Source/{cmVS10LinkFlagTable.h = cmVS11LinkFlagTable.h} (87%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-182-gdb78df7
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 db78df744f71cada436c21499cc22a86554a6de4 (commit) via 2c7a451de003782b1ba5e47ab377f33f1fa5c4e5 (commit) from 0a9b51b6bca1bfdcaa052aa83a86657540999ff9 (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=db78df744f71cada436c21499cc22a86554a6de4 commit db78df744f71cada436c21499cc22a86554a6de4 Merge: 0a9b51b 2c7a451 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:25:29 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:25:29 2012 -0400 Merge topic 'vs-AddPlatformDefinitions-cleanup' 2c7a451 VS: Cleanup AddPlatformDefinitions() of Visual Studio generators --- Summary of changes: Source/cmGlobalVisualStudio10Generator.cxx |9 + Source/cmGlobalVisualStudio10Generator.h|1 - Source/cmGlobalVisualStudio10IA64Generator.cxx |3 +-- Source/cmGlobalVisualStudio10Win64Generator.cxx |3 +-- Source/cmGlobalVisualStudio11ARMGenerator.cxx | 15 ++- Source/cmGlobalVisualStudio11ARMGenerator.h |4 +--- Source/cmGlobalVisualStudio11Generator.cxx |9 + Source/cmGlobalVisualStudio11Generator.h|1 - Source/cmGlobalVisualStudio11Win64Generator.cxx |8 ++-- Source/cmGlobalVisualStudio11Win64Generator.h |2 +- Source/cmGlobalVisualStudio6Generator.cxx |5 ++--- Source/cmGlobalVisualStudio71Generator.cxx |9 + Source/cmGlobalVisualStudio71Generator.h|1 - Source/cmGlobalVisualStudio7Generator.cxx |8 +--- Source/cmGlobalVisualStudio7Generator.h |1 - Source/cmGlobalVisualStudio8Generator.cxx | 10 +- Source/cmGlobalVisualStudio8Generator.h |3 --- Source/cmGlobalVisualStudio9Generator.cxx |9 + Source/cmGlobalVisualStudio9Generator.h |1 - Source/cmGlobalVisualStudioGenerator.cxx| 14 ++ Source/cmGlobalVisualStudioGenerator.h |5 + 21 files changed, 43 insertions(+), 78 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-191-g34a0284
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 34a0284603e3f4c746140d4c94eab98f9e513a8d (commit) via 403ead65947751697dc17021b639caa12c6ac74a (commit) via 8be51f6694184fb9044389fb1e18ad1765f6476c (commit) via ec22a9b5217c2110db9af1791a61a7552144f028 (commit) via 66cb3356f508da309d599f6148763f7afe3802e1 (commit) via 89595d6bceb25ecfa221342f03d1c3dce70c8484 (commit) via 965a69dcaa0b67c730f45487abeee97ef652d545 (commit) via 9a9e1ee98d59ba1ed2a89a2858224a7f8a92bbf6 (commit) via b8b5c8342a2a2de5f57f9dd83435060b4eb825a8 (commit) from db78df744f71cada436c21499cc22a86554a6de4 (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=34a0284603e3f4c746140d4c94eab98f9e513a8d commit 34a0284603e3f4c746140d4c94eab98f9e513a8d Merge: db78df7 403ead6 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:25:40 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Aug 24 14:25:40 2012 -0400 Merge topic 'ide-compiler-id' 403ead6 Document CMAKE_LANG_COMPILER_(ID|VERSION) values 8be51f6 Test variables CMAKE_(C|CXX|Fortran)_COMPILER(|_ID|_VERSION) ec22a9b Cleanly enable a language in multiple subdirectories 66cb335 VS: Detect the compiler id and tool location 89595d6 VS10: Define CMAKE_VS_PLATFORM_TOOLSET variable 965a69d Xcode: Detect the compiler id and tool location 9a9e1ee CMakeDetermineCompilerId: Prepare to detect IDE compiler id b8b5c83 Re-order C/C++/Fortran compiler determination logic --- Summary of changes: Modules/CMakeDetermineCCompiler.cmake| 115 +++--- Modules/CMakeDetermineCXXCompiler.cmake | 128 +++- Modules/CMakeDetermineCompilerId.cmake | 151 --- Modules/CMakeDetermineFortranCompiler.cmake | 178 +++--- Modules/CompilerId/VS-10.vcxproj.in | 53 +++ Modules/CompilerId/VS-6.dsp.in | 48 ++ Modules/CompilerId/VS-7.vcproj.in| 60 Modules/CompilerId/Xcode-1.pbxproj.in| 120 +++ Modules/CompilerId/Xcode-2.pbxproj.in| 119 +++ Modules/CompilerId/Xcode-3.pbxproj.in| 107 + Source/cmDocumentVariables.cxx | 42 +- Source/cmGlobalGenerator.cxx | 24 ++-- Source/cmGlobalVisualStudio10Generator.cxx | 11 ++ Source/cmGlobalVisualStudio10Generator.h |1 + Tests/CMakeOnly/CMakeLists.txt |6 + Tests/CMakeOnly/CompilerIdC/CMakeLists.txt | 14 ++ Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt | 14 ++ Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt | 22 +++ 18 files changed, 961 insertions(+), 252 deletions(-) create mode 100644 Modules/CompilerId/VS-10.vcxproj.in create mode 100644 Modules/CompilerId/VS-6.dsp.in create mode 100644 Modules/CompilerId/VS-7.vcproj.in create mode 100644 Modules/CompilerId/Xcode-1.pbxproj.in create mode 100644 Modules/CompilerId/Xcode-2.pbxproj.in create mode 100644 Modules/CompilerId/Xcode-3.pbxproj.in create mode 100644 Tests/CMakeOnly/CompilerIdC/CMakeLists.txt create mode 100644 Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt create mode 100644 Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-272-g8d6c1ce
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 8d6c1ced286ffbf4f50384273b186cc60bd747d3 (commit) via 34a0284603e3f4c746140d4c94eab98f9e513a8d (commit) via db78df744f71cada436c21499cc22a86554a6de4 (commit) via 0a9b51b6bca1bfdcaa052aa83a86657540999ff9 (commit) via 4ac85d07766ff2bb51493b0f6ddcef2cb59805e4 (commit) via 38876a39036eaa2bdcc187aac93c96c6e8d6c95f (commit) via a9a3b3b8972d741d1607e25b1ee5739742e9cb6c (commit) via ed01420c2337bd641a62d6ae5e7d81eb81d41cac (commit) via 05784dadc59ee3c87ab6140d684ff4c602de9ec1 (commit) via 286f7c9644d1fb8ac8b5d46e2a3c9c393680acef (commit) via 56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d (commit) via 4f7731d814d4228165c70ec9fd6b580e5541ddc6 (commit) via 6d4a3053e63e00f0b0d002ddecd81ff489c97355 (commit) via bc147d99caa9186b2dc0a431bd6c0f49a1ded594 (commit) via 6dab13c56e731d3d8ed6a751a6e0735835acc76f (commit) from df710b855b3990db579cfd904a55aa4ada275ae2 (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=8d6c1ced286ffbf4f50384273b186cc60bd747d3 commit 8d6c1ced286ffbf4f50384273b186cc60bd747d3 Merge: df710b8 34a0284 Author: David Cole david.c...@kitware.com AuthorDate: Fri Aug 24 14:27:30 2012 -0400 Commit: David Cole david.c...@kitware.com CommitDate: Fri Aug 24 14:27:30 2012 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-275-gf84d7b9
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 f84d7b95ebcfa32c02f8b9651b3729be2e936c77 (commit)
via 3df81b49126cf6dc3e4e9a8fa8c368f33886db54 (commit)
via 7195aca54f40778f41894c9e62649afe09e71d6c (commit)
from 8d6c1ced286ffbf4f50384273b186cc60bd747d3 (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=f84d7b95ebcfa32c02f8b9651b3729be2e936c77
commit f84d7b95ebcfa32c02f8b9651b3729be2e936c77
Merge: 8d6c1ce 3df81b4
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Aug 24 14:47:40 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 24 14:47:40 2012 -0400
Merge topic 'cmake-platform-info-version' into next
3df81b4 Move CMAKE_LANG_COMPILER_WORKS to compiler information files
7195aca Make platform information files specific to the CMake version
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3df81b49126cf6dc3e4e9a8fa8c368f33886db54
commit 3df81b49126cf6dc3e4e9a8fa8c368f33886db54
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Aug 24 09:10:34 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Aug 24 10:52:23 2012 -0400
Move CMAKE_LANG_COMPILER_WORKS to compiler information files
Since the parent commit this test result is specific to the version of
CMake. Store it in the version-specific compiler information files
instead of CMakeCache.txt so testing can be re-done to meet the
requirements of the current version of CMake even if another version of
CMake was already used to configure the build tree.
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index b4eabe5..9d63033 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -9,6 +9,7 @@ set(CMAKE_RANLIB @CMAKE_RANLIB@)
set(CMAKE_LINKER @CMAKE_LINKER@)
set(CMAKE_COMPILER_IS_GNUCC @CMAKE_COMPILER_IS_GNUCC@)
set(CMAKE_C_COMPILER_LOADED 1)
+set(CMAKE_C_COMPILER_WORKS @CMAKE_C_COMPILER_WORKS@)
set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
if(CMAKE_COMPILER_IS_CYGWIN)
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index b6477df..2e891b3 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -9,6 +9,7 @@ set(CMAKE_RANLIB @CMAKE_RANLIB@)
set(CMAKE_LINKER @CMAKE_LINKER@)
set(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@)
set(CMAKE_CXX_COMPILER_LOADED 1)
+set(CMAKE_CXX_COMPILER_WORKS @CMAKE_CXX_COMPILER_WORKS@)
set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
if(CMAKE_COMPILER_IS_CYGWIN)
diff --git a/Modules/CMakeForceCompiler.cmake b/Modules/CMakeForceCompiler.cmake
index 980cc17..207c8ad 100644
--- a/Modules/CMakeForceCompiler.cmake
+++ b/Modules/CMakeForceCompiler.cmake
@@ -46,7 +46,6 @@ macro(CMAKE_FORCE_C_COMPILER compiler id)
set(CMAKE_C_COMPILER ${compiler})
set(CMAKE_C_COMPILER_ID_RUN TRUE)
set(CMAKE_C_COMPILER_ID ${id})
- set(CMAKE_C_COMPILER_WORKS TRUE)
set(CMAKE_C_COMPILER_FORCED TRUE)
# Set old compiler id variables.
@@ -59,7 +58,6 @@ macro(CMAKE_FORCE_CXX_COMPILER compiler id)
set(CMAKE_CXX_COMPILER ${compiler})
set(CMAKE_CXX_COMPILER_ID_RUN TRUE)
set(CMAKE_CXX_COMPILER_ID ${id})
- set(CMAKE_CXX_COMPILER_WORKS TRUE)
set(CMAKE_CXX_COMPILER_FORCED TRUE)
# Set old compiler id variables.
@@ -72,7 +70,6 @@ macro(CMAKE_FORCE_Fortran_COMPILER compiler id)
set(CMAKE_Fortran_COMPILER ${compiler})
set(CMAKE_Fortran_COMPILER_ID_RUN TRUE)
set(CMAKE_Fortran_COMPILER_ID ${id})
- set(CMAKE_Fortran_COMPILER_WORKS TRUE)
set(CMAKE_Fortran_COMPILER_FORCED TRUE)
# Set old compiler id variables.
diff --git a/Modules/CMakeFortranCompiler.cmake.in
b/Modules/CMakeFortranCompiler.cmake.in
index c7529fc..9ed3aac 100644
--- a/Modules/CMakeFortranCompiler.cmake.in
+++ b/Modules/CMakeFortranCompiler.cmake.in
@@ -7,6 +7,7 @@ set(CMAKE_AR @CMAKE_AR@)
set(CMAKE_RANLIB @CMAKE_RANLIB@)
set(CMAKE_COMPILER_IS_GNUG77 @CMAKE_COMPILER_IS_GNUG77@)
set(CMAKE_Fortran_COMPILER_LOADED 1)
+set(CMAKE_Fortran_COMPILER_WORKS @CMAKE_Fortran_COMPILER_WORKS@)
set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
if(CMAKE_COMPILER_IS_CYGWIN)
diff --git a/Modules/CMakeTestCCompiler.cmake b/Modules/CMakeTestCCompiler.cmake
index c011092..796ec10 100644
--- a/Modules/CMakeTestCCompiler.cmake
+++ b/Modules/CMakeTestCCompiler.cmake
@@ -1,6 +1,6 @@
[Cmake-commits] CMake branch, next, updated. v2.8.9-281-g7cf38c8
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 7cf38c892120874285383f1f58ac6b3e0d3fd5fb (commit)
via 851f14fe5751bfde234e66d658f619bddd31ba35 (commit)
via 2b06daba3844845a71f26dcdd46e7d634d76a888 (commit)
via 2eef09805f55e1ad6e98e78c950e5da4c52f6c10 (commit)
via ee89573b1a0abf5c8c3daf59c8a3fe18f5df6dbf (commit)
via 32db033b2713d40899865a06f03d83373078eaa3 (commit)
from f84d7b95ebcfa32c02f8b9651b3729be2e936c77 (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=7cf38c892120874285383f1f58ac6b3e0d3fd5fb
commit 7cf38c892120874285383f1f58ac6b3e0d3fd5fb
Merge: f84d7b9 851f14f
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Aug 24 15:02:04 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 24 15:02:04 2012 -0400
Merge topic 'resolve/msvc-compiler-info/vs-link-rsp' into next
851f14f Merge branch 'vs-link-rsp' into msvc-compiler-info
2b06dab Merge branch 'cmake-platform-info-version' into msvc-compiler-info
2eef098 Modernize MSVC compiler information files
ee89573 VS: Simplify MSVC version reporting
32db033 VS: Remove support for free version 2003 tools
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=851f14fe5751bfde234e66d658f619bddd31ba35
commit 851f14fe5751bfde234e66d658f619bddd31ba35
Merge: 2b06dab f50f3cb
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Aug 24 15:00:03 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Aug 24 15:00:03 2012 -0400
Merge branch 'vs-link-rsp' into msvc-compiler-info
Conflicts:
Modules/Platform/Windows-cl.cmake
diff --cc Modules/Platform/Windows-MSVC.cmake
index ac31dd6,000..d7b5bf6
mode 100644,00..100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@@ -1,204 -1,0 +1,207 @@@
+
+#=
+# Copyright 2001-2012 Kitware, Inc.
+#
+# 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.)
+
+# This module is shared by multiple languages; use include blocker.
+if(__WINDOWS_MSVC)
+ return()
+endif()
+set(__WINDOWS_MSVC 1)
+
+set(CMAKE_LIBRARY_PATH_FLAG -LIBPATH:)
+set(CMAKE_LINK_LIBRARY_FLAG )
+set(MSVC 1)
+
+# hack: if a new cmake (which uses CMAKE__LINKER) runs on an old build tree
+# (where link was hardcoded) and where CMAKE_LINKER isn't in the cache
+# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't
rerun)
+# hardcode CMAKE_LINKER here to link, so it behaves as it did before, Alex
+if(NOT DEFINED CMAKE_LINKER)
+ set(CMAKE_LINKER link)
+endif()
+
+if(CMAKE_VERBOSE_MAKEFILE)
+ set(CMAKE_CL_NOLOGO)
+else()
+ set(CMAKE_CL_NOLOGO /nologo)
+endif()
+
+set(WIN32 1)
+
+set(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
+set(CMAKE_CREATE_CONSOLE_EXE /subsystem:console)
+
+if(CMAKE_GENERATOR MATCHES Visual Studio 6)
+ set (CMAKE_NO_BUILD_TYPE 1)
+endif()
+if(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES Visual Studio)
+ set (CMAKE_NO_BUILD_TYPE 1)
+ set (CMAKE_CONFIGURATION_TYPES Debug;Release;MinSizeRel;RelWithDebInfo
CACHE STRING
+ Semicolon separated list of supported configuration types, only
supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be
ignored.)
+ mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
+endif()
+
+# make sure to enable languages after setting configuration types
+enable_language(RC)
+set(CMAKE_COMPILE_RESOURCE rc FLAGS /foOBJECT SOURCE)
+
+if(${CMAKE_GENERATOR} MATCHES Visual Studio)
+ set(MSVC_IDE 0)
+else()
+ set(MSVC_IDE 1)
+endif()
+
+if(NOT MSVC_VERSION)
+ if(CMAKE_C_COMPILER_VERSION)
+set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
+ else()
+set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
+ endif()
+ if(${_compiler_version} MATCHES ^([0-9]+)\\.([0-9]+))
+set(MSVC_VERSION ${CMAKE_MATCH_1}${CMAKE_MATCH_2})
+ else()
+message(FATAL_ERROR MSVC compiler version not detected properly:
${_compiler_version})
+ endif()
+
+ set(MSVC10)
+ set(MSVC11)
+ set(MSVC60)
+ set(MSVC70)
+
[Cmake-commits] CMake branch, next, updated. v2.8.9-283-g3fe05b5
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 3fe05b56ecc9857504a6699d702f9377e430ee1c (commit)
via e5fee8a7c2873531c8e8e8ee991e8d0697f9bf73 (commit)
from 7cf38c892120874285383f1f58ac6b3e0d3fd5fb (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=3fe05b56ecc9857504a6699d702f9377e430ee1c
commit 3fe05b56ecc9857504a6699d702f9377e430ee1c
Merge: 7cf38c8 e5fee8a
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Aug 24 15:25:01 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 24 15:25:01 2012 -0400
Merge topic 'cmake-platform-info-version' into next
e5fee8a Store ABI detection results in compiler information files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5fee8a7c2873531c8e8e8ee991e8d0697f9bf73
commit e5fee8a7c2873531c8e8e8ee991e8d0697f9bf73
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Aug 24 15:15:14 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Aug 24 15:15:14 2012 -0400
Store ABI detection results in compiler information files
Drop use of cache entry CMAKE_DETERMINE_LANG_ABI_COMPILED and replace
it with variable CMAKE_LANG_ABI_COMPILED. Since the grandparent
commit this test result is specific to the version of CMake. Store it
in the version-specific compiler information files instead of
CMakeCache.txt so testing can be re-done to meet the requirements of the
current version of CMake even if another version of CMake was already
used to configure the build tree.
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 9d63033..17d63eb 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -10,6 +10,7 @@ set(CMAKE_LINKER @CMAKE_LINKER@)
set(CMAKE_COMPILER_IS_GNUCC @CMAKE_COMPILER_IS_GNUCC@)
set(CMAKE_C_COMPILER_LOADED 1)
set(CMAKE_C_COMPILER_WORKS @CMAKE_C_COMPILER_WORKS@)
+set(CMAKE_C_ABI_COMPILED @CMAKE_C_ABI_COMPILED@)
set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
if(CMAKE_COMPILER_IS_CYGWIN)
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index 2e891b3..7f66be5 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -10,6 +10,7 @@ set(CMAKE_LINKER @CMAKE_LINKER@)
set(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@)
set(CMAKE_CXX_COMPILER_LOADED 1)
set(CMAKE_CXX_COMPILER_WORKS @CMAKE_CXX_COMPILER_WORKS@)
+set(CMAKE_CXX_ABI_COMPILED @CMAKE_CXX_ABI_COMPILED@)
set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
if(CMAKE_COMPILER_IS_CYGWIN)
diff --git a/Modules/CMakeDetermineCompilerABI.cmake
b/Modules/CMakeDetermineCompilerABI.cmake
index ee4b60e..75247d9 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -19,7 +19,7 @@
include(${CMAKE_ROOT}/Modules/CMakeParseImplicitLinkInfo.cmake)
function(CMAKE_DETERMINE_COMPILER_ABI lang src)
- if(NOT DEFINED CMAKE_DETERMINE_${lang}_ABI_COMPILED)
+ if(NOT DEFINED CMAKE_${lang}_ABI_COMPILED)
message(STATUS Detecting ${lang} compiler ABI info)
# Compile the ABI identification source.
@@ -28,7 +28,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
set(CMAKE_FLAGS -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG})
endif()
-try_compile(CMAKE_DETERMINE_${lang}_ABI_COMPILED
+try_compile(CMAKE_${lang}_ABI_COMPILED
${CMAKE_BINARY_DIR} ${src}
CMAKE_FLAGS ${CMAKE_FLAGS}
-DCMAKE_${lang}_STANDARD_LIBRARIES=
@@ -39,9 +39,13 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
OUTPUT_VARIABLE OUTPUT
COPY_FILE ${BIN}
)
+# Move result from cache to normal variable.
+set(CMAKE_${lang}_ABI_COMPILED ${CMAKE_${lang}_ABI_COMPILED})
+unset(CMAKE_${lang}_ABI_COMPILED CACHE)
+set(CMAKE_${lang}_ABI_COMPILED ${CMAKE_${lang}_ABI_COMPILED} PARENT_SCOPE)
# Load the resulting information strings.
-if(CMAKE_DETERMINE_${lang}_ABI_COMPILED)
+if(CMAKE_${lang}_ABI_COMPILED)
message(STATUS Detecting ${lang} compiler ABI info - done)
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
Detecting ${lang} compiler ABI info compiled with the following
output:\n${OUTPUT}\n\n)
diff --git a/Modules/CMakeFortranCompiler.cmake.in
b/Modules/CMakeFortranCompiler.cmake.in
index 9ed3aac..55f8277 100644
---
[Cmake-commits] CMake branch, master, updated. v2.8.9-192-g78b3093
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 78b30939a8b5c0706ee17a01bc70952ec82fee45 (commit) from 34a0284603e3f4c746140d4c94eab98f9e513a8d (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=78b30939a8b5c0706ee17a01bc70952ec82fee45 commit 78b30939a8b5c0706ee17a01bc70952ec82fee45 Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Aug 25 00:01:02 2012 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Aug 25 00:01:02 2012 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3bdb60c..72ed577 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 9) -set(CMake_VERSION_TWEAK 20120824) +set(CMake_VERSION_TWEAK 20120825) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
