Re: [cmake-developers] Specifying VS target platform
On Mon, 17 Sep 2012 09:57:28 -0400, Brad King wrote:
On 09/14/2012 05:59 PM, Patrick Gansterer wrote:
Maybe you can merge the first patch already.
Yes, done.
The idea of a generator platform is not generic among all
generators.
Rather than the general CMAKE_GENERATOR_PLATFORM infrastructure I'd
generator-specific handling. The value of -GP should be passed to
the
global generator created from -G. If the generator does not
support
platform specification in this way then -GP should be an error (all
generators except VS = 8). If the generator does support -GP then
it
should do its own thing to save the value. For VS save it in a
cache
entry like CMAKE_VS_PLATFORM (we have CMAKE_VS_PLATFORM_TOOLSET
already for the VS 10 toolchain in some cases).
I'm not a big fan of your ideas: What about the parts where we
pass the generator platform to other parts? Do we want to add
branches for every generator type to get get correct value for
the -GP parameter (e.g. if (CMAKE_GENERATOR == Visual Studio
...) -GP ${CMAKE_VS_PLATFORM})? IMHO that's not a good
idea. Also handling for making sure that generator platform
isn't changed by the user (like we do for -G already) in a
second run of CMake must be duplicated later if we add -GP to
more than one generator. (and so on...)
Good points, but we still need to reject -GP when using generators
for which it does not make sense. I think it may be moot anyway;
see below.
I realized that existing projects may test ${CMAKE_GENERATOR} to
look
for things like Win64. For compatibility we need to make sure
that
-G Visual Studio 10 -GP x64
results in CMAKE_GENERATOR being set to
-G Visual Studio 10 Win64
while processing CMake code even if it is not used that way
internally. Of course for future VS versions the generator names
will not need to work this way, only the existing ones.
Since we need to support -G Visual Studio 10 Win64 anyway, I don't
see
much problem if such cases will work with -G Visual Studio 10
Win64,
but not with -G Visual Studio 10 -GP x64.
We are talking about changing the way the user selects the generator
in the GUI to be equivalent to -G/-GP. We cannot process existing
projects differently depending on how the generator was selected.
I also know there are projects that pass ${CMAKE_GENERATOR} to
internal invocations of CMake in order to say build it like I'm
built. These paths would not work if any information moved over
to CMAKE_GENERATOR_PLATFORM or an equivalent variable.
I think the value of -GP has to be stored in CMAKE_GENERATOR at
the end of the generator name as it is now. The new option and GUI
updates are really just about simplifying the selection of the
generator and avoiding per-platform global generators in the internal
implementation. Users can either use -G and specify the full
generator name with platform or use -G/-GP separately but either way
the value of CMAKE_GENERATOR will be the same.
This can probably be improved in the future with a new cmake policy
but I don't want to open that can of worms just for WinCE. I think
you can implement -G/-GP such that the values are both stored in the
CMAKE_GENERATOR value. Internally we won't need a separate global
generator for every platform anymore, but that does not change the
public interface.
If we store everything in one variable (via string concatenation) I
don't see much value in an extra -GP switch. We need to split the
${CMAKE_GENERATOR} variable into generator+platform then all the time
anyway.
Maybe we can only change to current exact match of the generator name
to a startsWith and let the global generator class decide if the
generator name is valid?
-- Patrick
--
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] Specifying VS target platform
On 09/18/2012 02:23 AM, Patrick Gansterer wrote:
If we store everything in one variable (via string concatenation) I
don't see much value in an extra -GP switch. We need to split the
${CMAKE_GENERATOR} variable into generator+platform then all the time
anyway.
Maybe we can only change to current exact match of the generator name
to a startsWith and let the global generator class decide if the
generator name is valid?
Yes, something like that in cmake::CreateGlobalGenerator will work.
It will be nice to get rid of the platform-varied generator classes.
The reference documentation we generate explicitly lists all names
with the platforms right now. That will have to be refactored to
list the platformless names with a note about where to specify the
platform name. Then we need a per-generator list of platform names
along with a note that one specifies Win32 by leaving the platform
name off.
Thanks,
-Brad
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On Monday 17 September 2012, Alexander Neundorf wrote: On Monday 17 September 2012, Alexander Neundorf wrote: On Monday 17 September 2012, Brad King wrote: On 09/15/2012 04:45 PM, Alexander Neundorf wrote: There is now a branch export-sets-2 on cmake stage. It cherry-picks a lot of the patches from http://gitorious.org/~urkud1/cmake/urkud-cmake/commits/w/export-set, mostly those from May, and then proceeds a bit differently. In the end, cmake now checks whether a target which is missing in the current export set has been exported and installed exactly once, gets the correct name from that one installation (i.e. the used namespace), and uses that. That simple approach will allow us to move forward with this. If anyone wants multiple exports of the same targets then they can add the explicit export set DEPENDS options later. Cool. The tests are not yet passing, I'll work on this. The tests are passing now. I had to change the order how the target files are included in the test, so that the required targets already exist when the other targets are set up. I pushed that to stage too. I think basically we're back to generating useful error messages again... How about defining a variable which can be set by Config-files which holds an error message for the case that the Config-file has set package_FOUND to FALSE ? Like e.g. package_FIND_FAILURE_MESSAGE ? This could then be printed by cmFindPackage and/or FPHSA ? 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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Exporting dependent library targets in multiple export sets
On 09/18/2012 04:12 PM, Alexander Neundorf wrote: How about defining a variable which can be set by Config-files which holds an error message for the case that the Config-file has set package_FOUND to FALSE ? Like e.g. package_FIND_FAILURE_MESSAGE ? This could then be printed by cmFindPackage and/or FPHSA ? It sounds okay to me. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Tests with custom launchers and Not Run
On 09/12/2012 11:23 PM, Mathias Gaunard wrote: On 12/09/2012 22:39, Mathias Gaunard wrote: I'd be content with just interpreting a return value of 77 as a Not Run status; this is a fairly trivial change that should work well in any existing setups. I don't think it is really needed to make things as complex as in the bug report. Any intelligence, if required, can go in the test command itself. Simple patch attached. This fulfills my needs well enough and I've just configured my cross-compilation test servers to use it. This is simple and works. Is it satisfying? Any chance of having it included? -- 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] Tests with custom launchers and Not Run
I don't like it. Existing tests that run and return, for example, a number of errors that occurred, will magically appear as not run when that number just so happens to be 77. If there are enough people who think this is simple and works and are not concerned about the accidental matching of an intentional return value of 77 that does NOT mean not run ... then I will relent and say, so be it, and allow it in. But only if there are some people who speak up here or add notes to the bug. It just seems wrong to me to treat 77 as some special number here. On Tue, Sep 18, 2012 at 5:11 PM, Mathias Gaunard mathias.gaun...@ens-lyon.org wrote: On 09/12/2012 11:23 PM, Mathias Gaunard wrote: On 12/09/2012 22:39, Mathias Gaunard wrote: I'd be content with just interpreting a return value of 77 as a Not Run status; this is a fairly trivial change that should work well in any existing setups. I don't think it is really needed to make things as complex as in the bug report. Any intelligence, if required, can go in the test command itself. Simple patch attached. This fulfills my needs well enough and I've just configured my cross-compilation test servers to use it. This is simple and works. Is it satisfying? Any chance of having it included? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/** opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/**CMake_FAQhttp://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-**bin/mailman/listinfo/cmake-**developershttp://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- 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] Tests with custom launchers and Not Run
On 09/18/2012 11:37 PM, David Cole wrote: I don't like it. Existing tests that run and return, for example, a number of errors that occurred, will magically appear as not run when that number just so happens to be 77. If there are enough people who think this is simple and works and are not concerned about the accidental matching of an intentional return value of 77 that does NOT mean not run ... then I will relent and say, so be it, and allow it in. But only if there are some people who speak up here or add notes to the bug. It just seems wrong to me to treat 77 as some special number here. Well, you need to interpret a return value as a special value to be able to tell executables could not be tested. Without this, a whole category status is entirely unusable to whoever wants to use custom launchers! That's a pretty serious issue to me. 77 already exists in the autotools world, so it seems like a good idea to re-use it. Making the executable return the number of failing tests is a very bad idea: it doesn't even scale beyond 255 for the average operating system. Certain operating systems also have funny behaviour with exit status as well: with OpenVMS, all even values are considered failures and all odd values are considered successes. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0013548]: Updated cmake-mode.el
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13548 == Reported By:tschutter Assigned To: == Project:CMake Issue ID: 13548 Category: Documentation Reproducibility:N/A Severity: minor Priority: normal Status: new == Date Submitted: 2012-09-18 23:57 EDT Last Modified: 2012-09-18 23:57 EDT == Summary:Updated cmake-mode.el Description: I have updated the cmake-mode.el file available at http://www.cmake.org/CMakeDocs/cmake-mode.el to include a keymap. This allows the user to define keys that only apply to cmake-mode. For example, you can now get help on a command by typing C-c h instead of C-x cmake-help-command. I have attached the updated cmake-mode.el == Issue History Date ModifiedUsername FieldChange == 2012-09-18 23:57 tschutter New Issue 2012-09-18 23:57 tschutter File Added: cmake-mode.el == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [CMake] CPack source distribution recursing out of control
2012/9/18 Jack Stalnaker jack.stalna...@gmail.com: Hi, I'm not sure what I'm doing wrong, but when I run cpack --config CPackSourceConfig.cmake -G TGZ, the operation runs forever and produces archives on the order of dozens of gigabytes. As far as cpack goes, I don't have much specified other than include(cpack) and the version variables. May be you could send us your CPackSourceConfig.cmake ? I do have include(InstallRequiredSystemLibraries) as well, but that's pretty much it. Which version of CPack are you using? On which platform (Windows? Linux? ...) I did some investigation, and the problem was pretty easy to spot. Inside the generated _CPack* directory was the installed source directory, which in turn had a nested copy of the same source directory, etc, down many, many levels, so that many gigabytes of disc space were consumed. I'm sorry if this isn't specific enough, but does anyone know what's going on? Is your build tree inside the source tree, i.e. the build directory is a sub-directory of the build tree? Do you set CPACK_SOURCE_IGNORE_FILES to any values in your CMakeLists.txt? Does the problem with other generator like zip ? -- 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] How to check the operating system is MacOSX?
As far as I'm aware the only real way to detect OSX itself is by something like:
#if __APPLE__
#include TargetConditionals.h
#if TARGET_OS_IPHONE
...
#elif TARGET_IPHONE_SIMULATOR
...
#elif TARGET_OS_MAC
...
#endif
#endif
__APPLE__ is the only constant attached to compiler itself.
~
Doug.
On Mon, Sep 17, 2012 at 6:08 AM, Eric Wing ewmail...@gmail.com wrote:
On 9/16/12, Michael Jackson mike.jack...@bluequartz.net wrote:
On Sep 15, 2012, at 1:32 PM, Andreas Pakulat wrote:
Hi,
On Sat, Sep 15, 2012 at 12:46 PM, Loaden loa...@gmail.com wrote:
http://www.cmake.org/Wiki/CMake_Useful_Variables
UNIX is TRUE on all UNIX-like OS's, including Apple OS X and CygWin
WIN32
is TRUE on Windows, including CygWin APPLE is TRUE on Apple systems.
Note
this does not imply the system is Mac OS X, only that __APPLE__ is
#defined
in C/C++ header files. Obtain more specific system information via
CMAKE_SYSTEM_VERSION, i.e. IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin),
then
it's Mac OS X.
I think that mostly refers to MacOS 9 and older which are also apple
systems. So doing a if(UNIX APPLE) should put you on the safe side
since MacOS 9 and older are not unix systems.
Andreas
Does CMake even run on OS 9? I don't think so. IMO, I think what the CMake
devs mean is that one can cross-compile OS X apps on Linux. In this case the
__APPLE__ would be defined in the headers but the host system would be
Linux (or something else).
And technically if the system is Darwin it is NOT OS X. Darwin is the
Unix underpinnings of OS X and it is Open Source. I could run a Darwin
system and have it NOT be OS X.
Being able to distinguish between Mac OS X and iOS would be useful.
Both technically fall under APPLE and Darwin.
-Eric
--
Beginning iPhone Games Development
http://playcontrol.net/iphonegamebook/
--
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] How to check the operating system is MacOSX?
Just idly though, I've never yet encountered a situation where:
if(APPLE)
...
elseif(UNIX)
...
endif()
Wasn't sufficient. The only time I've come close is having to build
automake projects with different flags depending on the os base, and
then (since it only worked under cygwin or msys anyway) if(WIN32) ...
elseif(APPLE) ... else ... endif worked fine.
~
Doug.
On Tue, Sep 18, 2012 at 9:52 PM, Doug douglas.lin...@gmail.com wrote:
As far as I'm aware the only real way to detect OSX itself is by something
like:
#if __APPLE__
#include TargetConditionals.h
#if TARGET_OS_IPHONE
...
#elif TARGET_IPHONE_SIMULATOR
...
#elif TARGET_OS_MAC
...
#endif
#endif
__APPLE__ is the only constant attached to compiler itself.
~
Doug.
On Mon, Sep 17, 2012 at 6:08 AM, Eric Wing ewmail...@gmail.com wrote:
On 9/16/12, Michael Jackson mike.jack...@bluequartz.net wrote:
On Sep 15, 2012, at 1:32 PM, Andreas Pakulat wrote:
Hi,
On Sat, Sep 15, 2012 at 12:46 PM, Loaden loa...@gmail.com wrote:
http://www.cmake.org/Wiki/CMake_Useful_Variables
UNIX is TRUE on all UNIX-like OS's, including Apple OS X and CygWin
WIN32
is TRUE on Windows, including CygWin APPLE is TRUE on Apple systems.
Note
this does not imply the system is Mac OS X, only that __APPLE__ is
#defined
in C/C++ header files. Obtain more specific system information via
CMAKE_SYSTEM_VERSION, i.e. IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin),
then
it's Mac OS X.
I think that mostly refers to MacOS 9 and older which are also apple
systems. So doing a if(UNIX APPLE) should put you on the safe side
since MacOS 9 and older are not unix systems.
Andreas
Does CMake even run on OS 9? I don't think so. IMO, I think what the CMake
devs mean is that one can cross-compile OS X apps on Linux. In this case the
__APPLE__ would be defined in the headers but the host system would be
Linux (or something else).
And technically if the system is Darwin it is NOT OS X. Darwin is the
Unix underpinnings of OS X and it is Open Source. I could run a Darwin
system and have it NOT be OS X.
Being able to distinguish between Mac OS X and iOS would be useful.
Both technically fall under APPLE and Darwin.
-Eric
--
Beginning iPhone Games Development
http://playcontrol.net/iphonegamebook/
--
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] CPack source distribution recursing out of control
You're right. It was partly because I had my build tree as a subdirectory of my source tree. Just used to that from autotools. I also failed to ignore my .git directory, which also contributed to the slowness. With both fixed, the speed and tarball size are fine. Thanks On Tue, Sep 18, 2012 at 1:27 AM, Eric Noulard eric.noul...@gmail.comwrote: 2012/9/18 Jack Stalnaker jack.stalna...@gmail.com: Hi, I'm not sure what I'm doing wrong, but when I run cpack --config CPackSourceConfig.cmake -G TGZ, the operation runs forever and produces archives on the order of dozens of gigabytes. As far as cpack goes, I don't have much specified other than include(cpack) and the version variables. May be you could send us your CPackSourceConfig.cmake ? I do have include(InstallRequiredSystemLibraries) as well, but that's pretty much it. Which version of CPack are you using? On which platform (Windows? Linux? ...) I did some investigation, and the problem was pretty easy to spot. Inside the generated _CPack* directory was the installed source directory, which in turn had a nested copy of the same source directory, etc, down many, many levels, so that many gigabytes of disc space were consumed. I'm sorry if this isn't specific enough, but does anyone know what's going on? Is your build tree inside the source tree, i.e. the build directory is a sub-directory of the build tree? Do you set CPACK_SOURCE_IGNORE_FILES to any values in your CMakeLists.txt? Does the problem with other generator like zip ? -- 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] How to check the operating system is MacOSX?
On 9/18/12, Doug douglas.lin...@gmail.com wrote: Just idly though, I've never yet encountered a situation where: if(APPLE) ... elseif(UNIX) ... endif() Wasn't sufficient. I have plenty of these situations :P The most common case though is that 3rd party dynamic libraries are not allowed on iOS so generally I have to build things differently for iOS. Another case is sometimes features need to be removed to avoid the risk of rejection by the AppStore (e.g. don't compile in calls to mprotect()). And sometimes sub-components need to be different/replaced/removed compared to their Mac counterparts. LGPL libraries are a frequent issue. But specializations such as Ogg Vorbis vs. Ogg Tremor (integer version) also require different build instructions depending on the platform (Mac vs. iOS). x86 is not an indicator because the iOS Simulator is i386 which needs to be compiled like any other iOS device. -Eric -- Beginning iPhone Games Development http://playcontrol.net/iphonegamebook/ -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to check the operating system is MacOSX?
On 9/18/12, Stefan Reuschl stefan.reus...@gmail.com wrote: How do you crosscompile for iOS? If using a CMake toolchain you could simply set a variable in that file, I which you could check later... Right now I'm not brave enough to try using CMake for iOS and Android. I maintain separate projects. But someday I would like to do away with that. -Eric -- Beginning iPhone Games Development http://playcontrol.net/iphonegamebook/ -- 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] Visual Studio 2012 Express for WD and cmake 2.8.9
On Mon, Sep 17, 2012 at 1:02 PM, Glenn Coombs glenn.coo...@gmail.comwrote:
Hi,
I just installed the Visual Studio 2012 Express edition for Windows
Desktop and cmake 2.8.9 is having some issues with it. Initially when I
ran the cmake configure step it failed to find the devenv or msbuild
program:
CMake was unable to find a build program corresponding to Visual Studio
11. CMAKE_MAKE_PROGRAM is not set. You probably need to select a different
build tool.
I then edited the CMakeVS11FindMake.cmake file to tell it to use the same
MSBuild that the VS2012 command prompt uses
(C:/Windows/Microsoft.NET/Framework/v4.0.30319):
IF(NOT CMAKE_CROSSCOMPILING)
FIND_PROGRAM(CMAKE_MAKE_PROGRAM
NAMES MSBuild
HINTS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\WDExpress\\11.0\\Setup\\VS;ProductDir]
$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR
Version]/
c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR
Version]/
$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\11.0;CLR
Version]/
C:/Windows/Microsoft.NET/Framework/v4.0.30319
)
ENDIF()
and that gets me a bit further. The error message is now:
Check for working C compiler using: Visual Studio 11
Check for working C compiler using: Visual Studio 11 -- works
Detecting C compiler ABI info
CMake Error at C:/Program Files (x86)/CMake
2.8.9/share/cmake-2.8/Modules/CMakeDetermineCompilerABI.cmake:31
(TRY_COMPILE):
Cannot copy output executable
''
to destination specified by COPY_FILE:
'C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeDetermineCompilerABI_C.bin'
Unable to find the executable at any of:
C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeTmp/cmTryCompileExec66551527.exe
C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec66551527.exe
C:/data/perforceCheckouts/sim/vxe/diamond/DEV/glenn.coombs/cmake/CMakeFiles/CMakeTmp/Development/cmTryCompileExec66551527.exe
Call Stack (most recent call first):
C:/Program Files (x86)/CMake
2.8.9/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake:71
(CMAKE_DETERMINE_COMPILER_ABI)
CMakeLists.txt:3 (project)
Is it possible to hack an existing cmake 2.8.9 install to work with VS2012
Express or am I going to have to wait for cmake 2.8.10 ?
--
Glenn
--
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
You will need a new build of CMake to fix this problem.
Brad just merged some changes to our 'next' branch today to address this
issue.
If you can build CMake from source, you can try it out right now if you
checkout the 'next' branch and build it.
If not, you could wait till tomorrow morning, and there will hopefully be a
nightly build available that you can download and try.
Or, if it's not urgent, and you can wait till next week: we have
tentatively scheduled our first release candidate for CMake 2.8.10 for next
Wednesday, 9/26/2012.
HTH,
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] Query regarding header files in CMakeLists.txt
Hi, Is it necessary to specify header files in add_executable / add_library entries in CMakeLists.txt? i.e. does CMake automatically do dependency analysis making this unnecessary? Thanks, -- Best Regards, Brett Delle Grazie -- 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] Query regarding header files in CMakeLists.txt
On 18 Sep, 2012, at 5:34 PM, Brett Delle Grazie brett.dellegra...@gmail.com wrote: Hi, Is it necessary to specify header files in add_executable / add_library entries in CMakeLists.txt? nope i.e. does CMake automatically do dependency analysis making this unnecessary? yup Thanks, -- Best Regards, Brett Delle Grazie -- 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 -- Cheers, Leif -- 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] Query regarding header files in CMakeLists.txt
On Tue, Sep 18, 2012 at 5:37 PM, Leif Walsh leif.wa...@gmail.com wrote: On 18 Sep, 2012, at 5:34 PM, Brett Delle Grazie brett.dellegra...@gmail.com wrote: Hi, Is it necessary to specify header files in add_executable / add_library entries in CMakeLists.txt? nope i.e. does CMake automatically do dependency analysis making this unnecessary? yup Thanks, -- Best Regards, Brett Delle Grazie -- 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 -- Cheers, Leif -- 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 Listing them in add_executable or add_library makes them show up in GUI's like Visual Studio or Xcode. Without adding them, they won't be added as files you can double-click on in the generated project files. -- 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] Query regarding header files in CMakeLists.txt
On 18 September 2012 22:38, David Cole david.c...@kitware.com wrote: On Tue, Sep 18, 2012 at 5:37 PM, Leif Walsh leif.wa...@gmail.com wrote: On 18 Sep, 2012, at 5:34 PM, Brett Delle Grazie brett.dellegra...@gmail.com wrote: Hi, Is it necessary to specify header files in add_executable / add_library entries in CMakeLists.txt? nope i.e. does CMake automatically do dependency analysis making this unnecessary? yup -- Cheers, Leif -- Listing them in add_executable or add_library makes them show up in GUI's like Visual Studio or Xcode. Without adding them, they won't be added as files you can double-click on in the generated project files. Thanks everyone for the clarification. I'm using MinGW32 Makefiles + Eclipse. -- Best Regards, Brett Delle Grazie -- 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] Query regarding header files in CMakeLists.txt
On a practical matter though: if the file is not listed someplace, then your IDE may not pick it up. Thus while it is legal to not list all files, it is a good idea to list them anyway. -Original Message- From: cmake-boun...@cmake.org [mailto:cmake-boun...@cmake.org] On Behalf Of Brett Delle Grazie Sent: Tuesday, September 18, 2012 4:35 PM To: cmake@cmake.org Subject: [CMake] Query regarding header files in CMakeLists.txt Hi, Is it necessary to specify header files in add_executable / add_library entries in CMakeLists.txt? i.e. does CMake automatically do dependency analysis making this unnecessary? -- 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] ADD_LIBRARY and FIND_PACKAGE: shared vs. static
Hi all,
when building a library with CMake, I can decide whether its shared or
static by specifying the appropriate keyword,
ADD_LIBRARY( foobar {SHARED,STATIC} ...)
If this library uses a system library, and if I'm lucky enough that
there's a FindCMake of some sort available for it, I can usually do
something along the lines of
FIND_PACKAGE(FancyLib)
which then will possibly set variables like ${FANCY_LIB}, which I
could use to link foobar with,
TARGET_LINK_LIBRARIES(foobar ${FANCY_LIB})
Now, I can't see how to tell CMake the find static of shared version
of FancyLibs although it would seem natural to link FancyLib's shared
library when building foobar shared, and static if otherwise.
By default, FIND_PACKAGE always seems to set shared libraries.
What's the idea or concept here, and how is CMake to be used correctly?
Cheers,
Nico
--
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.9-573-g3850612
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 38506121bbbcdbbf0b5a98cb8595f785c6c60585 (commit)
via f35e35b058ab89f70923e5ad6d16f6299147fdba (commit)
from fed487bc2081748c3cc15352604b34c1c2e17e58 (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=38506121bbbcdbbf0b5a98cb8595f785c6c60585
commit 38506121bbbcdbbf0b5a98cb8595f785c6c60585
Merge: fed487b f35e35b
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Tue Sep 18 02:45:41 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 02:45:41 2012 -0400
Merge topic 'document-MSVC-variables-12567' into next
f35e35b add documentation for all MSVCxxx version variables (#12567)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f35e35b058ab89f70923e5ad6d16f6299147fdba
commit f35e35b058ab89f70923e5ad6d16f6299147fdba
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Sep 9 14:02:59 2012 +0200
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Tue Sep 18 08:45:01 2012 +0200
add documentation for all MSVCxxx version variables (#12567)
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 94cd5c2..5e7e081 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1,6 +1,8 @@
#include cmDocumentVariables.h
#include cmake.h
+#include cmsys/ios/sstream
+
void cmDocumentVariables::DefineVariables(cmake* cm)
{
// Subsection: variables defined by cmake, that give
@@ -992,12 +994,33 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
false,
Variables That Describe the System);
- cm-DefineProperty
-(MSVC80, cmProperty::VARIABLE,
- True when using Microsoft Visual C 8.0,
- Set to true when the compiler is version 8.0 of Microsoft Visual C.,
- false,
- Variables That Describe the System);
+ int msvc_versions[] = { 60, 70, 71, 80, 90, 100, 110, 0 };
+ for (int i = 0; msvc_versions[i] != 0; i ++)
+{
+const char minor = (char)('0' + (msvc_versions[i] % 10));
+cmStdString varName = MSVC;
+cmsys_ios::ostringstream majorStr;
+
+majorStr (msvc_versions[i] / 10);
+varName += majorStr.str();
+if (msvc_versions[i] 100)
+ {
+ varName += minor;
+ }
+
+cmStdString verString = majorStr.str() + . + minor;
+
+cmStdString shortStr = True when using Microsoft Visual C + verString;
+cmStdString fullStr = Set to true when the compiler is version +
+ verString +
+ of Microsoft Visual C.;
+cm-DefineProperty
+ (varName.c_str(), cmProperty::VARIABLE,
+ shortStr.c_str(),
+ fullStr.c_str(),
+ false,
+ Variables That Describe the System);
+}
cm-DefineProperty
(MSVC_IDE, cmProperty::VARIABLE,
@@ -1017,6 +1040,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
1400 = VS 8.0\n
1500 = VS 9.0\n
1600 = VS 10.0\n
+ 1700 = VS 11.0\n
,
false,
Variables That Describe the System);
---
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, master, updated. v2.8.9-301-g21f5fc1
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 21f5fc12ee4ca043838264962fc7608a97b8f35f (commit) from 70169ec1bfa5adc4bc99c1777f44c6f8446bba04 (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=21f5fc12ee4ca043838264962fc7608a97b8f35f commit 21f5fc12ee4ca043838264962fc7608a97b8f35f Author: Kitware Robot kwro...@kitware.com AuthorDate: Tue Sep 18 00:01:05 2012 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Tue Sep 18 00:01:05 2012 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4f37280..5bf171a 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 20120917) +set(CMake_VERSION_TWEAK 20120918) #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
[Cmake-commits] CMake branch, next, updated. v2.8.9-577-ge56136c
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 e56136c280ddb00a0d64dd117547156f782c0314 (commit)
via 011d5a4b4704c745dcd1b5ae8bf58b7a14df30db (commit)
via 70169ec1bfa5adc4bc99c1777f44c6f8446bba04 (commit)
via 4824633642bbaacf6c5b7b36e131e2463d7c2f68 (commit)
from 38506121bbbcdbbf0b5a98cb8595f785c6c60585 (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=e56136c280ddb00a0d64dd117547156f782c0314
commit e56136c280ddb00a0d64dd117547156f782c0314
Merge: 3850612 011d5a4
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 07:49:51 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 07:49:51 2012 -0400
Merge topic 'osx-clang-target-flags' into next
011d5a4 OS X: Add platform-specific Clang compiler info files (#13536)
70169ec CMake Nightly Date Stamp
4824633 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=011d5a4b4704c745dcd1b5ae8bf58b7a14df30db
commit 011d5a4b4704c745dcd1b5ae8bf58b7a14df30db
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Sep 17 15:34:50 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Sep 17 15:36:41 2012 -0400
OS X: Add platform-specific Clang compiler info files (#13536)
Clang has the same interface as GNU except that we do not need to test
for the deployment target and sysroot flags. Simply set variables
CMAKE_${lang}_HAS_ISYSROOT
CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG
to true because every version of Clang available on OS X supports these
flags.
diff --git a/Modules/Platform/Darwin-Clang-C.cmake
b/Modules/Platform/Darwin-Clang-C.cmake
new file mode 100644
index 000..0a1502e
--- /dev/null
+++ b/Modules/Platform/Darwin-Clang-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/Darwin-Clang)
+__darwin_compiler_clang(C)
diff --git a/Modules/Platform/Darwin-Clang-CXX.cmake
b/Modules/Platform/Darwin-Clang-CXX.cmake
new file mode 100644
index 000..f8e8d88
--- /dev/null
+++ b/Modules/Platform/Darwin-Clang-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/Darwin-Clang)
+__darwin_compiler_clang(CXX)
diff --git a/Modules/Platform/Darwin-Clang.cmake
b/Modules/Platform/Darwin-Clang.cmake
new file mode 100644
index 000..46f06f7
--- /dev/null
+++ b/Modules/Platform/Darwin-Clang.cmake
@@ -0,0 +1,26 @@
+
+#=
+# Copyright 2002-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(__DARWIN_COMPILER_CLANG)
+ return()
+endif()
+set(__DARWIN_COMPILER_CLANG 1)
+
+macro(__darwin_compiler_clang lang)
+ set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS -dynamiclib
-Wl,-headerpad_max_install_names)
+ set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS -bundle
-Wl,-headerpad_max_install_names)
+ set(CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG -mmacosx-version-min=)
+ set(CMAKE_${lang}_HAS_ISYSROOT 1)
+endmacro()
---
Summary of changes:
Modules/Platform/Darwin-Clang-C.cmake |2 ++
Modules/Platform/Darwin-Clang-CXX.cmake|2 ++
.../{Linux-PGI.cmake = Darwin-Clang.cmake}| 17 -
Source/CMakeVersion.cmake |2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 Modules/Platform/Darwin-Clang-C.cmake
create mode 100644 Modules/Platform/Darwin-Clang-CXX.cmake
copy Modules/Platform/{Linux-PGI.cmake = Darwin-Clang.cmake} (61%)
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, dashboard, updated. a4ea3465dbeb9e7435cb6c072c7c93035dd677f7
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, dashboard has been updated
via a4ea3465dbeb9e7435cb6c072c7c93035dd677f7 (commit)
via dc9816acd185b45e11ea0ae85a3447a0be9d2607 (commit)
from 849820219e84e251ad99121f738456f3743ba4fa (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=a4ea3465dbeb9e7435cb6c072c7c93035dd677f7
commit a4ea3465dbeb9e7435cb6c072c7c93035dd677f7
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Sep 14 08:41:12 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Sep 14 08:45:33 2012 -0400
cmake_common: Initialize summary output string
diff --git a/cmake_common.cmake b/cmake_common.cmake
index 3e638f1..3b47fea 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -268,6 +268,7 @@ foreach(req
endforeach(req)
# Print summary information.
+set(vars )
foreach(v
CTEST_SITE
CTEST_BUILD_NAME
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc9816acd185b45e11ea0ae85a3447a0be9d2607
commit dc9816acd185b45e11ea0ae85a3447a0be9d2607
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Sep 13 10:45:50 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Sep 14 08:45:01 2012 -0400
cmake_common: Require CTest 2.8.2 and always use Git
Remove remnants of dual CVS/Git support. Remove information duplicated
from CTestConfig.cmake that was needed to work around CTest delayed
initialization problems fixed as of 2.8.2.
diff --git a/cmake_common.cmake b/cmake_common.cmake
index 2d7091a..3e638f1 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -40,8 +40,7 @@
# CTEST_TEST_ARGS = ctest_test args (ex: PARALLEL_LEVEL 4)
# CMAKE_MAKE_PROGRAM= Path to make tool to use
#
-# Options to configure builds from experimental git repository:
-# dashboard_use_git_repo = Whether to use experimental git repository
+# Options to configure Git:
# dashboard_git_url = Custom git clone url
# dashboard_git_branch = Custom remote branch to track
# dashboard_git_crlf = Value of core.autocrlf for repository
@@ -87,7 +86,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=
-cmake_minimum_required(VERSION 2.6.3 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
set(CTEST_PROJECT_NAME CMake)
set(dashboard_user_home $ENV{HOME})
@@ -133,41 +132,34 @@ if(NOT CTEST_TEST_TIMEOUT)
set(CTEST_TEST_TIMEOUT 1500)
endif()
-set(dashboard_use_git_repo 1)
-if(dashboard_use_git_repo)
- # Select Git source to use.
- if(NOT DEFINED dashboard_git_url)
-set(dashboard_git_url git://cmake.org/cmake.git)
- endif()
- if(NOT DEFINED dashboard_git_branch)
-if(${dashboard_model} STREQUAL Nightly)
- set(dashboard_git_branch nightly)
-else()
- set(dashboard_git_branch next)
-endif()
- endif()
- if(NOT DEFINED dashboard_git_crlf)
-if(UNIX)
- set(dashboard_git_crlf false)
-else(UNIX)
- set(dashboard_git_crlf true)
-endif(UNIX)
- endif()
-
- # Look for a GIT command-line client.
- if(NOT DEFINED CTEST_GIT_COMMAND)
-find_program(CTEST_GIT_COMMAND
- NAMES git git.cmd
- PATH_SUFFIXES Git/cmd Git/bin
- )
+# Select Git source to use.
+if(NOT DEFINED dashboard_git_url)
+ set(dashboard_git_url git://cmake.org/cmake.git)
+endif()
+if(NOT DEFINED dashboard_git_branch)
+ if(${dashboard_model} STREQUAL Nightly)
+set(dashboard_git_branch nightly)
+ else()
+set(dashboard_git_branch next)
endif()
+endif()
+if(NOT DEFINED dashboard_git_crlf)
+ if(UNIX)
+set(dashboard_git_crlf false)
+ else(UNIX)
+set(dashboard_git_crlf true)
+ endif(UNIX)
+endif()
- # Use git only if driving CTest is at least 2.8.0.
- if(${CMAKE_VERSION} VERSION_LESS 2.8)
-set(CTEST_GIT_COMMAND )
- endif()
-else()
- set(CTEST_GIT_COMMAND )
+# Look for a GIT command-line client.
+if(NOT DEFINED CTEST_GIT_COMMAND)
+ find_program(CTEST_GIT_COMMAND
+NAMES git git.cmd
+PATH_SUFFIXES Git/cmd Git/bin
+)
+endif()
+if(NOT CTEST_GIT_COMMAND)
+ message(FATAL_ERROR CTEST_GIT_COMMAND not available!)
endif()
# Select a source directory name.
@@ -190,20 +182,18 @@ endif()
# Delete source tree if it is incompatible with current VCS.
if(EXISTS ${CTEST_SOURCE_DIRECTORY})
- if(CTEST_GIT_COMMAND)
-if(NOT EXISTS ${CTEST_SOURCE_DIRECTORY}/.git)
- set(vcs_refresh because it is not managed by git.)
-else()
- execute_process(
-COMMAND ${CTEST_GIT_COMMAND} reset --hard
-WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
-
[Cmake-commits] CMake branch, next, updated. v2.8.9-580-gd2e906d
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 d2e906db5887a95a3e78e6742f4c0e4b662bc99b (commit)
via a1c9c136c33bb9370e5d6c2780817590530c9fbc (commit)
via 21f5fc12ee4ca043838264962fc7608a97b8f35f (commit)
from e56136c280ddb00a0d64dd117547156f782c0314 (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=d2e906db5887a95a3e78e6742f4c0e4b662bc99b
commit d2e906db5887a95a3e78e6742f4c0e4b662bc99b
Merge: e56136c a1c9c13
Author: Peter Kuemmel syntheti...@gmx.net
AuthorDate: Tue Sep 18 12:07:30 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 12:07:30 2012 -0400
Merge topic 'ninja-rc-compile-flag' into next
a1c9c13 Ninja: filter target specific compile flags with language specific
regex
21f5fc1 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1c9c136c33bb9370e5d6c2780817590530c9fbc
commit a1c9c136c33bb9370e5d6c2780817590530c9fbc
Author: Peter Kümmel syntheti...@gmx.net
AuthorDate: Wed Aug 22 00:11:17 2012 +0200
Commit: Peter Kümmel syntheti...@gmx.net
CommitDate: Tue Sep 18 18:02:10 2012 +0200
Ninja: filter target specific compile flags with language specific regex
sync with Makefile code.
Bug: 13486
Many thanks to Nils Gladitz
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 4cc23ca..385b4a0 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -167,11 +167,41 @@
cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile *source,
// Append old-style preprocessor definition flags.
this-LocalGenerator-AppendFlags(flags, this-Makefile-GetDefineFlags());
- // Add target-specific and source-specific flags.
- this-LocalGenerator-AppendFlags(flags,
- this-Target-GetProperty(COMPILE_FLAGS));
- this-LocalGenerator-AppendFlags(flags,
-source-GetProperty(COMPILE_FLAGS));
+ // Add target-specific flags.
+ if(this-Target-GetProperty(COMPILE_FLAGS))
+{
+std::string langIncludeExpr = CMAKE_;
+langIncludeExpr += language;
+langIncludeExpr += _FLAG_REGEX;
+const char* regex = this-Makefile-
+ GetDefinition(langIncludeExpr.c_str());
+if(regex)
+ {
+ cmsys::RegularExpression r(regex);
+ std::vectorstd::string args;
+ cmSystemTools::ParseWindowsCommandLine(
+this-Target-GetProperty(COMPILE_FLAGS),
+args);
+ for(std::vectorstd::string::iterator i = args.begin();
+ i != args.end(); ++i)
+{
+if(r.find(i-c_str()))
+ {
+ this-LocalGenerator-AppendFlags
+(flags, i-c_str());
+ }
+}
+ }
+else
+ {
+ this-LocalGenerator-AppendFlags
+(flags, this-Target-GetProperty(COMPILE_FLAGS));
+ }
+}
+
+// Add source file specific flags.
+this-LocalGenerator-AppendFlags(flags,
+ source-GetProperty(COMPILE_FLAGS));
// TODO: Handle Apple frameworks.
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmNinjaTargetGenerator.cxx | 40
2 files changed, 36 insertions(+), 6 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.9-582-g300ea33
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 300ea33da5c36e276fbaad0939b314c49ee24e0d (commit)
via e2160ed4e8928ed3efe87cfda0a475c7d3e4209a (commit)
from d2e906db5887a95a3e78e6742f4c0e4b662bc99b (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=300ea33da5c36e276fbaad0939b314c49ee24e0d
commit 300ea33da5c36e276fbaad0939b314c49ee24e0d
Merge: d2e906d e2160ed
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 14:03:39 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 14:03:39 2012 -0400
Merge topic 'vs11-default' into next
e2160ed VS11: Detect VS 2012 Express for default generator (#13348)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2160ed4e8928ed3efe87cfda0a475c7d3e4209a
commit e2160ed4e8928ed3efe87cfda0a475c7d3e4209a
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 11:56:14 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Sep 18 11:57:11 2012 -0400
VS11: Detect VS 2012 Express for default generator (#13348)
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7e0baa5..079ea36 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2199,9 +2199,9 @@ int cmake::ActualConfigure()
{10.0, Visual Studio 10},
{11.0, Visual Studio 11},
{0, 0}};
- for(size_t b=0; b vsVerions.size() installedCompiler.empty(); b++)
+ for(int i=0; version[i].MSVersion != 0; i++)
{
-for(int i =0; version[i].MSVersion != 0; i++)
+for(size_t b=0; b vsVerions.size(); b++)
{
std::string reg = vsregBase + vsVerions[b] + version[i].MSVersion;
reg += ;InstallDir];
@@ -2210,6 +2210,7 @@ int cmake::ActualConfigure()
if (!(reg == /registry))
{
installedCompiler = version[i].GeneratorName;
+break;
}
}
}
---
Summary of changes:
Source/cmake.cxx |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-584-gf5cb882
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 f5cb882c8d8bb99927d084d69b1c29cfdcb23e03 (commit)
via e17f3458ce8c5eaba53dc00d273d3456746c7fd4 (commit)
from 300ea33da5c36e276fbaad0939b314c49ee24e0d (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=f5cb882c8d8bb99927d084d69b1c29cfdcb23e03
commit f5cb882c8d8bb99927d084d69b1c29cfdcb23e03
Merge: 300ea33 e17f345
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 14:04:07 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 14:04:07 2012 -0400
Merge topic 'vs11-express' into next
e17f345 VS11: Detect VS 2012 Express for default generator (#13348)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e17f3458ce8c5eaba53dc00d273d3456746c7fd4
commit e17f3458ce8c5eaba53dc00d273d3456746c7fd4
Author: Brad King brad.k...@kitware.com
AuthorDate: Sun Sep 16 00:01:32 2012 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Sep 18 14:02:01 2012 -0400
VS11: Detect VS 2012 Express for default generator (#13348)
Add WDExpress to the list of registry search locations. Add VS 11 to
the list of VS versions and corresponding generator names. Fix the
search logic to use the most recent version found under any registry
entry.
Inspired-by: Peter Kümmel syntheti...@gmx.net
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c6787b9..079ea36 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2184,6 +2184,7 @@ int cmake::ActualConfigure()
std::vectorstd::string vsVerions;
vsVerions.push_back(VisualStudio\\);
vsVerions.push_back(VCExpress\\);
+ vsVerions.push_back(WDExpress\\);
struct VSRegistryEntryName
{
const char* MSVersion;
@@ -2196,10 +2197,11 @@ int cmake::ActualConfigure()
{8.0, Visual Studio 8 2005},
{9.0, Visual Studio 9 2008},
{10.0, Visual Studio 10},
+{11.0, Visual Studio 11},
{0, 0}};
- for(size_t b=0; b vsVerions.size() installedCompiler.empty(); b++)
+ for(int i=0; version[i].MSVersion != 0; i++)
{
-for(int i =0; version[i].MSVersion != 0; i++)
+for(size_t b=0; b vsVerions.size(); b++)
{
std::string reg = vsregBase + vsVerions[b] + version[i].MSVersion;
reg += ;InstallDir];
@@ -2208,6 +2210,7 @@ int cmake::ActualConfigure()
if (!(reg == /registry))
{
installedCompiler = version[i].GeneratorName;
+break;
}
}
}
---
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-586-g2d592ca
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 2d592ca96317014e192a93b0573e3ebf2d1d (commit)
via 7ee3cee9199e1207813e245b2bca18526d6bd74c (commit)
from f5cb882c8d8bb99927d084d69b1c29cfdcb23e03 (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=2d592ca96317014e192a93b0573e3ebf2d1d
commit 2d592ca96317014e192a93b0573e3ebf2d1d
Merge: f5cb882 7ee3cee
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 14:09:23 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 14:09:23 2012 -0400
Merge topic 'vs11-express' into next
7ee3cee VS11: Add VS 2012 Express support (#13348)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ee3cee9199e1207813e245b2bca18526d6bd74c
commit 7ee3cee9199e1207813e245b2bca18526d6bd74c
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 11:39:34 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Sep 18 14:03:02 2012 -0400
VS11: Add VS 2012 Express support (#13348)
Use the registry entries that vsvars32.bat uses to detect the location of
MSBuild.exe in the framework directory. Invoke MSBuild with the option
/p:VisualStudioVersion=$version
so it knows from which VS version to load the system build rules. Teach
cmGlobalVisualStudio11Generator to set its ExpressEdition member using the
registry.
diff --git a/Modules/CMakeDetermineCompilerId.cmake
b/Modules/CMakeDetermineCompilerId.cmake
index 3df17c7..8e38399 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -143,7 +143,7 @@ Id flags: ${testflags}
set(id_toolset )
endif()
if(${CMAKE_MAKE_PROGRAM} MATCHES [Mm][Ss][Bb][Uu][Ii][Ll][Dd])
- set(build /p:Configuration=Debug /p:Platform=@id_arch@)
+ set(build /p:Configuration=Debug /p:Platform=@id_arch@
/p:VisualStudioVersion=${vs_version}.0)
elseif(${CMAKE_MAKE_PROGRAM} MATCHES [Mm][Ss][Dd][Ee][Vv])
set(build /make)
else()
diff --git a/Modules/CMakeVS11FindMake.cmake b/Modules/CMakeVS11FindMake.cmake
index c55a4c5..2df015d 100644
--- a/Modules/CMakeVS11FindMake.cmake
+++ b/Modules/CMakeVS11FindMake.cmake
@@ -34,15 +34,14 @@ find_program(CMAKE_MAKE_PROGRAM
# if devenv is not found, then use MSBuild.
# it is expected that if devenv is not found, then we are
-# dealing with Visual Studio Express. VCExpress has random
-# failures when being run as a command line build tool which
-# causes the compiler checks and try-compile stuff to fail. MSbuild
-# is a better choice for this. However, VCExpress does not support
-# cross compiling needed for Win CE.
+# dealing with Visual Studio Express.
if(NOT CMAKE_CROSSCOMPILING)
+ set(_FDIR
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7;FrameworkDir32])
+ set(_FVER
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7;FrameworkVer32])
find_program(CMAKE_MAKE_PROGRAM
NAMES MSBuild
HINTS
+${_FDIR}/${_FVER}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir]
$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR
Version]/
c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR
Version]/
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index d188980..480c577 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -205,6 +205,8 @@ std::string cmGlobalVisualStudio10Generator
{
makeCommand += Debug;
}
+ makeCommand += /p:VisualStudioVersion=;
+ makeCommand += this-GetIDEVersion();
if ( additionalOptions )
{
makeCommand += ;
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx
b/Source/cmGlobalVisualStudio11Generator.cxx
index 7bb4d0c..23a1204 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -17,7 +17,10 @@
cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator()
{
this-FindMakeProgramFile = CMakeVS11FindMake.cmake;
- this-ExpressEdition = false; // TODO: VS 11 Express support
+ std::string vc11Express;
+ this-ExpressEdition = cmSystemTools::ReadRegistryValue(
+HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\11.0\\Setup\\VC;
+ProductDir, vc11Express, cmSystemTools::KeyWOW64_32);
this-PlatformToolset = v110;
}
---
[Cmake-commits] CMake branch, next, updated. v2.8.9-588-gec08788
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 ec087883b37b1b5d9ef56bc509d407e97261 (commit) via 14aff4daf45a3cf0af59de60a464af9abe6a013c (commit) from 2d592ca96317014e192a93b0573e3ebf2d1d (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=ec087883b37b1b5d9ef56bc509d407e97261 commit ec087883b37b1b5d9ef56bc509d407e97261 Merge: 2d592ca 14aff4d Author: Brad King brad.k...@kitware.com AuthorDate: Tue Sep 18 14:56:22 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 14:56:22 2012 -0400 Merge topic 'file-DOWNLOAD-user-agent' into next 14aff4d file(DOWNLOAD): Add HTTP User-Agent string http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14aff4daf45a3cf0af59de60a464af9abe6a013c commit 14aff4daf45a3cf0af59de60a464af9abe6a013c Author: Brad King brad.k...@kitware.com AuthorDate: Tue Sep 18 14:53:07 2012 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Sep 18 14:53:07 2012 -0400 file(DOWNLOAD): Add HTTP User-Agent string Some servers require a User-Agent string. The curl command-line tool just sends curl/$curlver, so do the same. Suggested-by: Fredrik Ehnbom fehn...@nvidia.com diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index bb12980..4ac58a4 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2857,6 +2857,9 @@ cmFileCommand::HandleDownloadCommand(std::vectorstd::string const args) res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1); check_curl_result(res, DOWNLOAD cannot set http failure option: ); + res = ::curl_easy_setopt(curl, CURLOPT_USERAGENT, curl/ LIBCURL_VERSION); + check_curl_result(res, DOWNLOAD cannot set user agent option: ); + res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cmWriteToFileCallback); check_curl_result(res, DOWNLOAD cannot set write function: ); --- Summary of changes: Source/cmFileCommand.cxx |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-312-g865feff
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 865feff4c114a3fbeeb18c56fd8bb977f3f935f5 (commit) via 25a4f5675490d9311db271942ecd1781de5f3558 (commit) via 717f31a877e701b801043b893c97f4a186f93739 (commit) via 066e85893ffa3492e4247e59a80ee1de67babef5 (commit) via 430ba9faef26d66e2fb3ffb938122b62f627562d (commit) via 32a572564a94380a543593f9568d34fc2c4a8b70 (commit) via 0b6625c605b95ef7e936717e946906d422d3d4f7 (commit) via 8ab312b6930c52a8f04688d8834383be4f09f5d5 (commit) via bd728f6feeab10db189e82d3100c9df9ee64ad5c (commit) from 3dea63d04d683206cf05dc6d72cb5538222bfbc1 (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=865feff4c114a3fbeeb18c56fd8bb977f3f935f5 commit 865feff4c114a3fbeeb18c56fd8bb977f3f935f5 Merge: 3dea63d 25a4f56 Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:41:31 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:41:31 2012 -0400 Merge topic 'qt5-qtdialog-port' 25a4f56 Build with Qt5 if it is found. 717f31a Compile with both Qt4 and Qt5. 066e858 Replace two include_directories with a setting. 430ba9f Use add_subdirectory instead of the obsolete subdirs. 32a5725 Remove an if which is always true. 0b6625c Move variable setting down to where it relates to. 8ab312b Use CMake platform variables instead of Qt ones. bd728f6 Add a return-after-error if an old Qt is found. --- Summary of changes: Source/CMakeLists.txt |2 +- Source/QtDialog/CMakeLists.txt | 210 +--- Source/QtDialog/QCMake.cxx |4 + 3 files changed, 117 insertions(+), 99 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-314-ga98881a
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 a98881ac8ff9e12a690ebee381af17e475e3ab03 (commit) via fbda7bb9f23bfbd7efdfc0ef64504f4c2d280267 (commit) from 865feff4c114a3fbeeb18c56fd8bb977f3f935f5 (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=a98881ac8ff9e12a690ebee381af17e475e3ab03 commit a98881ac8ff9e12a690ebee381af17e475e3ab03 Merge: 865feff fbda7bb Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:41:44 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:41:44 2012 -0400 Merge topic 'NewFindGLEWModule' fbda7bb Initial version of find module --- Summary of changes: Modules/FindGLEW.cmake | 30 ++ 1 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 Modules/FindGLEW.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.9-316-g3e7fe5a
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 3e7fe5a7a0db605d791921abf0b910f6b41e0359 (commit) via dfa0ebd646203e4cecc150ff7589392d899e13d4 (commit) from a98881ac8ff9e12a690ebee381af17e475e3ab03 (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=3e7fe5a7a0db605d791921abf0b910f6b41e0359 commit 3e7fe5a7a0db605d791921abf0b910f6b41e0359 Merge: a98881a dfa0ebd Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:41:59 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:41:59 2012 -0400 Merge topic 'if-version-depth' dfa0ebd if: Compare up to 8 components in VERSION tests --- Summary of changes: Source/cmIfCommand.cxx| 16 ++-- Tests/CMakeTests/VersionTest.cmake.in |7 +++ 2 files changed, 17 insertions(+), 6 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-318-g9642655
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 9642655c5bbe174e8f34d19d314b1a04a5fd59d5 (commit) via 248db6c03470adceeb5f92a97031b857472e34bc (commit) from 3e7fe5a7a0db605d791921abf0b910f6b41e0359 (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=9642655c5bbe174e8f34d19d314b1a04a5fd59d5 commit 9642655c5bbe174e8f34d19d314b1a04a5fd59d5 Merge: 3e7fe5a 248db6c Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:42:16 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:42:16 2012 -0400 Merge topic 'openscenegraph-simplify-fphsa' 248db6c FindOpenSceneGraph: simplify by using more features of FPHSA --- Summary of changes: Modules/FindOpenSceneGraph.cmake | 80 + 1 files changed, 11 insertions(+), 69 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-320-g2183743
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 2183743f8f9d5fee87dcafa54aab0a153d69ecf4 (commit) via f34321a02d157a5d613874fc4dfd70b3df3d14b3 (commit) from 9642655c5bbe174e8f34d19d314b1a04a5fd59d5 (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=2183743f8f9d5fee87dcafa54aab0a153d69ecf4 commit 2183743f8f9d5fee87dcafa54aab0a153d69ecf4 Merge: 9642655 f34321a Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:42:30 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:42:30 2012 -0400 Merge topic 'vs-simplify-CreateLocalGenerator' f34321a VS: Remove duplicated implementations of CreateLocalGenerator() --- Summary of changes: Source/cmGlobalVisualStudio8Win64Generator.cxx | 11 --- Source/cmGlobalVisualStudio8Win64Generator.h |3 --- Source/cmGlobalVisualStudio9IA64Generator.cxx | 11 --- Source/cmGlobalVisualStudio9IA64Generator.h|3 --- Source/cmGlobalVisualStudio9Win64Generator.cxx | 11 --- Source/cmGlobalVisualStudio9Win64Generator.h |3 --- 6 files changed, 0 insertions(+), 42 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-323-g893d84b
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 893d84b22128559706655d3ab7ee53e798371f3a (commit) via c2664610845199f90f7f71664bfaf2d1c1a60ea9 (commit) via beb8a8309bc0ce08e4884a59329607ac09c322ac (commit) from 2183743f8f9d5fee87dcafa54aab0a153d69ecf4 (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=893d84b22128559706655d3ab7ee53e798371f3a commit 893d84b22128559706655d3ab7ee53e798371f3a Merge: 2183743 c266461 Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:42:39 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:42:39 2012 -0400 Merge topic 'ExternalProject-check-hashes' c266461 Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add. beb8a83 ExternalProject: Generalize URL_MD5 option to URL_HASH --- Summary of changes: Modules/ExternalProject.cmake| 125 - Tests/ExternalProject/CMakeLists.txt |2 +- 2 files changed, 77 insertions(+), 50 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-326-g024bbad
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 024bbad23003d4134bef2d2c3dad0a95c84f777a (commit) via 7369a8faee40574e7f87eeaa5e7718d0da407ffe (commit) via 131d91a1f91116e85281d11d175290fdb211f664 (commit) from 893d84b22128559706655d3ab7ee53e798371f3a (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=024bbad23003d4134bef2d2c3dad0a95c84f777a commit 024bbad23003d4134bef2d2c3dad0a95c84f777a Merge: 893d84b 7369a8f Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:42:47 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:42:47 2012 -0400 Merge topic 'cleanup-TLS-and-SSL-interface' 7369a8f file(DOWNLOAD): Make TLS options behave as documented 131d91a Rename SSL terminology to TLS --- Summary of changes: Modules/ExternalProject.cmake | 40 ++-- Source/cmFileCommand.cxx | 58 +--- Source/cmFileCommand.h| 12 3 files changed, 45 insertions(+), 65 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-328-ga248305
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 a24830521b7a21b05ce69aa216d75214e37d541f (commit) via adf705863c0ccfe0b688aa615c306836caa9687f (commit) from 024bbad23003d4134bef2d2c3dad0a95c84f777a (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=a24830521b7a21b05ce69aa216d75214e37d541f commit a24830521b7a21b05ce69aa216d75214e37d541f Merge: 024bbad adf7058 Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:42:57 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 18 16:42:57 2012 -0400 Merge topic 'findsdl-unlimited-main-13262' adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262) --- Summary of changes: Modules/FindSDL.cmake |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-598-gb78f497
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 b78f49705a3e1df70d1dad9512529e99fb1a3719 (commit) via a24830521b7a21b05ce69aa216d75214e37d541f (commit) via 024bbad23003d4134bef2d2c3dad0a95c84f777a (commit) via 893d84b22128559706655d3ab7ee53e798371f3a (commit) via 2183743f8f9d5fee87dcafa54aab0a153d69ecf4 (commit) via 9642655c5bbe174e8f34d19d314b1a04a5fd59d5 (commit) via 3e7fe5a7a0db605d791921abf0b910f6b41e0359 (commit) via a98881ac8ff9e12a690ebee381af17e475e3ab03 (commit) via 865feff4c114a3fbeeb18c56fd8bb977f3f935f5 (commit) via 3dea63d04d683206cf05dc6d72cb5538222bfbc1 (commit) from ec087883b37b1b5d9ef56bc509d407e97261 (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=b78f49705a3e1df70d1dad9512529e99fb1a3719 commit b78f49705a3e1df70d1dad9512529e99fb1a3719 Merge: ec08788 a248305 Author: David Cole david.c...@kitware.com AuthorDate: Tue Sep 18 16:44:46 2012 -0400 Commit: David Cole david.c...@kitware.com CommitDate: Tue Sep 18 16:44:46 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-600-g3a40dbd
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 3a40dbdc2c322b0471add8413dec92f266f603c3 (commit)
via 99af39d6b86db47d4a7a025b0b852f6ab26c478c (commit)
from b78f49705a3e1df70d1dad9512529e99fb1a3719 (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=3a40dbdc2c322b0471add8413dec92f266f603c3
commit 3a40dbdc2c322b0471add8413dec92f266f603c3
Merge: b78f497 99af39d
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 17:00:39 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 17:00:39 2012 -0400
Merge topic 'generator-expression-refactor' into next
99af39d cmTarget: Fix style for targets set insertion
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99af39d6b86db47d4a7a025b0b852f6ab26c478c
commit 99af39d6b86db47d4a7a025b0b852f6ab26c478c
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 16:59:00 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Sep 18 16:59:02 2012 -0400
cmTarget: Fix style for targets set insertion
Remove a comment referencing dashboard machines. Use our standard for
loop iteration style.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6219da6..9a3812c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1652,12 +1652,8 @@ cmTargetTraceDependencies
const cmCompiledGeneratorExpression cge = ge.Parse(*cli);
cge.Evaluate(this-Makefile, 0, true);
std::setcmTarget* geTargets = cge.GetTargets();
- // A handful of machines on the dashboard don't have the
- // iterator overload below, so we have to do it manually.
-// targets.insert(geTargets.begin(), geTargets.end());
- std::setcmTarget*::const_iterator it = geTargets.begin();
- const std::setcmTarget*::const_iterator end = geTargets.end();
- for ( ; it != end; ++it)
+ for(std::setcmTarget*::const_iterator it = geTargets.begin();
+ it != geTargets.end(); ++it)
{
targets.insert(*it);
}
---
Summary of changes:
Source/cmTarget.cxx |8 ++--
1 files changed, 2 insertions(+), 6 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.9-602-g172f33b
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 172f33ba989b133c63be0f6f761c2c9542944ddc (commit)
via 8da0fe4b535103484960c7f5c60461b1349854dd (commit)
from 3a40dbdc2c322b0471add8413dec92f266f603c3 (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=172f33ba989b133c63be0f6f761c2c9542944ddc
commit 172f33ba989b133c63be0f6f761c2c9542944ddc
Merge: 3a40dbd 8da0fe4
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 17:12:16 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 18 17:12:16 2012 -0400
Merge topic 'ExternalProject-DOWNLOAD_NAME' into next
8da0fe4 ExternalProject: Add DOWNLOAD_NAME option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8da0fe4b535103484960c7f5c60461b1349854dd
commit 8da0fe4b535103484960c7f5c60461b1349854dd
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Sep 18 16:02:00 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Sep 18 16:06:21 2012 -0400
ExternalProject: Add DOWNLOAD_NAME option
Some download URLs do not have the filename embedded in the url.
Add an interface to specify the local filename explicitly.
Suggested-by: James Goppert james.gopp...@gmail.com
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index cd77ba4..56f8f9e 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -9,6 +9,7 @@
#[TMP_DIR dir] # Directory to store temporary files
#[STAMP_DIR dir] # Directory to store step timestamps
# #--Download step--
+#[DOWNLOAD_NAME fname] # File name to store (if not end of URL)
#[DOWNLOAD_DIR dir] # Directory to store downloaded files
#[DOWNLOAD_COMMAND cmd...] # Command to download source tree
#[CVS_REPOSITORY cvsroot]# CVSROOT of CVS repository
@@ -1092,6 +1093,7 @@ function(_ep_add_download_command name)
get_property(git_repository TARGET ${name} PROPERTY _EP_GIT_REPOSITORY)
get_property(hg_repository TARGET ${name} PROPERTY _EP_HG_REPOSITORY )
get_property(url TARGET ${name} PROPERTY _EP_URL)
+ get_property(fname TARGET ${name} PROPERTY _EP_DOWNLOAD_NAME)
# TODO: Perhaps file:// should be copied to download dir before extraction.
string(REGEX REPLACE ^file:// url ${url})
@@ -1272,7 +1274,9 @@ function(_ep_add_download_command name)
else()
if(${url} MATCHES ^[a-z]+://)
# TODO: Should download and extraction be different steps?
-string(REGEX MATCH [^/\\?]*$ fname ${url})
+if(x${fname} STREQUAL x)
+ string(REGEX MATCH [^/\\?]*$ fname ${url})
+endif()
if(NOT ${fname} MATCHES (\\.|=)(bz2|tar|tgz|tar\\.gz|zip)$)
string(REGEX MATCH ([^/\\?]+(\\.|=)(bz2|tar|tgz|tar\\.gz|zip))/.*$
match_result ${url})
set(fname ${CMAKE_MATCH_1})
---
Summary of changes:
Modules/ExternalProject.cmake |6 +-
1 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
