Re: [cmake-developers] Working towards Windows Phone 8 support
Hi, I've had a look at the CMAKE_GENERATOR_TOOLSET option now. I think the correct approach for WP8 is to hardcode v110_wp80 as it's the only option that will properly give a working WP8 project. Thanks Brad for pointing this out though - this might be useful for targeting versions in future releases of the WPx SDK. Since I'm splitting this into 2 interrelated parts, I think it makes sense to host the patches on github so that the code dependency between the two parts can be seen. I'll post to the list when there's something to review. I think the first (and largest) stage of this is to support Windows Store apps for Win32/ARM multiple architecture. Am I right in thinking this is what Visual Studio 11 ARM generates? (If so it's a bit of a misleading name and something like Visual Studio 11 Windows-Store would be more accurate, but I'll leave it for now :)). Are there any existing tests of cmVisualStudio10TargetGenerator I can use to check for regressions and extend? Thanks, Paul. From: cmake-developers-boun...@cmake.org [mailto:cmake-developers-boun...@cmake.org] On Behalf Of Paul Annetts Sent: 15 July 2013 22:55 To: Brad King Cc: cmake-developers@cmake.org Subject: Re: [cmake-developers] Working towards Windows Phone 8 support Sure - that should separate out well into two parts (Win32/ARM architecture and Windows Phone). The way I'm currently specifying the multiple architectures is too hard-coded to be generally useful (I'm just checking the generator type), so I'll see if I can tidy that up first before submitting that patch. Paul. Date: Mon, 15 Jul 2013 13:29:17 -0400 From: mailto:brad.k...@kitware.com brad.k...@kitware.com To: mailto:p...@lightunobscured.com p...@lightunobscured.com CC: mailto:cmake-developers@cmake.org cmake-developers@cmake.org Subject: Re: [cmake-developers] Working towards Windows Phone 8 support On 7/15/2013 11:08 AM, Paul Annetts wrote: Yes. There are only 2 possible architectures for WP8, it isn't WinCE [snip] The extension of the VS10 target generator to support this is the largest change in the patch. If possible, please factor that out as a separate patch independent of the Windows Phone work. This would be a generally useful feature and has been requested before. Note also that the Xcode generator supports multiple simultaneous architectures for universal binaries. This may be related. -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] framework-interface-includes topic
Brad King wrote: Steve, Thanks for working on this. Please update the documentation of tll() to mention this behavior. Also, the use of CollapseFullPath to evaluate /.. seems more complicated than necessary. A single CollapseFullPath of the original input followed by a check against a pre-compiled regex can check for framework paths in one step. What would such a regex look like? Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014302]: [PATCH] Find MinGW even if it came included with the Code::Blocks IDE and is installed inside the Code::Blocks directory
The following issue has been SUBMITTED.
==
http://www.cmake.org/Bug/view.php?id=14302
==
Reported By:Jason Spiro
Assigned To:
==
Project:CMake
Issue ID: 14302
Category: CMake
Reproducibility:N/A
Severity: trivial
Priority: normal
Status: new
==
Date Submitted: 2013-07-19 07:04 EDT
Last Modified: 2013-07-19 07:04 EDT
==
Summary:[PATCH] Find MinGW even if it came included with the
Code::Blocks IDE and is installed inside the Code::Blocks directory
Description:
I installed MinGW not using the MinGW installer, but using the Code::Blocks IDE
installer
(http://prdownload.berlios.de/codeblocks/codeblocks-12.11mingw-setup.exe). So
my copy of MinGW isn't in c:\MinGW. Instead, it's in c:\Program
Files\CodeBlocks\MinGW.
The problem is that, as shipped, CMake doesn't look there to find MinGW.
The following trivial patch enhances CMake on Windows so that it will check in
the Code::Blocks directory while trying to find MinGW.
Signed-off-by: Jason Spiro jasonspi...@gmail.com
---
Modules/CMakeMinGWFindMake.cmake |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake
index efba20a..9d289ee 100644
--- a/Modules/CMakeMinGWFindMake.cmake
+++ b/Modules/CMakeMinGWFindMake.cmake
@@ -14,7 +14,8 @@
find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin
- c:/MinGW/bin /MinGW/bin)
+ c:/MinGW/bin /MinGW/bin
+ [HKEY_CURRENT_USER\\Software\\CodeBlocks;Path]/MinGW/bin)
find_program(CMAKE_SH sh.exe )
if(CMAKE_SH)
message(FATAL_ERROR sh.exe was found in your PATH, here:\n${CMAKE_SH}\nFor
MinGW make to work correctly sh.exe must NOT be in your path.\nRun cmake from a
shell that does not have sh.exe in your PATH.\nIf you want to use a UNIX shell,
then use MSYS Makefiles.\n)
==
Issue History
Date ModifiedUsername FieldChange
==
2013-07-19 07:04 Jason SpiroNew Issue
==
--
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] SelectLibraryConfigurations cached/advanced variables
On 07/19/2013 06:32 AM, Daniele E. Domenichelli wrote: On 18/07/13 21:54, Brad King wrote: Please update your topic to fix this and make sure tests pass locally before publishing. Done! Sorry about that! Great, 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] Working towards Windows Phone 8 support
On 07/19/2013 05:42 AM, Paul Annetts wrote: I think the first (and largest) stage of this is to support Windows Store apps for Win32/ARM multiple architecture. Am I right in thinking this is what Visual Studio 11 ARM generates? That generates for the ARM architecture. It was a contributed generator and I haven't used it so I don't know more than that. Are there any existing tests of cmVisualStudio10TargetGenerator I can use to check for regressions and extend? There are no unit tests of individual generators. Instead the test suite covers use cases that are expected to work everywhere and they get tested with all the generators. There are a few generator-specific features that have dedicated tests but they are still driven as end user use cases. Everything is in the Tests/ directory. -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] CMAKE_SYSROOT vs CMAKE_OSX_SYSROOT
On 07/19/2013 12:02 AM, clin...@elemtech.com wrote: - Original Message - It looks to me like CMAKE_SYSROOT and CMAKE_OSX_SYSROOT are pretty much identical other than the logical name mapping. At a minimum we need to make them mutually exclusive (at most one can be set in a single build tree). Ideally we should combine them so that one only needs to set CMAKE_SYSROOT on any platform. Combining them is safe only if we're sure CMAKE_SYSROOT will not be used for anything besides the toolchain system SDK. I'm seeing slight hints that we should not merge them. $ xcrun --help ... --sdk sdk name find the tool for the given SDK name This one is for the value passed to the -isysroot flag. --toolchain name find the tool for the given toolchain This one is for selecting the compiler tool (cc) location. I currently have SDKs are under /Applications/Xcode.app/Contents/Developer/Platform - 10.7, 10.8, iPhoneOS6.1, iPhoneSimulator6.1 and toolchains found under /Applications/Xcode.app/Contents/Developer/Toolchains - XcodeDefault.xctoolchain (clang) By toolchain system SDK I meant point the toolchain at the SDK for the target system. Regardless of how many SDKs are available or how they are organized one still chooses exactly one of them to pass as -isysroot on OS X. That is what CMAKE_OSX_SYSROOT does. The proposed CMAKE_SYSROOT generates the --sysroot flag on Linux and perhaps other platforms. They seem the same to me on the respective platforms. -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] How to set environment variable for custom command.
Sorry wrong ML :(. On Fri, Jul 19, 2013 at 4:36 PM, Nicolas Desprès nicolas.desp...@gmail.comwrote: Hi, In Unix shell we can do that: $ VAR=foo cmd in out This way the environment variable is only set in the environment of the process of the command and not the in current shell like when using the export built-in. I would like to be able to do the same for a custom command in CMake. Ideally I was looking for something like that: add_custom_command( OUTPUT out COMMAND cmd in out DEPENDS in ENVIRONMENT VAR foo ) Any idea? Cheers, -- Nicolas Desprès -- Nicolas Desprès -- 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] How to set environment variable for custom command.
Hi, In Unix shell we can do that: $ VAR=foo cmd in out This way the environment variable is only set in the environment of the process of the command and not the in current shell like when using the export built-in. I would like to be able to do the same for a custom command in CMake. Ideally I was looking for something like that: add_custom_command( OUTPUT out COMMAND cmd in out DEPENDS in ENVIRONMENT VAR foo ) Any idea? Cheers, -- Nicolas Desprès -- 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] How to set environment variable for custom command.
On 07/19/2013 10:36 AM, Nicolas Desprès wrote: Hi, In Unix shell we can do that: $ VAR=foo cmd in out This way the environment variable is only set in the environment of the process of the command and not the in current shell like when using the export built-in. I would like to be able to do the same for a custom command in CMake. Ideally I was looking for something like that: add_custom_command( OUTPUT out COMMAND cmd in out DEPENDS in ENVIRONMENT VAR foo ) There has been some progress here: https://github.com/Kitware/CMake/pull/31 -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] How to set environment variable for custom command.
On 2013-07-19 10:36, Nicolas Desprès wrote: In Unix shell we can do that: $ VAR=foo cmd in out This way the environment variable is only set in the environment of the process of the command and not the in current shell like when using the export built-in. I would like to be able to do the same for a custom command in CMake. Ideally I was looking for something like that: add_custom_command( OUTPUT out COMMAND cmd in out DEPENDS in ENVIRONMENT VAR foo ) Any idea? Well, if you only care about UNIX you can always use /bin/env :-). I'm not sure if build tools on Windows are able to support setting environment variables. If you need to do it portably (and can't use the code Brad mentioned), you may need to use cmake's -P mode with a script that wraps your command (using execute_process) after first setting up the desired environment. -- Matthew -- 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] How to set environment variable for custom command.
On 2013-07-19 12:35-0400 Matthew Woehlke wrote:
On 2013-07-19 10:36, Nicolas Desprès wrote:
In Unix shell we can do that:
$ VAR=foo cmd in out
This way the environment variable is only set in the environment of the
process of the command and not the in current shell like when using the
export built-in.
I would like to be able to do the same for a custom command in CMake.
Ideally I was looking for something like that:
add_custom_command(
OUTPUT out
COMMAND cmd in out
DEPENDS in
ENVIRONMENT VAR foo
)
Any idea?
Well, if you only care about UNIX you can always use /bin/env :-).
Actually, using env is not that platform-limiting since it is
available with MSYS. For those not aware of the env capabilities a
simple example (setting the PATH in various ways to run different
cmake varsions) is
COMMAND ${ENV_EXECUTABLE} PATH=whatever ${CMAKE_COMMAND} --version
where ENV_EXECUTABLE is the result of find_program(ENV_EXECUTABLE
env). Also note that env can be used to set multiple environment
variables for a particular command.
I use env a lot for the custom commands in the build_projects project.
I have found it works fine (with some care) for a number of different
generators/platforms, e.g., Unix Makefiles on Linux, Ninja (both
on Linux and for MinGW/MSYS/Windows), MSYS Makefiles, MinGW
Makefiles, and NMake Makefiles Jom.
Alan
__
Alan W. Irwin
Astronomical research affiliation with Department of Physics and Astronomy,
University of Victoria (astrowww.phys.uvic.ca).
Programming affiliations with the FreeEOS equation-of-state
implementation for stellar interiors (freeeos.sf.net); the Time
Ephemerides project (timeephem.sf.net); PLplot scientific plotting
software package (plplot.sf.net); the libLASi project
(unifont.org/lasi); the Loads of Linux Links project (loll.sf.net);
and the Linux Brochure Project (lbproject.sf.net).
__
Linux-powered Science
__
--
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] Please review CXXFeatures.cmake
Alexander Neundorf wrote: On Monday 29 April 2013, Rolf Eike Beer wrote: Alexander Neundorf wrote: On Sunday 28 April 2013, Rolf Eike Beer wrote: One question I see increasingly often is how do I test for C++11 support or for specific parts of that. For 2.8.12 I plan to include the check module I wrote for that a while back, and that I have reworked in the last weeks. You can find the current state in the rework branch of this repository: git://anongit.kde.org/scratch/dakon/cmake-cxx11 Is the try_run() in all cases necessary ? It would be better if a try_compile() would suffice, that's faster and then it works the same way when cross-compiling and when not. I'm not sure about this, but the other ones I consider real bugs. Thanks for catching them, will fix soon. is this in master in the meantime ? I can't find it, or has it been renamed ? Ok, I've pushed an updated version to the rework branch. A test for the component check is missing, but all of your other suggestions should have been addressed. Has anyone anything else, otherwise I will o and put this into CMake next once I have the test. Eike -- signature.asc Description: This is a digitally signed message part. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] CMake toolchain file changing shared library loading name
Hello. I have a strange issue when cross compiling with CMake. When i compile for host, in the resulting binary i have: readelf -d ./test ... 0x0001 (NEEDED) Shared library: [libfoo.so] 0x000f (RPATH) Library rpath: [$ORIGIN/../../lib/] ... When i use CMake toolchain file (cmake -DCMAKE_TOOLCHAIN_FILE=arm_ test.cmake .) i have: readelf -d ./test ... 0x0001 (NEEDED) Shared library: [/home/mgh/proj/test/lib/libfoo.so] 0x000f (RPATH) Library rpath: [$ORIGIN/../../lib/] ... My toolchain file is very simple: set( CMAKE_SYSTEM_NAME armLinux ) set( CMAKE_C_COMPILER arm-linux-gnueabi-gcc ) set( CMAKE_CXX_COMPILER arm-linux-gnueabi-g++ ) set( CMAKE_FIND_ROOT_PATH /home/mgh/toolchains/arm-linux-gnueabi/bin ) So my question is why path to libfoo.so has been changed in executable after cross compiling? Thank you. -- 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 toolchain file changing shared library loading name
Does /home/mgh/proj/test/lib/libfoo.so not have a SONAME while your native libfoo.so does? The linker may use the SONAME when available and might fall back to the path as seen on the command line (/home/mgh/proj/test/lib/libfoo.so) otherwise? Nils On 07/19/2013 10:41 AM, Дмитрий Дороговцев wrote: Hello. I have a strange issue when cross compiling with CMake. When i compile for host, in the resulting binary i have: readelf -d ./test ... 0x0001 (NEEDED) Shared library: [libfoo.so] 0x000f (RPATH) Library rpath: [$ORIGIN/../../lib/] ... When i use CMake toolchain file (cmake -DCMAKE_TOOLCHAIN_FILE=arm_ test.cmake .) i have: readelf -d ./test ... 0x0001 (NEEDED) Shared library: [/home/mgh/proj/test/lib/libfoo.so] 0x000f (RPATH) Library rpath: [$ORIGIN/../../lib/] ... My toolchain file is very simple: set( CMAKE_SYSTEM_NAME armLinux ) set( CMAKE_C_COMPILER arm-linux-gnueabi-gcc ) set( CMAKE_CXX_COMPILER arm-linux-gnueabi-g++ ) set( CMAKE_FIND_ROOT_PATH /home/mgh/toolchains/arm-linux-gnueabi/bin ) So my question is why path to libfoo.so has been changed in executable after cross compiling? Thank you. -- 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] CMake toolchain file changing shared library loading name
2013/7/19 Nils Gladitz nilsglad...@gmail.com Does /home/mgh/proj/test/lib/libfoo.so not have a SONAME while your native libfoo.so does? The linker may use the SONAME when available and might fall back to the path as seen on the command line (/home/mgh/proj/test/lib/libfoo.so) otherwise? Nils Yes, you are totally right! I have explicitly set soname to library with set( CMAKE_SHARED_LINKER_FLAGS -Wl,-soname,libfoo.so ) and after this final executable shows its dependencies as host one. Thank you very much. I have one more question, though: should I set soname every time explicitly or this should be done by toolchain linker? -- 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 toolchain file changing shared library loading name
When the library is being created by CMake itself I would have expected a SONAME by default: Default is to set soname on all shared libraries and modules as long as the platform supports it. Is armLinux a valid value for CMAKE_SYSTEM_NAME? Quick glimpse at some documentation suggests you may want Linux instead since there are no armLinux platform files. I assume that may also set the proper flags for SONAME to work by default(?) Nils On 07/19/2013 11:31 AM, Дмитрий Дороговцев wrote: 2013/7/19 Nils Gladitz nilsglad...@gmail.com mailto:nilsglad...@gmail.com Does /home/mgh/proj/test/lib/libfoo.so not have a SONAME while your native libfoo.so does? The linker may use the SONAME when available and might fall back to the path as seen on the command line (/home/mgh/proj/test/lib/libfoo.so) otherwise? Nils Yes, you are totally right! I have explicitly set soname to library with set( CMAKE_SHARED_LINKER_FLAGS -Wl,-soname,libfoo.so ) and after this final executable shows its dependencies as host one. Thank you very much. I have one more question, though: should I set soname every time explicitly or this should be done by toolchain linker? -- 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] CDash questions
Hi, I'm currently in the process of setting up automatic builds using CMake, CTest and CDash So far I've got builds working, and subprojects seem to be successfully implemented, but there are a few things it would be useful to know. 1) Is there a way to quickly remove multiple builds from the dashboard? since I'm currently still setting up scripts I'm doing a lot of builds to test things, and with so many builds on the dashboard, it can be hard to see the wood for the trees... which brings me on to question 2.. 2) It seems that the default display (when I just select the dashboard link) shows some sort of cumulation of warnings and errors from a previous set of builds. a) is that correct behaviour? In which case, what is the starting point of the cummulative? Is it all builds since the nightly build time? b) Can I change it? I don't want to see how many errors I've had today, I want to see how many errors there were in the last build done on that system. 3) Currently, though the builds are on a per subproject basis, and configure is also called on that basis, the configuration is always for the whole project, is there a standard method for passing a subproject option to the CMake for my CMake scripts to configure subprojects individually (giving more useful information in the configuration columns of the subprojects. 4) Submission times are an hour out. Daylight savings time is not being applied somewhere... any clues where I should look? thanks in advance Jon -- 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 toolchain file changing shared library loading name [SOLVED]
2013/7/19 Nils Gladitz nilsglad...@gmail.com When the library is being created by CMake itself I would have expected a SONAME by default: Default is to set soname on all shared libraries and modules as long as the platform supports it. Is armLinux a valid value for CMAKE_SYSTEM_NAME? Quick glimpse at some documentation suggests you may want Linux instead since there are no armLinux platform files. I assume that may also set the proper flags for SONAME to work by default(?) Nils You are right again :) So my general mistake was to provide custom-made value for CMAKE_SYSTEM_NAME, while preset one works fine, allowing to set correct name of a shared library and thus making linker to setup correct dependency. Thank you a lot. -- 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] CDash questions
4) Submission times are an hour out. Daylight savings time is not being
applied somewhere... any clues where I should look?
Add
'ini_set('date.timezone', 'CEST');'
to your
cdash/config.local.php
and fill in your local timezone abbreviation string or 'UTC+-x'(here
CEST ≘ Central European Summer Time)!
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CDash questions
4) Submission times are an hour out. Daylight savings time is not being
applied somewhere... any clues where I should look?
Add
'ini_set('date.timezone', 'CEST');'
to your
cdash/config.local.php
and fill in your local timezone abbreviation string or 'UTC+-x'(here
CEST ≘ Central European Summer Time)!
And don't forget your local timezone when setting the 'Nightly
Starttime' (Edit Project-Testing) of your project(s)!
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] How to set environment variable for custom command
Hi, In Unix shell we can do that: $ VAR=foo cmd in out This way the environment variable is only set in the environment of the process of the command and not the in current shell like when using the export built-in. I would like to be able to do the same for a custom command in CMake. Ideally I was looking for something like that: add_custom_command( OUTPUT out COMMAND cmd in out DEPENDS in ENVIRONMENT VAR foo ) Any idea? Cheers, -- Nicolas Desprès -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to set environment variable for custom command
Hi, On Fri, Jul 19, 2013 at 4:37 PM, Nicolas Desprès nicolas.desp...@gmail.comwrote: Hi, In Unix shell we can do that: $ VAR=foo cmd in out This way the environment variable is only set in the environment of the process of the command and not the in current shell like when using the export built-in. I would like to be able to do the same for a custom command in CMake. Ideally I was looking for something like that: add_custom_command( OUTPUT out COMMAND cmd in out DEPENDS in ENVIRONMENT VAR foo ) I can see two options to achieve this: a) set the environment variable when calling make in the same way as above. Custom commands are actually executed by make and get the envvars from the make environment b) let cmake generate a shell script (using configure_file) and set the envvar in there, it would also contain the command executable and pass on any arguments using $@. Then use the script as custom command instead of the real command. Andreas -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3241-g2d0d213
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 2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e (commit) via bcb574ef561402ef16a98197d5ccbb6d9cdf4232 (commit) from 8e30b4b6d66d274ec72022254c97f562a2463156 (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=2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e commit 2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e Merge: 8e30b4b bcb574e Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Fri Jul 19 06:30:34 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jul 19 06:30:34 2013 -0400 Merge topic 'SelectLibraryConfigurations' into next bcb574e [SelectLibraryConfigurations] Update unit-test with the new logic http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcb574ef561402ef16a98197d5ccbb6d9cdf4232 commit bcb574ef561402ef16a98197d5ccbb6d9cdf4232 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Fri Jul 19 12:26:13 2013 +0200 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Fri Jul 19 12:26:13 2013 +0200 [SelectLibraryConfigurations] Update unit-test with the new logic diff --git a/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt b/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt index 5bf0f8a..6d1628a 100644 --- a/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt +++ b/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt @@ -29,7 +29,7 @@ if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) endif () -check_slc(empty ) +check_slc(empty empty_LIBRARY-NOTFOUND) set(OPTONLY_LIBRARY_RELEASE opt) check_slc(OPTONLY opt) --- Summary of changes: .../SelectLibraryConfigurations/CMakeLists.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3244-g82e110f
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 82e110fc1b16ec6dd3c7e31dc95638fd36e66f14 (commit)
via 9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1 (commit)
via e3c9be07b25efd06bf38bcd1a740f8bfe7cfb24c (commit)
from 2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e (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=82e110fc1b16ec6dd3c7e31dc95638fd36e66f14
commit 82e110fc1b16ec6dd3c7e31dc95638fd36e66f14
Merge: 2d0d213 9cdc5e6
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jul 19 08:01:09 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 19 08:01:09 2013 -0400
Merge topic 'mingw-in-codeblocks' into next
9cdc5e6 MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
e3c9be0 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1
commit 9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1
Author: Jason Spiro jasonspi...@gmail.com
AuthorDate: Fri Jul 19 07:04:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jul 19 07:56:37 2013 -0400
MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
If one installs MinGW using the Code::Blocks IDE installer it goes to a
path like c:\Program Files\CodeBlocks\MinGW, not c:\MinGW. Use the
CodeBlocks registry entry to get the location.
Signed-off-by: Jason Spiro jasonspi...@gmail.com
diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake
index efba20a..d7298dc 100644
--- a/Modules/CMakeMinGWFindMake.cmake
+++ b/Modules/CMakeMinGWFindMake.cmake
@@ -14,7 +14,9 @@
find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin
- c:/MinGW/bin /MinGW/bin)
+ c:/MinGW/bin /MinGW/bin
+ [HKEY_CURRENT_USER\\Software\\CodeBlocks;Path]/MinGW/bin
+ )
find_program(CMAKE_SH sh.exe )
if(CMAKE_SH)
message(FATAL_ERROR sh.exe was found in your PATH, here:\n${CMAKE_SH}\nFor
MinGW make to work correctly sh.exe must NOT be in your path.\nRun cmake from a
shell that does not have sh.exe in your PATH.\nIf you want to use a UNIX shell,
then use MSYS Makefiles.\n)
---
Summary of changes:
Modules/CMakeMinGWFindMake.cmake |4 +++-
Source/CMakeVersion.cmake|2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3246-gee4b951
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 ee4b951bd45a68c5f81715d33b4139bde4932fe8 (commit)
via e4fe07768e1756d6d7e8cd308a54845dbeef332f (commit)
from 82e110fc1b16ec6dd3c7e31dc95638fd36e66f14 (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=ee4b951bd45a68c5f81715d33b4139bde4932fe8
commit ee4b951bd45a68c5f81715d33b4139bde4932fe8
Merge: 82e110f e4fe077
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jul 19 13:10:49 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 19 13:10:49 2013 -0400
Merge topic 'framework-interface-includes' into next
e4fe077 Use linked frameworks as a source of include directories.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4fe07768e1756d6d7e8cd308a54845dbeef332f
commit e4fe07768e1756d6d7e8cd308a54845dbeef332f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Jul 8 16:59:03 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Jul 19 19:09:28 2013 +0200
Use linked frameworks as a source of include directories.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a043c05..37b20ec 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3395,6 +3395,32 @@ std::vectorstd::string
cmTarget::GetIncludeDirectories(const char *config)
new cmTargetInternals::TargetPropertyEntry(cge,
it-Value));
}
+
+if(this-Makefile-IsOn(APPLE))
+ {
+ LinkImplementation const* impl = this-GetLinkImplementation(config,
+ this);
+ for(std::vectorstd::string::const_iterator
+ it = impl-Libraries.begin();
+ it != impl-Libraries.end(); ++it)
+{
+std::string libDir = cmSystemTools::CollapseFullPath(it-c_str());
+
+static cmsys::RegularExpression
+ frameworkCheck((\\.framework)(/Versions/[^/]+)?/[^/]+$);
+if(!frameworkCheck.find(libDir))
+ {
+ continue;
+ }
+
+cmGeneratorExpression ge(lfbt);
+cmsys::auto_ptrcmCompiledGeneratorExpression cge =
+ ge.Parse(cmSystemTools::GetParentDirectory(libDir.c_str()));
+this-Internal
+-CachedLinkInterfaceIncludeDirectoriesEntries[configString]
+.push_back(new cmTargetInternals::TargetPropertyEntry(cge));
+}
+ }
}
processIncludeDirectories(this,
diff --git a/Source/cmTargetLinkLibrariesCommand.h
b/Source/cmTargetLinkLibrariesCommand.h
index 96cfe65..9ee54ab 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -109,6 +109,11 @@ public:
INTERFACE_POSITION_INDEPENDENT_CODE: Sets POSITION_INDEPENDENT_CODE\n
or checked for consistency with existing value\n
\n
+ If an item is a library in a Mac OX framework, the Headers
+ directory of the framework will also be processed as a \usage
+ requirement\. This has the same effect as passing the framework
+ directory as an include directory.
+ \n
target_link_libraries(target\n
PRIVATE|PUBLIC|INTERFACE lib ...\n
[PRIVATE|PUBLIC|INTERFACE lib ... ] ...])\n
diff --git a/Tests/ExportImport/Export/CMakeLists.txt
b/Tests/ExportImport/Export/CMakeLists.txt
index f810f3b..3262523 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -312,6 +312,12 @@ install(
FRAMEWORK DESTINATION Frameworks
BUNDLE DESTINATION Applications
)
+if (APPLE)
+ file(COPY testLib4.h DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/testLib4.framework/Headers)
+ file(COPY testLib4.h DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/Debug/testLib4.framework/Headers)
+ file(COPY testLib4.h DESTINATION
${CMAKE_CURRENT_BINARY_DIR}/Release/testLib4.framework/Headers)
+ install(FILES testLib4.h DESTINATION Frameworks/testLib4.framework/Headers)
+endif()
install(
TARGETS
testExe2libImp testLib3Imp
diff --git a/Tests/ExportImport/Export/testLib4.h
b/Tests/ExportImport/Export/testLib4.h
new file mode 100644
index 000..9eeda7c
--- /dev/null
+++ b/Tests/ExportImport/Export/testLib4.h
@@ -0,0 +1,2 @@
+
+#define TESTLIB4_H
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt
b/Tests/ExportImport/Import/A/CMakeLists.txt
index aa8847b..2627354 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -210,6 +210,10 @@ if
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3253-g55de65e
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 55de65e7179782b252ea803b3087d6df59da9d28 (commit)
via 9f5108f1983306b0abf4c91b36fdb8199bc9f6ef (commit)
via bb68011cbabc40fedf3c7c9cbfe05f85473b26cf (commit)
via 9d11f6d9df187945025d062b103cfdc38d94b105 (commit)
via 5911453fd21455cf56f339604c83fb49fb4bf6c2 (commit)
via 6d77e1ab3f6cfe5e2019a418da7c18cc3515ab54 (commit)
via 8c0e32550cf8afbb8419dff3698915b550e9c86d (commit)
from ee4b951bd45a68c5f81715d33b4139bde4932fe8 (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=55de65e7179782b252ea803b3087d6df59da9d28
commit 55de65e7179782b252ea803b3087d6df59da9d28
Merge: ee4b951 9f5108f
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jul 19 13:50:15 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 19 13:50:15 2013 -0400
Merge topic 'cpack-wix' into next
9f5108f CPackWIX: Add support for custom WiX templates
bb68011 CMakeCPack: Provide an upgrade guid for WiX
9d11f6d CPackWIX: Add option to specify the language(s) of the installer
5911453 CPackWIX: Handle multiple shortcuts in the start menu
6d77e1a CPackWIX: Fix MSI package layout regression from parent
8c0e325 CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f5108f1983306b0abf4c91b36fdb8199bc9f6ef
commit 9f5108f1983306b0abf4c91b36fdb8199bc9f6ef
Author: Adam J. Weigold a...@adamweigold.com
AuthorDate: Tue Jul 2 17:19:31 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jul 19 11:42:16 2013 -0400
CPackWIX: Add support for custom WiX templates
WiX provides a lot of functionality for installers that cannot be
supported (easily) in the default WIX.template.in file.
For most users, the default template should be fine. However if users
want to produce merge modules, include custom actions, etc, this new
option allows for a hook into how the wxs is produced.
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 4f57efa..fce25f0 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -93,6 +93,15 @@
# http://wix.sourceforge.net/manual-wix3/WixUI_localization.htm
#
##end
+##variable
+# CPACK_WIX_TEMPLATE - Template file for WiX generation
+#
+# If this variable is set, the specified template will be used to generate the
WiX wxs file.
+# This should be used if further customization of the output is required.
+#
+# If this variable is not set, the default MSI template included with CMake
will be used.
+#
+##end
#=
# Copyright 2012 Kitware, Inc.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 9ea4b7a..e921819 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -451,6 +451,10 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
directoryDefinitions.EndElement();
std::string wixTemplate = FindTemplate(WIX.template.in);
+ if(GetOption(CPACK_WIX_TEMPLATE) != 0)
+{
+wixTemplate = GetOption(CPACK_WIX_TEMPLATE);
+}
if(wixTemplate.empty())
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb68011cbabc40fedf3c7c9cbfe05f85473b26cf
commit bb68011cbabc40fedf3c7c9cbfe05f85473b26cf
Author: Richard Ulrich ri...@paraeasy.ch
AuthorDate: Wed May 8 17:13:31 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jul 19 11:41:16 2013 -0400
CMakeCPack: Provide an upgrade guid for WiX
Set CPACK_WIX_UPGRADE_GUID. Without this upgrade GUID, you end up with
multiple instances of the same installation when installing cmake from a
WIX generated installer.
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index a27d000..2495c44 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -113,6 +113,8 @@ if(EXISTS ${CMAKE_ROOT}/Modules/CPack.cmake)
include(Utilities/Release/Cygwin/CMakeLists.txt)
endif()
+ set(CPACK_WIX_UPGRADE_GUID 8ffd1d72-b7f1-11e2-8ee5-00238bca4991)
+
# Set the options file that needs to be included inside
CMakeCPackOptions.cmake
set(QT_DIALOG_CPACK_OPTIONS_FILE
${CMake_BINARY_DIR}/Source/QtDialog/QtDialogCPack.cmake)
configure_file(${CMake_SOURCE_DIR}/CMakeCPackOptions.cmake.in
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d11f6d9df187945025d062b103cfdc38d94b105
commit 9d11f6d9df187945025d062b103cfdc38d94b105
Author: Richard Ulrich
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3255-g3f5d8ca
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 3f5d8ca1a663d1ad4142944a668080ff452a5788 (commit)
via 0a6e41448023fe4d11c409834cf235bdb28179bd (commit)
from 55de65e7179782b252ea803b3087d6df59da9d28 (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=3f5d8ca1a663d1ad4142944a668080ff452a5788
commit 3f5d8ca1a663d1ad4142944a668080ff452a5788
Merge: 55de65e 0a6e414
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jul 19 14:53:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 19 14:53:30 2013 -0400
Merge topic 'cpack-wix' into next
0a6e414 CPackWIX: Fix signed/unsigned comparison in cmCPackWIXGenerator
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a6e41448023fe4d11c409834cf235bdb28179bd
commit 0a6e41448023fe4d11c409834cf235bdb28179bd
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jul 19 14:50:47 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jul 19 14:48:44 2013 -0400
CPackWIX: Fix signed/unsigned comparison in cmCPackWIXGenerator
While at it, use curly braces to denote the 'if' block.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index e921819..cc9dec7 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -404,9 +404,9 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
fileDefinitions.BeginElement(Shortcut);
std::string shortcutName = fileName; // the iconName is mor likely to
contain blanks early on
- const std::string::difference_type dotPos = shortcutName.find('.');
+ std::string::size_type const dotPos = shortcutName.find('.');
if(std::string::npos == dotPos)
-shortcutName = shortcutName.substr(0, dotPos);
+{ shortcutName = shortcutName.substr(0, dotPos); }
fileDefinitions.AddAttribute(Id, SHORTCUT_ + shortcutName);
fileDefinitions.AddAttribute(Name, iconName);
std::string target = [ + directoryId + ] + fileName;
---
Summary of changes:
Source/CPack/WiX/cmCPackWIXGenerator.cxx |4 ++--
1 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, next, updated. v2.8.11.2-3257-gf4e1a8b
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 f4e1a8b164d7f732037dff909d70602106a3b21a (commit)
via 4b1919f73e7663799285171b472d76053fb99166 (commit)
from 3f5d8ca1a663d1ad4142944a668080ff452a5788 (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=f4e1a8b164d7f732037dff909d70602106a3b21a
commit f4e1a8b164d7f732037dff909d70602106a3b21a
Merge: 3f5d8ca 4b1919f
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Fri Jul 19 16:57:17 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jul 19 16:57:17 2013 -0400
Merge topic 'AddCommentsToExportsFile' into next
4b1919f ExportTargets: add one more comment to the generated file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b1919f73e7663799285171b472d76053fb99166
commit 4b1919f73e7663799285171b472d76053fb99166
Author: Alex Neundorf neund...@kde.org
AuthorDate: Fri Jul 19 22:57:33 2013 +0200
Commit: Alex Neundorf neund...@kde.org
CommitDate: Fri Jul 19 22:57:33 2013 +0200
ExportTargets: add one more comment to the generated file.
This patch adds a comment above the block which protects
the exported targets file against multiple inclusion, to make
the file easier to understand for readers.
Alex
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b4e6e81..90e6d51 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -792,7 +792,9 @@ void
cmExportFileGenerator::GenerateImportVersionCode(std::ostream os)
void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream os,
const std::string expectedTargets)
{
- os set(_targetsDefined)\n
+ os # Protect against multiple inclusion, which would fail when already
+imported targets are added once more.\n
+set(_targetsDefined)\n
set(_targetsNotDefined)\n
set(_expectedTargets)\n
foreach(_expectedTarget expectedTargets )\n
---
Summary of changes:
Source/cmExportFileGenerator.cxx |4 +++-
1 files changed, 3 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.11.2-534-g5f4daff
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 5f4daff8f51b439e9b7190d3e83d96aebd00adef (commit) from e3c9be07b25efd06bf38bcd1a740f8bfe7cfb24c (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=5f4daff8f51b439e9b7190d3e83d96aebd00adef commit 5f4daff8f51b439e9b7190d3e83d96aebd00adef Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Jul 20 00:01:04 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Jul 20 00:01:04 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3a519b0..5150a8e 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 11) -set(CMake_VERSION_TWEAK 20130719) +set(CMake_VERSION_TWEAK 20130720) #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
