[cmake-developers] [CMake 0015093]: PARENT_SCOPE empties variables when recursived used
The following issue has been SUBMITTED.
==
http://www.cmake.org/Bug/view.php?id=15093
==
Reported By:abma
Assigned To:
==
Project:CMake
Issue ID: 15093
Category: CMake
Reproducibility:always
Severity: major
Priority: normal
Status: new
==
Date Submitted: 2014-08-18 02:05 EDT
Last Modified: 2014-08-18 02:05 EDT
==
Summary:PARENT_SCOPE empties variables when recursived used
Description:
when a PARENT_SCOPE'd variable is set to a value of a PARENT_SCOPE'd variable,
both are empty:
set(a a PARENT_SCOPE)
set(b ${a} PARENT_SCOPE)
expected result:
a = a
b = a
but in real both are empty!
Additional Information:
can be workarounded:
macro(MakeGlobalVar varname)
set(${varname} ${ARGN} PARENT_SCOPE)
set(${varname} ${ARGN})
endmacro()
MakeGlobalVar(a a)
MakeGlobalVar(b ${a})
==
Issue History
Date ModifiedUsername FieldChange
==
2014-08-18 02:05 abma New Issue
==
--
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://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015094]: AUTOUIC only finds .ui files if ui_blah.h is in the header
The following issue has been SUBMITTED. == http://www.gccxml.org/Bug/view.php?id=15094 == Reported By:Craig Scott Assigned To: == Project:CMake Issue ID: 15094 Category: CMake Reproducibility:always Severity: major Priority: normal Status: new == Date Submitted: 2014-08-18 03:17 EDT Last Modified: 2014-08-18 03:17 EDT == Summary:AUTOUIC only finds .ui files if ui_blah.h is in the header Description: I'm testing the behaviour of AUTOUIC with CMake 3.0.1. The #include ui_foo.h line typically appears in the .cpp file rather than a header. I've noticed that CMake is failing to generate the ui_foo.h files from the foo.ui file when the ui_foo.h is included in the .cpp. The file generation works fine if the #include is in our header instead of the .cpp. == Issue History Date ModifiedUsername FieldChange == 2014-08-18 03:17 Craig ScottNew Issue == -- 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://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] New platform file for Cray Compute Node Linux
Yep, I had a few other tweaks as well but I didn't want to bombard the list
with a series of tweaks. I just got access to a newer XC30 and things
start to break on there since the new environment modules use different
variable names, things like that. It needs a little more before it will
work universally on a generic Cray but I think it's close. I'll wait until
I get it working on the XC30 as well before I push it.
- Chuck
On Sun, Aug 17, 2014 at 4:57 AM, Rolf Eike Beer e...@sf-mail.de wrote:
Chuck Atkins wrote:
Updated to allow for static and shared libs (yes, you can use shared libs
on a cray). The expectation is that your toolchain file will have the
appropriate logic to deal with this. Something like:
set(CMAKE_SYSTEM_NAME ComputeNodeLinux)
...
if(DEFINED ENV{CRAYPE_LINK_TYPE} AND
$ENV{CRAYPE_LINK_TYPE} EQUALS dynamic)
set(_CRAY_LINK_OPTS -dynamic)
This looks wrong. There is no EQUALS operator in if, and EQUAL is for
comparing numbers. You probably just meant something like
if(ENV{CRAYPE_LINK_TYPE} STREQUAL dynamic)
Eike
--
--
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://public.kitware.com/mailman/listinfo/cmake-developers
--
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://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015096]: Incorrect compiler flag not detected for Intel
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=15096 == Reported By:RolandSchulz Assigned To: == Project:CMake Issue ID: 15096 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-08-18 17:14 EDT Last Modified: 2014-08-18 17:14 EDT == Summary:Incorrect compiler flag not detected for Intel Description: Checking e.g. -Wno-unused-parameter with CheckCXXCompilerFlag for Intel on Windows doesn't detect that the flag is invalid. The attached patch fixes it by hadding the required patern. == Issue History Date ModifiedUsername FieldChange == 2014-08-18 17:14 RolandSchulz New Issue 2014-08-18 17:14 RolandSchulz File Added: patch-cmake-icc-pattern == -- 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://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [PATCH] New module: FindIce.cmake
On Sun, Aug 17, 2014 at 05:22:38PM +0100, Roger Leigh wrote: On Sun, Aug 17, 2014 at 05:50:58PM +0200, Rolf Eike Beer wrote: Am Sonntag, 17. August 2014, 16:21:24 schrieb Roger Leigh: On Fri, Aug 15, 2014 at 12:31:17AM +0100, Roger Leigh wrote: OK. I'll have to read up on this and see what needs doing. In the meantime, I've attached a revised patch with all the above corrections included. Based on the comments made on my other FindXerces patch, I've updated this patch to also use current naming and usage conventions. I hope this is all OK with you. +if((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION GREATER 1400 AND MSVC_VERSION LESS 1500)) if((NOT MSVC_VERSION VERSION_LESS 1400 AND MSVC_VERSION LESS 1500) Thanks, I've fixed this now in the attached patch. One single line change to the patch attached, to add support for FreeBSD, which uses a different slice directory (unversioned share/Ice). This has now been tested on: - Windows with all Ice 3.3, 3.4 and 3.5 versions with VS 2010, 2012, 2013 - MacOS 10.8 and 10.9 with homebrew ice - Linux with Ubuntu 2012.04/ice34, 2014.04/ice35, Debian unstable/ice35 and CentOS 6.5/ice34. - FreeBSD 10.0-STABLE with devel/ice (3.5.1) port Regards, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linuxhttp://people.debian.org/~rleigh/ `. `' schroot and sbuild http://alioth.debian.org/projects/buildd-tools `-GPG Public Key F33D 281D 470A B443 6756 147C 07B3 C8BC 4083 E800 From a559c1ce25e5586151bbe8bbe27eeac8f26014b5 Mon Sep 17 00:00:00 2001 From: Roger Leigh r.le...@dundee.ac.uk Date: Thu, 7 Aug 2014 18:37:36 +0100 Subject: [PATCH] FindIce: New module to find ZeroC Ice - autodetects Ice on all major platforms - allows building with all supported Visual Studio versions on Windows - autodetects the slice path on most platforms - separately detects the Ice programs, headers, slice files and libraries so that any Ice configuration or installation errors can be accurately reported, making diagnosis of Ice problems simpler --- Help/manual/cmake-modules.7.rst | 1 + Help/module/FindIce.rst | 1 + Modules/FindIce.cmake | 408 3 files changed, 410 insertions(+) create mode 100644 Help/module/FindIce.rst create mode 100644 Modules/FindIce.cmake diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 91fffe9..737057c 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -114,6 +114,7 @@ All Modules /module/FindHg /module/FindHSPELL /module/FindHTMLHelp + /module/FindIce /module/FindIcotool /module/FindImageMagick /module/FindITK diff --git a/Help/module/FindIce.rst b/Help/module/FindIce.rst new file mode 100644 index 000..3af9405 --- /dev/null +++ b/Help/module/FindIce.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/FindIce.cmake diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake new file mode 100644 index 000..2ff3e4b --- /dev/null +++ b/Modules/FindIce.cmake @@ -0,0 +1,408 @@ +#.rst: +# FindIce +# --- +# +# Find the ZeroC Internet Communication Engine (ICE) programs, +# libraries and datafiles. +# +# Use this module by invoking find_package with the form:: +# +# find_package(Ice +# [version] [EXACT] # Minimum or EXACT version e.g. 3.5.1 +# [REQUIRED] # Fail with error if Ice is not found +# [COMPONENTS libs...]) # Ice libraries by their name +# +# Components can include any of: ``Freeze``, ``Glacier2``, ``Ice``, +# ``IceBox``, ``IceDB``, ``IceGrid``, ``IcePatch``, ``IceSSL``, +# ``IceStorm``, ``IceUtil``, ``IceXML``, or ``Slice``. +# +# This module reports information about the Ice installation in +# several variables. General variables:: +# +# Ice_VERSION - Ice release version +# Ice_FOUND - true if the main programs and libraries were found +# Ice_LIBRARIES - component libraries to be linked +# Ice_INCLUDE_DIRS - the directories containing the Ice headers +# Ice_SLICE_DIRS - the directories containing the Ice slice interface +#definitions +# +# Ice programs are reported in:: +# +# Ice_SLICE2CPP_EXECUTABLE - path to slice2cpp executable +# Ice_SLICE2CS_EXECUTABLE - path to slice2cs executable +# Ice_SLICE2FREEZEJ_EXECUTABLE - path to slice2freezej executable +# Ice_SLICE2FREEZE_EXECUTABLE - path to slice2freeze executable +# Ice_SLICE2HTML_EXECUTABLE - path to slice2html executable +# Ice_SLICE2JAVA_EXECUTABLE - path to slice2java executable +# Ice_SLICE2PHP_EXECUTABLE - path to slice2php executable +# Ice_SLICE2PY_EXECUTABLE - path to slice2py executable +# Ice_SLICE2RB_EXECUTABLE - path to slice2rb executable +# +# Ice component libraries are reported in:: +# +# Ice_C_FOUND - ON if component was found +# Ice_C_LIBRARIES - libraries for component +# +# Note that ``C`` is the uppercased name of the component. +# +#
Re: [CMake] Using a custom preprocessor
Hi Paul.
The straightfroward way to do thisis with custom commands:
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/foo.f
COMMAND custom_preproc foo.fs -o ${CMAKE_BINARY_DIR}/foo.f
MAIN_DEPENDENCY foo.fs
COMMENT Custom-preprocessing foo.fs
VERBATIM
)
add_executable(myexe
${CMAKE_BINARY_DIR}/foo.f
main.f90
)
Analogously with cs, of course. See documentation of add_custom_command()
for all options available.
Petr
On Fri, Aug 15, 2014 at 7:47 AM, Paul Anton Letnes p...@letnes.com wrote:
Hi!
I am currently working on a project which uses plain old make as a build
system. Needless to say, adding new compilers etc. is a lot of work, so I
would like to start using CMake, which I have had excellent experience with
in the past.
There is one peculiarity that I do not know how to handle. Some of our
code (C and Fortran) is contained in files that end with .cs or .fs, which
are run through an in-house preprocessor. A Makefile target is then
something along the lines of (but not exactly)
foo.o: foo.f
$(FC) -c $(FFLAGS) foo.f
foo.f: foo.fs
custom_preproc foo.fs -o foo.f
Is it possible to, somehow, add this pre-compilation step for such files,
and then
add_executable(myexe
foo.fs
bar.cs
main.f90)
?
Cheers,
Paul
--
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://public.kitware.com/mailman/listinfo/cmake
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] No Such File or Directory
-Original Message- From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of Alan W. Irwin Sent: Sonntag, 17. August 2014 01:51 To: David Zemon Cc: cmake@cmake.org Subject: Re: [CMake] No Such File or Directory On 2014-08-16 15:02-0500 David Zemon wrote: Hello, After downloading the 3.0.1 binary Linux distribution of CMake, I am running into the following bash error: *david@fresh-ubuntu:~/**PropWare/util$* cmake ^ == that is a prompt followed by a blank so it looks like there is no actual path in front of your cmake invocation. bash: /home/david/cmake-3.0.1-Linux-i386/bin/cmake: No such file or directory I am pretty sure this issue is due to a very long-standing Linux security feature where you have to specify executables using a path in front of the name, i.e., from that directory invoke cmake with ./cmake or from anywhere invoke it with the full pathname, e.g., /home/david/cmake-3.0.1-Linux-i386/bin/cmake Hope this guess is right. 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 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://public.kitware.com/mailman/listinfo/cmake Hi, I think you didn't read careful enough. David tries once withou and second time with full path. Furthermore, the `which` command can find cmake, what means it's somewhere in the PATH, so there's no need to specify full path by invokation (do you specify full path when invoking `grep` for example? - I don't think so.) So apparently system cannot find some file, but it's not the CMake executable itself. Marcel Loose's answer makes a lot of sense to me. -- Gruesse, Jakub -- 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://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Using a custom preprocessor
On 18. August 2014 09:20:26 MESZ, Petr Kmoch petr.km...@gmail.com wrote:
Hi Paul.
The straightfroward way to do thisis with custom commands:
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/foo.f
COMMAND custom_preproc foo.fs -o ${CMAKE_BINARY_DIR}/foo.f
MAIN_DEPENDENCY foo.fs
COMMENT Custom-preprocessing foo.fs
VERBATIM
)
add_executable(myexe
${CMAKE_BINARY_DIR}/foo.f
main.f90
)
The foo.fs should also appear here. It is a source file and listing it improves
behavior for e.g. Visual Studio.
Analogously with cs, of course. See documentation of
add_custom_command()
for all options available.
Petr
On Fri, Aug 15, 2014 at 7:47 AM, Paul Anton Letnes p...@letnes.com
wrote:
Hi!
I am currently working on a project which uses plain old make as a
build
system. Needless to say, adding new compilers etc. is a lot of work,
so I
would like to start using CMake, which I have had excellent
experience with
in the past.
There is one peculiarity that I do not know how to handle. Some of
our
code (C and Fortran) is contained in files that end with .cs or .fs,
which
are run through an in-house preprocessor. A Makefile target is then
something along the lines of (but not exactly)
foo.o: foo.f
$(FC) -c $(FFLAGS) foo.f
foo.f: foo.fs
custom_preproc foo.fs -o foo.f
Is it possible to, somehow, add this pre-compilation step for such
files,
and then
add_executable(myexe
foo.fs
bar.cs
main.f90)
?
Cheers,
Paul
--
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://public.kitware.com/mailman/listinfo/cmake
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] No Such File or Directory
The first reply was perfect. All I needed was libc6:i386. So bizarre, but I'm glad you guys could help. David On Aug 18, 2014 2:13 AM, Jakub Zakrzewski jzakrzew...@e2e.ch wrote: -Original Message- From: CMake [mailto:cmake-boun...@cmake.org] On Behalf Of Alan W. Irwin Sent: Sonntag, 17. August 2014 01:51 To: David Zemon Cc: cmake@cmake.org Subject: Re: [CMake] No Such File or Directory On 2014-08-16 15:02-0500 David Zemon wrote: Hello, After downloading the 3.0.1 binary Linux distribution of CMake, I am running into the following bash error: *david@fresh-ubuntu:~/**PropWare/util$* cmake ^ == that is a prompt followed by a blank so it looks like there is no actual path in front of your cmake invocation. bash: /home/david/cmake-3.0.1-Linux-i386/bin/cmake: No such file or directory I am pretty sure this issue is due to a very long-standing Linux security feature where you have to specify executables using a path in front of the name, i.e., from that directory invoke cmake with ./cmake or from anywhere invoke it with the full pathname, e.g., /home/david/cmake-3.0.1-Linux-i386/bin/cmake Hope this guess is right. 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 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://public.kitware.com/mailman/listinfo/cmake Hi, I think you didn't read careful enough. David tries once withou and second time with full path. Furthermore, the `which` command can find cmake, what means it's somewhere in the PATH, so there's no need to specify full path by invokation (do you specify full path when invoking `grep` for example? - I don't think so.) So apparently system cannot find some file, but it's not the CMake executable itself. Marcel Loose's answer makes a lot of sense to me. -- Gruesse, Jakub -- 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://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.0.1-4914-g7420706
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 7420706465563b0fbfa3829d2ff69b05b284178f (commit)
via 02b3cba9df973026487ed9739ff6ca1825814ad1 (commit)
from 82e302f3b3f39393005bf7bb67dd61dcf768aed2 (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=7420706465563b0fbfa3829d2ff69b05b284178f
commit 7420706465563b0fbfa3829d2ff69b05b284178f
Merge: 82e302f 02b3cba
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 10:18:36 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 10:18:36 2014 -0400
Merge topic 'fix-lexer-open-square' into next
02b3cba9 cmListFileLexer: Fix lexing of single '[' character (#15092)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02b3cba9df973026487ed9739ff6ca1825814ad1
commit 02b3cba9df973026487ed9739ff6ca1825814ad1
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 10:18:20 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 18 10:18:20 2014 -0400
cmListFileLexer: Fix lexing of single '[' character (#15092)
The lexer changes in commit v3.0.0-rc1~495^2 (Add Lua-style long
brackets and long comments to CMake language, 2013-08-06) accidentally
left out matching '[' as a single character in an unquoted argument.
Add a lexer rule to match it and extend the RunCMake.Syntax test to
cover this case.
diff --git a/Source/cmListFileLexer.c b/Source/cmListFileLexer.c
index bfa388e..af4fc3d 100644
--- a/Source/cmListFileLexer.c
+++ b/Source/cmListFileLexer.c
@@ -369,8 +369,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t
yyscanner );
*yy_cp = '\0'; \
yyg-yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 23
-#define YY_END_OF_BUFFER 24
+#define YY_NUM_RULES 24
+#define YY_END_OF_BUFFER 25
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -381,10 +381,10 @@ struct yy_trans_info
static yyconst flex_int16_t yy_accept[77] =
{ 0,
0,0,0,0,0,0,0,0,4,4,
- 24, 13, 21,1, 15,3, 13,5,6,7,
- 22, 22, 16, 18, 19, 20, 10, 11,8, 12,
-9,4, 13,0, 13,0, 21,0,0,7,
- 13,0, 13,0,2,0, 13, 16,0, 17,
+ 25, 13, 22,1, 16,3, 13,5,6,7,
+ 15, 23, 17, 19, 20, 21, 10, 11,8, 12,
+9,4, 13,0, 13,0, 22,0,0,7,
+ 13,0, 13,0,2,0, 13, 17,0, 18,
10,8,4,0, 14,0,0,0,0, 14,
0,0, 14,0,0,0,2, 14,0,0,
0,0,0,0,0,0
@@ -523,10 +523,10 @@ static yyconst flex_int16_t yy_chk[253] =
} ;
/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[24] =
+static yyconst flex_int32_t yy_rule_can_match_eol[25] =
{ 0,
-1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0,
-0, 0, 0, 0, };
+1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+0, 0, 0, 0, 0, };
/* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed.
@@ -615,7 +615,7 @@ static void cmListFileLexerDestroy(cmListFileLexer* lexer);
-#line 621 cmListFileLexer.c
+#line 628 cmListFileLexer.c
#define INITIAL 0
#define STRING 1
@@ -850,7 +850,7 @@ YY_DECL
#line 91 cmListFileLexer.in.l
-#line 858 cmListFileLexer.c
+#line 865 cmListFileLexer.c
if ( !yyg-yy_init )
{
@@ -,75 +,84 @@ case 15:
YY_RULE_SETUP
#line 215 cmListFileLexer.in.l
{
+ lexer-token.type = cmListFileLexer_Token_ArgumentUnquoted;
+ cmListFileLexerSetToken(lexer, yytext, yyleng);
+ lexer-column += yyleng;
+ return 1;
+}
+case 16:
+YY_RULE_SETUP
+#line 222 cmListFileLexer.in.l
+{
lexer-token.type = cmListFileLexer_Token_ArgumentQuoted;
cmListFileLexerSetToken(lexer, , 0);
lexer-column += yyleng;
BEGIN(STRING);
}
YY_BREAK
-case 16:
+case 17:
YY_RULE_SETUP
-#line 222 cmListFileLexer.in.l
+#line 229 cmListFileLexer.in.l
{
cmListFileLexerAppend(lexer, yytext, yyleng);
lexer-column += yyleng;
}
YY_BREAK
-case 17:
-/* rule 17 can match eol */
+case 18:
+/* rule 18 can match eol */
YY_RULE_SETUP
-#line 227 cmListFileLexer.in.l
+#line 234 cmListFileLexer.in.l
{
/* Continuation: text is not part of string */
++lexer-line;
lexer-column = 1;
}
YY_BREAK
-case 18:
[Cmake-commits] CMake branch, next, updated. v3.0.1-4916-ga81d5ac
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 a81d5acf82ddef37f434ffd7911fcd0d5cca1dfb (commit)
via 4ffec8f666b996aedd592e6d26286cef2cb38b50 (commit)
from 7420706465563b0fbfa3829d2ff69b05b284178f (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=a81d5acf82ddef37f434ffd7911fcd0d5cca1dfb
commit a81d5acf82ddef37f434ffd7911fcd0d5cca1dfb
Merge: 7420706 4ffec8f
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 10:58:51 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 10:58:51 2014 -0400
Merge topic 'fix-check-module-DEFINED-tests' into next
4ffec8f6 Check*: Add compatibility hack for old VXL code
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ffec8f666b996aedd592e6d26286cef2cb38b50
commit 4ffec8f666b996aedd592e6d26286cef2cb38b50
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 10:49:30 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 18 10:59:08 2014 -0400
Check*: Add compatibility hack for old VXL code
The cleanup in commit 4f2fcce4 (Check*: Allow result variables to
contain regex special characters, 2014-07-31) broke old VXL code that
abuses the old if(MATCHES) implementation by using
SET( ${VARIABLE} ${VARIABLE} )
to reset a check result variable. Add a compatibility hack to the
CheckFunctionExists, CheckIncludeFileCXX, and CheckSymbolExists modules
to re-run their checks when the result variable is set to its own name.
Use STREQUAL instead of MATCHES so that special characters still work.
diff --git a/Modules/CheckFunctionExists.cmake
b/Modules/CheckFunctionExists.cmake
index 01a652b..4c4334f 100644
--- a/Modules/CheckFunctionExists.cmake
+++ b/Modules/CheckFunctionExists.cmake
@@ -38,7 +38,7 @@
macro(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
- if(NOT DEFINED ${VARIABLE})
+ if(NOT DEFINED ${VARIABLE} OR x${${VARIABLE}} STREQUAL x${VARIABLE})
set(MACRO_CHECK_FUNCTION_DEFINITIONS
-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS})
if(NOT CMAKE_REQUIRED_QUIET)
diff --git a/Modules/CheckIncludeFileCXX.cmake
b/Modules/CheckIncludeFileCXX.cmake
index 718e667..eff982c 100644
--- a/Modules/CheckIncludeFileCXX.cmake
+++ b/Modules/CheckIncludeFileCXX.cmake
@@ -44,7 +44,7 @@
# License text for the above reference.)
macro(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
- if(NOT DEFINED ${VARIABLE})
+ if(NOT DEFINED ${VARIABLE} OR x${${VARIABLE}} STREQUAL x${VARIABLE})
if(CMAKE_REQUIRED_INCLUDES)
set(CHECK_INCLUDE_FILE_CXX_INCLUDE_DIRS
-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES})
else()
diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake
index 6f50c88..c31f6b6 100644
--- a/Modules/CheckSymbolExists.cmake
+++ b/Modules/CheckSymbolExists.cmake
@@ -50,7 +50,7 @@ macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
endmacro()
macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE)
- if(NOT DEFINED ${VARIABLE})
+ if(NOT DEFINED ${VARIABLE} OR x${${VARIABLE}} STREQUAL x${VARIABLE})
set(CMAKE_CONFIGURABLE_FILE_CONTENT /* */\n)
set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
if(CMAKE_REQUIRED_LIBRARIES)
---
Summary of changes:
Modules/CheckFunctionExists.cmake |2 +-
Modules/CheckIncludeFileCXX.cmake |2 +-
Modules/CheckSymbolExists.cmake |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4918-gca67124
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 ca6712495cdd958bef3bbaf2bf0d5dabc4ce70d5 (commit)
via 7386d0d6df1b10f14accf843683eaf8692309c1f (commit)
from a81d5acf82ddef37f434ffd7911fcd0d5cca1dfb (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=ca6712495cdd958bef3bbaf2bf0d5dabc4ce70d5
commit ca6712495cdd958bef3bbaf2bf0d5dabc4ce70d5
Merge: a81d5ac 7386d0d
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 11:17:42 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 11:17:42 2014 -0400
Merge topic 'add-CheckFortranSourceCompiles' into next
7386d0d6 Add CheckFortranSourceCompiles module (#14656)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7386d0d6df1b10f14accf843683eaf8692309c1f
commit 7386d0d6df1b10f14accf843683eaf8692309c1f
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 6 10:27:17 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 18 11:18:48 2014 -0400
Add CheckFortranSourceCompiles module (#14656)
Copy the CheckCSourceCompiles module and port it to Fortran.
Extend the FortranOnly test to try using the new module.
Suggested-by: Nicolas Bock nicolasb...@gmail.com
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 91fffe9..c279d50 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -23,6 +23,7 @@ All Modules
/module/CheckCXXSourceRuns
/module/CheckCXXSymbolExists
/module/CheckFortranFunctionExists
+ /module/CheckFortranSourceCompiles
/module/CheckFunctionExists
/module/CheckIncludeFileCXX
/module/CheckIncludeFile
diff --git a/Help/module/CheckFortranSourceCompiles.rst
b/Help/module/CheckFortranSourceCompiles.rst
new file mode 100644
index 000..b749a2a
--- /dev/null
+++ b/Help/module/CheckFortranSourceCompiles.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/CheckFortranSourceCompiles.cmake
diff --git a/Help/release/dev/add-CheckFortranSourceCompiles.rst
b/Help/release/dev/add-CheckFortranSourceCompiles.rst
new file mode 100644
index 000..b78c747
--- /dev/null
+++ b/Help/release/dev/add-CheckFortranSourceCompiles.rst
@@ -0,0 +1,5 @@
+add-CheckFortranSourceCompiles
+--
+
+* The :module:`CheckFortranSourceCompiles` module was added to
+ provide a ``CHECK_Fortran_SOURCE_COMPILES`` macro.
diff --git a/Modules/CheckFortranSourceCompiles.cmake
b/Modules/CheckFortranSourceCompiles.cmake
new file mode 100644
index 000..63e4539
--- /dev/null
+++ b/Modules/CheckFortranSourceCompiles.cmake
@@ -0,0 +1,110 @@
+#.rst:
+# CheckFortranSourceCompiles
+# --
+#
+# Check if given Fortran source compiles and links into an executable::
+#
+# CHECK_Fortran_SOURCE_COMPILES(code var [FAIL_REGEX fail-regex])
+#
+# The arguments are:
+#
+# ``code``
+# Source code to try to compile. It must define a PROGRAM entry point.
+# ``var``
+# Variable to store whether the source code compiled.
+# ``fail-regex``
+# Fail if test output matches this regex.
+#
+# The following variables may be set before calling this macro to modify
+# the way the check is run::
+#
+# CMAKE_REQUIRED_FLAGS = string of compile command line flags
+# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+# CMAKE_REQUIRED_INCLUDES = list of include directories
+# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+# CMAKE_REQUIRED_QUIET = execute quietly without messages
+
+#=
+# Copyright 2005-2009 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.)
+
+
+
+macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR)
+ if(NOT DEFINED ${VAR})
+set(_FAIL_REGEX)
+set(_key)
+foreach(arg ${ARGN})
+ if(${arg} MATCHES ^(FAIL_REGEX)$)
+set(_key ${arg})
+ elseif(_key)
+list(APPEND _${_key} ${arg})
+ else()
+message(FATAL_ERROR Unknown argument:\n ${arg}\n)
+ endif()
+endforeach()
+set(MACRO_CHECK_FUNCTION_DEFINITIONS
+ -D${VAR} ${CMAKE_REQUIRED_FLAGS})
[Cmake-commits] CMake branch, master, updated. v3.0.1-1696-g24f4695
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 24f46959a2f4d00f65fab56e3cbea09d16b7381e (commit) via 63fc8dcdb82e91b7218aab959d75f924f6a01bc1 (commit) from 25c07e61a3807d76f695a24173e9fc82821541a0 (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=24f46959a2f4d00f65fab56e3cbea09d16b7381e commit 24f46959a2f4d00f65fab56e3cbea09d16b7381e Merge: 25c07e6 63fc8dc Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:21:38 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 11:21:38 2014 -0400 Merge topic 'create_test_sourcelist-msvc-warnings' 63fc8dcd create_test_sourcelist: Suppress MSVC warnings in test driver (#15066) --- Summary of changes: Templates/TestDriver.cxx.in |4 1 file changed, 4 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.1-1700-g3353657
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 3353657919f8cd05a206c81056fc9a9bdb29ac00 (commit) via fbf7a9297571b7e26739009d7026fbe21c3ccbc7 (commit) from 258c5c2f27886ca60bda5a6a1f6411310f0bf1df (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=3353657919f8cd05a206c81056fc9a9bdb29ac00 commit 3353657919f8cd05a206c81056fc9a9bdb29ac00 Merge: 258c5c2 fbf7a92 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:21:45 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 11:21:45 2014 -0400 Merge topic 'makefile-assign-escape-octothorpe' fbf7a929 Makefile: Handle '#' in COMPILE_OPTIONS (#15070) --- Summary of changes: Source/cmMakefileTargetGenerator.cxx | 10 +++--- Tests/CompileOptions/CMakeLists.txt |6 ++ Tests/CompileOptions/main.cpp|3 +++ 3 files changed, 16 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.1-1711-gcb57887
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 cb578878093473ef1cb3d2e71791d67a410d4184 (commit) via 6d66e396a1b534e7f13a8e4be83820c5a06d0265 (commit) from e7dda7b9b7373dc823977766d0947a4ca28845cd (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=cb578878093473ef1cb3d2e71791d67a410d4184 commit cb578878093473ef1cb3d2e71791d67a410d4184 Merge: e7dda7b 6d66e39 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:21:58 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 11:21:58 2014 -0400 Merge topic 'fix_mumps_file_parser' 6d66e396 CTEST: Fix MUMPS file parser and update test --- Summary of changes: Source/CTest/cmParseMumpsCoverage.cxx |8 ++- Tests/CMakeLists.txt |4 +- .../VistA-FOIA/Packages/Uncategorized/ZZCOVTST.m |7 +++ Tests/MumpsCoverage/ZZCOVTST.cmcov | 65 +++- Tests/MumpsCoverage/ZZCOVTST.mcov | 62 +++ 5 files changed, 85 insertions(+), 61 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4921-g21b8ed4
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 21b8ed478f842bde32a4562327effbc0b99e7792 (commit)
via 653529ce55a9c33fa7378708793caac92a857794 (commit)
via 39b5df2f3714c32d498fcb7c88f5bda456f75cb3 (commit)
from ca6712495cdd958bef3bbaf2bf0d5dabc4ce70d5 (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=21b8ed478f842bde32a4562327effbc0b99e7792
commit 21b8ed478f842bde32a4562327effbc0b99e7792
Merge: ca67124 653529c
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 11:21:17 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 11:21:17 2014 -0400
Merge topic 'ctest_update_status_only' into next
653529ce CTest: Allow / to be in the build name, and be consistent with the
build name
39b5df2f ctest_update: Add CTEST_UPDATE_VERSION_ONLY option to only note
the version
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=653529ce55a9c33fa7378708793caac92a857794
commit 653529ce55a9c33fa7378708793caac92a857794
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Aug 13 17:58:05 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 18 11:22:18 2014 -0400
CTest: Allow / to be in the build name, and be consistent with the build
name
Prior to this change / was not allowed in the build name. This was tested
with a CDash server and worked. In addition the safe build name was not
used everywhere. This caused mismatched build names to be in the xml
files going to CDash which caused different rows to be created for the
same build.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index 109905c..06fcb75 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1479,8 +1479,10 @@ int cmCTestSubmitHandler::ProcessHandler()
//
std::string cmCTestSubmitHandler::GetSubmitResultsPrefix()
{
+ std::string buildname = cmCTest::SafeBuildIdField(
+this-CTest-GetCTestConfiguration(BuildName));
std::string name = this-CTest-GetCTestConfiguration(Site) +
-___ + this-CTest-GetCTestConfiguration(BuildName) +
+___ + buildname +
___ + this-CTest-GetCurrentTag() + - +
this-CTest-GetTestModelString() + ___XML___;
return name;
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx
b/Source/CTest/cmCTestUpdateHandler.cxx
index fda61ea..68f5fe1 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -258,12 +258,13 @@ int cmCTestUpdateHandler::ProcessHandler()
double elapsed_time_start = cmSystemTools::GetTime();
bool updated = vc-Update();
-
+ std::string buildname = cmCTest::SafeBuildIdField(
+this-CTest-GetCTestConfiguration(BuildName));
os ?xml version=\1.0\ encoding=\UTF-8\?\n
Update mode=\Client\ Generator=\ctest-
cmVersion::GetCMakeVersion() \\n
\tSite this-CTest-GetCTestConfiguration(Site) /Site\n
- \tBuildName this-CTest-GetCTestConfiguration(BuildName)
+ \tBuildName buildname
/BuildName\n
\tBuildStamp this-CTest-GetCurrentTag() -
this-CTest-GetTestModelString() /BuildStamp std::endl;
diff --git a/Source/CTest/cmCTestUploadHandler.cxx
b/Source/CTest/cmCTestUploadHandler.cxx
index 4c3f81b..e33c387 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -44,14 +44,15 @@ int cmCTestUploadHandler::ProcessHandler()
Cannot open Upload.xml file std::endl);
return -1;
}
-
+ std::string buildname = cmCTest::SafeBuildIdField(
+this-CTest-GetCTestConfiguration(BuildName));
cmCTest::SetOfStrings::const_iterator it;
ofs ?xml version=\1.0\ encoding=\UTF-8\?\n
?xml-stylesheet type=\text/xsl\
href=\Dart/Source/Server/XSL/Build.xsl
file:///Dart/Source/Server/XSL/Build.xsl \?\n
Site BuildName=\
- this-CTest-GetCTestConfiguration(BuildName)
+ buildname
\ BuildStamp=\
this-CTest-GetCurrentTag() -
this-CTest-GetTestModelString() \ Name=\
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index b28f3b5..a7905a4 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -488,9 +488,11 @@ int cmCTest::Initialize(const char* binary_dir,
cmCTestStartCommand* command)
{
cmCTestLog(this, DEBUG, Here: __LINE__ std::endl);
cmCTestLog(this, OUTPUT,
- Site: this-GetCTestConfiguration(Site) std::endl
- Build name: this-GetCTestConfiguration(BuildName)
-
[Cmake-commits] CMake branch, master, updated. v3.0.1-1704-gfc8a888
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 fc8a888d2cee0aeeea3b10a5b764ffb5cf71c212 (commit)
via 7386d0d6df1b10f14accf843683eaf8692309c1f (commit)
from 654c8c08720f96d7e72504a37c4c44bd05cda1f4 (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=fc8a888d2cee0aeeea3b10a5b764ffb5cf71c212
commit fc8a888d2cee0aeeea3b10a5b764ffb5cf71c212
Merge: 654c8c0 7386d0d
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 11:21:50 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 11:21:50 2014 -0400
Merge topic 'add-CheckFortranSourceCompiles'
7386d0d6 Add CheckFortranSourceCompiles module (#14656)
---
Summary of changes:
Help/manual/cmake-modules.7.rst|1 +
Help/module/CheckFortranSourceCompiles.rst |1 +
.../release/dev/add-CheckFortranSourceCompiles.rst |5 +++
...iles.cmake = CheckFortranSourceCompiles.cmake} | 46 ++--
Tests/FortranOnly/CMakeLists.txt | 22 ++
5 files changed, 52 insertions(+), 23 deletions(-)
create mode 100644 Help/module/CheckFortranSourceCompiles.rst
create mode 100644 Help/release/dev/add-CheckFortranSourceCompiles.rst
copy Modules/{CheckCSourceCompiles.cmake = CheckFortranSourceCompiles.cmake}
(72%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.1-1706-gde547ca
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 de547ca5c3053293d144b3c8b133f701d4b81150 (commit) via 1412960e8974c2d50e4601982c0b0dccd2e20ed1 (commit) from fc8a888d2cee0aeeea3b10a5b764ffb5cf71c212 (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=de547ca5c3053293d144b3c8b133f701d4b81150 commit de547ca5c3053293d144b3c8b133f701d4b81150 Merge: fc8a888 1412960 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:21:52 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 11:21:52 2014 -0400 Merge topic 'cmake-gui-system-version' 1412960e cmake-gui: Pass CMAKE_SYSTEM_VERSION from cross-compile configuration --- Summary of changes: Source/QtDialog/CMakeSetupDialog.cxx |3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.1-1709-ge7dda7b
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 e7dda7b9b7373dc823977766d0947a4ca28845cd (commit)
via 653529ce55a9c33fa7378708793caac92a857794 (commit)
via 39b5df2f3714c32d498fcb7c88f5bda456f75cb3 (commit)
from de547ca5c3053293d144b3c8b133f701d4b81150 (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=e7dda7b9b7373dc823977766d0947a4ca28845cd
commit e7dda7b9b7373dc823977766d0947a4ca28845cd
Merge: de547ca 653529c
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 11:21:55 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 11:21:55 2014 -0400
Merge topic 'ctest_update_status_only'
653529ce CTest: Allow / to be in the build name, and be consistent with the
build name
39b5df2f ctest_update: Add CTEST_UPDATE_VERSION_ONLY option to only note
the version
---
Summary of changes:
Help/manual/cmake-variables.7.rst |1 +
Help/manual/ctest.1.rst|9
...K_COMMAND.rst = CTEST_UPDATE_VERSION_ONLY.rst} |4 +-
Modules/DartConfiguration.tcl.in |3 ++
Source/CTest/cmCTestSubmitHandler.cxx |4 +-
Source/CTest/cmCTestUpdateCommand.cxx |2 +
Source/CTest/cmCTestUpdateHandler.cxx |5 +-
Source/CTest/cmCTestUploadHandler.cxx |5 +-
Source/CTest/cmCTestVC.cxx | 15 --
Source/cmCTest.cxx | 14 --
Tests/CTestUpdateCommon.cmake | 48 +---
Tests/CTestUpdateGIT.cmake.in | 17 +++
12 files changed, 104 insertions(+), 23 deletions(-)
copy Help/variable/{CTEST_MEMORYCHECK_COMMAND.rst =
CTEST_UPDATE_VERSION_ONLY.rst} (50%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.1-1698-g258c5c2
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 258c5c2f27886ca60bda5a6a1f6411310f0bf1df (commit) via 150c2125ddad4e5e6986dc168ccf3b35625f1cf5 (commit) from 24f46959a2f4d00f65fab56e3cbea09d16b7381e (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=258c5c2f27886ca60bda5a6a1f6411310f0bf1df commit 258c5c2f27886ca60bda5a6a1f6411310f0bf1df Merge: 24f4695 150c212 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:21:40 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 11:21:40 2014 -0400 Merge topic 'FindMPI-mpiexec-MPI_HOME' 150c2125 FindMPI: Honor MPI_HOME for MPIEXEC (#14347) --- Summary of changes: Modules/FindMPI.cmake |5 - 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.1-1702-g654c8c0
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 654c8c08720f96d7e72504a37c4c44bd05cda1f4 (commit) via e6496b6023a8f3c471e81b1938580d50b52d3222 (commit) from 3353657919f8cd05a206c81056fc9a9bdb29ac00 (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=654c8c08720f96d7e72504a37c4c44bd05cda1f4 commit 654c8c08720f96d7e72504a37c4c44bd05cda1f4 Merge: 3353657 e6496b6 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:21:47 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 11:21:47 2014 -0400 Merge topic 'cpack-ifw-generator' e6496b60 CPackIFW: Revise this generator --- Summary of changes: CMakeCPack.cmake | 13 ++- CMakeCPackOptions.cmake.in | 27 -- Modules/CPackIFW.cmake | 48 Source/CPack/IFW/cmCPackIFWGenerator.cxx | 27 +- Source/CPack/IFW/cmCPackIFWGenerator.h |2 +- Source/CPack/IFW/cmCPackIFWInstaller.cxx | 21 +-- Source/CPack/IFW/cmCPackIFWInstaller.h |2 +- Source/CPack/IFW/cmCPackIFWPackage.cxx | 60 -- Source/CPack/IFW/cmCPackIFWPackage.h |6 ++- 9 files changed, 148 insertions(+), 58 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4935-gcfe1c3f
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 cfe1c3f8f842b25da627e959d26077ef35b118fc (commit) via cb578878093473ef1cb3d2e71791d67a410d4184 (commit) via e7dda7b9b7373dc823977766d0947a4ca28845cd (commit) via de547ca5c3053293d144b3c8b133f701d4b81150 (commit) via fc8a888d2cee0aeeea3b10a5b764ffb5cf71c212 (commit) via 654c8c08720f96d7e72504a37c4c44bd05cda1f4 (commit) via 3353657919f8cd05a206c81056fc9a9bdb29ac00 (commit) via 258c5c2f27886ca60bda5a6a1f6411310f0bf1df (commit) via 24f46959a2f4d00f65fab56e3cbea09d16b7381e (commit) via 25c07e61a3807d76f695a24173e9fc82821541a0 (commit) via bbd1763d0f042c72c7996a452d80ce0dff0c38f6 (commit) via 3bbdb2304b35bd9880655eba19abe03603b5df45 (commit) via 5fc8e666fb07c3efd930c53d9134922fbd27ae56 (commit) via eb3b5501c01a40aa592e512bc61fbe4f1cb1e2cc (commit) from 21b8ed478f842bde32a4562327effbc0b99e7792 (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=cfe1c3f8f842b25da627e959d26077ef35b118fc commit cfe1c3f8f842b25da627e959d26077ef35b118fc Merge: 21b8ed4 cb57887 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:25:44 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Aug 18 11:25:44 2014 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4939-gf61803d
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 f61803db0da69a0af3746772fac4308cee665bd2 (commit) via b26faaf1b5ee71309609922fab7ec96888003709 (commit) from 6cb7b0c64de916b439dfe060a723462536ad6e91 (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=f61803db0da69a0af3746772fac4308cee665bd2 commit f61803db0da69a0af3746772fac4308cee665bd2 Merge: 6cb7b0c b26faaf Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 11:26:40 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 11:26:40 2014 -0400 Merge topic 'ExternalProject-doc-SVN_REVISION-format' into next b26faaf1 ExternalProject: Clarify SVN_REVISION format in docs (#15081) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b26faaf1b5ee71309609922fab7ec96888003709 commit b26faaf1b5ee71309609922fab7ec96888003709 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Aug 13 10:56:35 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Aug 13 10:56:35 2014 -0400 ExternalProject: Clarify SVN_REVISION format in docs (#15081) Show the explicit '-r' that is required. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index dbce9f4..218066c 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -26,7 +26,7 @@ #[CVS_MODULE mod]# Module to checkout from CVS repo #[CVS_TAG tag] # Tag to checkout from CVS repo #[SVN_REPOSITORY url]# URL of Subversion repo -#[SVN_REVISION rev] # Revision to checkout from Subversion repo +#[SVN_REVISION -rrev] # Revision to checkout from Subversion repo #[SVN_USERNAME john ]# Username for Subversion checkout and update #[SVN_PASSWORD doe ] # Password for Subversion checkout and update #[SVN_TRUST_CERT 1 ] # Trust the Subversion server site certificate --- Summary of changes: Modules/ExternalProject.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4937-g6cb7b0c
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 6cb7b0c64de916b439dfe060a723462536ad6e91 (commit)
via d0678408543d362f127b9ee45453283e38c25415 (commit)
from cfe1c3f8f842b25da627e959d26077ef35b118fc (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=6cb7b0c64de916b439dfe060a723462536ad6e91
commit 6cb7b0c64de916b439dfe060a723462536ad6e91
Merge: cfe1c3f d067840
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 11:25:59 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 11:25:59 2014 -0400
Merge topic 'FindOpenMP-add-Fortran-support' into next
d0678408 FindOpenMP: Add support for Fortran (#14656)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0678408543d362f127b9ee45453283e38c25415
commit d0678408543d362f127b9ee45453283e38c25415
Author: Nicolas Bock nicolasb...@gmail.com
AuthorDate: Wed Aug 6 10:08:00 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 18 11:25:21 2014 -0400
FindOpenMP: Add support for Fortran (#14656)
diff --git a/Help/release/dev/FindOpenMP-add-Fortran-support.rst
b/Help/release/dev/FindOpenMP-add-Fortran-support.rst
new file mode 100644
index 000..0205718
--- /dev/null
+++ b/Help/release/dev/FindOpenMP-add-Fortran-support.rst
@@ -0,0 +1,4 @@
+FindOpenMP-add-Fortran-support
+--
+
+* The :module:`FindOpenMP` module learned to support Fortran.
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 935a0ca..801b4f8 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -16,6 +16,7 @@
#
#OpenMP_C_FLAGS - flags to add to the C compiler for OpenMP support
#OpenMP_CXX_FLAGS - flags to add to the CXX compiler for OpenMP support
+#OpenMP_Fortran_FLAGS - flags to add to the Fortran compiler for OpenMP
support
#OPENMP_FOUND - true if openmp is detected
#
#
@@ -27,6 +28,7 @@
# Copyright 2009 Kitware, Inc.
# Copyright 2008-2009 André Rigland Brodtkorb andre.brodtk...@ifi.uio.no
# Copyright 2012 Rolf Eike Beer e...@sf-mail.de
+# Copyright 2014 Nicolas Bock nicolasb...@gmail.com
#
# Distributed under the OSI-approved BSD License (the License);
# see accompanying file Copyright.txt for details.
@@ -106,6 +108,17 @@ int main() {
}
)
+# same in Fortran
+set(OpenMP_Fortran_TEST_SOURCE
+
+program test
+use omp_lib
+integer :: n
+n = omp_get_num_threads()
+end program test
+
+ )
+
# check c compiler
if(CMAKE_C_COMPILER_LOADED)
# if these are set then do not try to find them again,
@@ -176,6 +189,40 @@ if(CMAKE_CXX_COMPILER_LOADED)
unset(OpenMP_CXX_TEST_SOURCE)
endif()
+# check Fortran compiler
+if(CMAKE_Fortran_COMPILER_LOADED)
+ # if these are set then do not try to find them again,
+ # by avoiding any try_compiles for the flags
+ if(OpenMP_Fortran_FLAGS)
+unset(OpenMP_Fortran_FLAG_CANDIDATES)
+ else()
+_OPENMP_FLAG_CANDIDATES(Fortran)
+include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranSourceCompiles.cmake)
+ endif()
+
+ foreach(FLAG IN LISTS OpenMP_Fortran_FLAG_CANDIDATES)
+set(SAFE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+set(CMAKE_REQUIRED_FLAGS ${FLAG})
+unset(OpenMP_FLAG_DETECTED CACHE)
+if(NOT CMAKE_REQUIRED_QUIET)
+ message(STATUS Try OpenMP Fortran flag = [${FLAG}])
+endif()
+check_fortran_source_compiles(${OpenMP_Fortran_TEST_SOURCE}
OpenMP_FLAG_DETECTED)
+set(CMAKE_REQUIRED_FLAGS ${SAFE_CMAKE_REQUIRED_FLAGS})
+if(OpenMP_FLAG_DETECTED)
+ set(OpenMP_Fortran_FLAGS_INTERNAL ${FLAG})
+ break()
+endif()
+ endforeach()
+
+ set(OpenMP_Fortran_FLAGS ${OpenMP_Fortran_FLAGS_INTERNAL}
+CACHE STRING Fortran compiler flags for OpenMP parallization)
+
+ list(APPEND _OPENMP_REQUIRED_VARS OpenMP_Fortran_FLAGS)
+ unset(OpenMP_Fortran_FLAG_CANDIDATES)
+ unset(OpenMP_Fortran_TEST_SOURCE)
+endif()
+
set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
if(_OPENMP_REQUIRED_VARS)
---
Summary of changes:
.../release/dev/FindOpenMP-add-Fortran-support.rst |4 ++
Modules/FindOpenMP.cmake | 47
2 files changed, 51 insertions(+)
create mode 100644 Help/release/dev/FindOpenMP-add-Fortran-support.rst
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4944-gb3f32de
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 b3f32de61b5ea6ee6301eafcbae25d275a7e690d (commit)
via 5fcb42ab69b030f8bbc20f800b1e0639c5ee7077 (commit)
via 8e026aa7f27aaa545b6421e61d7ba3add1c5d10d (commit)
via 9633d112794e1bb6b08ab6de0c20baca3a8c5847 (commit)
via 841001028a579bea093482fc3c1beb5d45f2b2d6 (commit)
from f61803db0da69a0af3746772fac4308cee665bd2 (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=b3f32de61b5ea6ee6301eafcbae25d275a7e690d
commit b3f32de61b5ea6ee6301eafcbae25d275a7e690d
Merge: f61803d 5fcb42a
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 11:50:04 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 11:50:04 2014 -0400
Merge topic 'vs-refactor-includes' into next
5fcb42ab VS: Refactor include directory generation in .vcxproj files
8e026aa7 VS: Refactor include directory slash conversion
9633d112 cmIDEOptions: Add HasFlag method to test if a flag is set
84100102 cmIDEOptions: Add an AppendFlag overload to append multiple values
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fcb42ab69b030f8bbc20f800b1e0639c5ee7077
commit 5fcb42ab69b030f8bbc20f800b1e0639c5ee7077
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 13 14:09:24 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Aug 13 14:09:24 2014 -0400
VS: Refactor include directory generation in .vcxproj files
Use the cmVisualStudioGeneratorOptions flag map to add the
AdditionalIncludeDirectories element to the project file.
Move appending of %(AdditionalIncludeDirectories) to the
locations that populate the flag vectors instead of where
they are written out.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 5ad63b5..3c7745d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1305,6 +1305,11 @@ bool
cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
clOptions.AddFlag(CompileAs, compileAs);
}
clOptions.Parse(flags.c_str());
+ if(clOptions.HasFlag(AdditionalIncludeDirectories))
+{
+clOptions.AppendFlag(AdditionalIncludeDirectories,
+ %(AdditionalIncludeDirectories));
+}
clOptions.AddDefines(configDefines.c_str());
clOptions.SetConfiguration((*config).c_str());
clOptions.OutputAdditionalOptions(*this-BuildFileStream, , );
@@ -1546,7 +1551,9 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
Options clOptions = *(this-ClOptions[configName]);
this-WriteString(ClCompile\n, 2);
clOptions.OutputAdditionalOptions(*this-BuildFileStream, , );
- this-OutputIncludes(includes);
+ clOptions.AppendFlag(AdditionalIncludeDirectories, includes);
+ clOptions.AppendFlag(AdditionalIncludeDirectories,
+ %(AdditionalIncludeDirectories));
clOptions.OutputFlagMap(*this-BuildFileStream, );
clOptions.OutputPreprocessorDefinitions(*this-BuildFileStream, ,
\n, CXX);
@@ -1577,21 +1584,6 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
this-WriteString(/ClCompile\n, 2);
}
-void cmVisualStudio10TargetGenerator::
-OutputIncludes(std::vectorstd::string const includes)
-{
- this-WriteString(AdditionalIncludeDirectories, 3);
- for(std::vectorstd::string::const_iterator i = includes.begin();
- i != includes.end(); ++i)
-{
-*this-BuildFileStream cmVS10EscapeXML(*i) ;;
-}
- this-WriteString(%(AdditionalIncludeDirectories)
-/AdditionalIncludeDirectories\n, 0);
-}
-
-
-
//
bool cmVisualStudio10TargetGenerator::ComputeRcOptions()
{
@@ -1643,9 +1635,11 @@ WriteRCOptions(std::string const configName,
Options clOptions = *(this-ClOptions[configName]);
clOptions.OutputPreprocessorDefinitions(*this-BuildFileStream, ,
\n, RC);
- this-OutputIncludes(includes);
Options rcOptions = *(this-RcOptions[configName]);
+ rcOptions.AppendFlag(AdditionalIncludeDirectories, includes);
+ rcOptions.AppendFlag(AdditionalIncludeDirectories,
+ %(AdditionalIncludeDirectories));
rcOptions.OutputFlagMap(*this-BuildFileStream, );
rcOptions.OutputAdditionalOptions(*this-BuildFileStream, , );
@@ -1951,7 +1945,14 @@ WriteMidlOptions(std::string const
[Cmake-commits] CMake branch, next, updated. v3.0.1-4946-g20baa5f
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 20baa5fac73783c78c5f088e88672fbf0a2cf614 (commit) via f7ab23837994a4a6eff1c5ebf183ae915380b41c (commit) from b3f32de61b5ea6ee6301eafcbae25d275a7e690d (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=20baa5fac73783c78c5f088e88672fbf0a2cf614 commit 20baa5fac73783c78c5f088e88672fbf0a2cf614 Merge: b3f32de f7ab238 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 13:33:19 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Aug 18 13:33:19 2014 -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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.1-1716-gf7ab238
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 f7ab23837994a4a6eff1c5ebf183ae915380b41c (commit) via aa21001bd3c723f79e74407a2ba315d5988804a0 (commit) via 6fe770e163daf005cd151798c18b89ad50c17125 (commit) via 9b4dc2ad4a82b233520015fdc5cbf5df1ed540f7 (commit) via f063a914c649b1dfbcd1a02d381b4e94ad01ceaa (commit) from cb578878093473ef1cb3d2e71791d67a410d4184 (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=f7ab23837994a4a6eff1c5ebf183ae915380b41c commit f7ab23837994a4a6eff1c5ebf183ae915380b41c Merge: cb57887 aa21001 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 18 13:31:41 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 18 13:31:41 2014 -0400 Merge topic 'vs-special-source-file-properties' aa21001b Help: Add notes for topic 'vs-special-source-file-properties' 6fe770e1 VS: Add a source file property to set the hlsl shader type 9b4dc2ad VS: Add a source file property to mark content for Windows App deployment f063a914 VS: Re-arrange WriteExtraSource to support tool configuration --- Summary of changes: Help/manual/cmake-properties.7.rst |2 + Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst | 11 +++ Help/prop_sf/VS_SHADER_TYPE.rst|4 ++ .../dev/vs-special-source-file-properties.rst | 11 +++ Source/cmVisualStudio10TargetGenerator.cxx | 71 +++- 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst create mode 100644 Help/prop_sf/VS_SHADER_TYPE.rst create mode 100644 Help/release/dev/vs-special-source-file-properties.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4956-g033a5cf
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 033a5cf50898dd2fffcdbe32f9b06bb332ab516d (commit)
via b40d348cd625c82c6824eaecd2a9334f33b17009 (commit)
via d73fb09b3ce459bc807ee8c1104403e8903cc0be (commit)
via 2aee89db17d214111f26f157f667a82eac98f350 (commit)
via 921a19d2d3253ccf1612ea9d2202125f451ce77f (commit)
via 06ea637e225d1bfcbf0907be22e6fd0e917b49fc (commit)
via b1ac434fd02b065e3c5721a0db807074b087d651 (commit)
via bb170d36c2c980c4aaa278c151d1a4ea2d80291c (commit)
via 6b02cb0cf171f1668ca450efbab756b05da5c573 (commit)
via dd980e8b87f2e09681c645495812d1606b1f9ffc (commit)
from 20baa5fac73783c78c5f088e88672fbf0a2cf614 (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=033a5cf50898dd2fffcdbe32f9b06bb332ab516d
commit 033a5cf50898dd2fffcdbe32f9b06bb332ab516d
Merge: 20baa5f b40d348
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 18 15:23:08 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 18 15:23:08 2014 -0400
Merge topic 'vs-windows-apps' into next
b40d348c VS: Mark Windows Phone and Store targets as App Containers
d73fb09b VS: Always ignore ole32 on Windows Phone 8.0
2aee89db VS: Generate Windows Metadata for WinRT components
921a19d2 VS: Generate Windows Phone and Windows Store projects as Unicode
06ea637e VS: Add VS_WINRT_COMPONENT property to enable CompileAsWinRT
b1ac434f VS: Handle .pfx files explicitly in generator
bb170d36 VS: Handle AppxManifest sources explicitly in generator
6b02cb0c VS: Set Window Phone/Store app type in CMake-generated targets
dd980e8b VS: Mark CMake-generated targets as Utility in .vcxproj files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b40d348cd625c82c6824eaecd2a9334f33b17009
commit b40d348cd625c82c6824eaecd2a9334f33b17009
Author: Gilles Khouzam gill...@microsoft.com
AuthorDate: Thu Aug 14 14:52:53 2014 -0700
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 18 15:14:48 2014 -0400
VS: Mark Windows Phone and Store targets as App Containers
* Add AppContainerApplication to non-UTILITY targets
* Generate app manifest and related files if project does not provide them
* Mark WinRT components with WinMDAssembly
* Import Windows Phone 8.0 targets in .vcxproj files when necessary,
and reference platform.winmd.
Inspired-by: Paul Annetts p...@lightunobscured.com
diff --git a/.gitattributes b/.gitattributes
index d21f1dd..d3f7280 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,6 +12,8 @@ configurecrlf=input
*.dsp -crlf
*.dsptemplate -crlf
*.dsw -crlf
+*.pfx -crlf
+*.png -crlf
*.sln -crlf
*.vcproj-crlf
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 76068ac..138ff4c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -160,6 +160,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
this-Platform = gg-GetPlatformName();
this-MSTools = true;
this-BuildFileStream = 0;
+ this-IsMissingFiles = false;
}
cmVisualStudio10TargetGenerator::~cmVisualStudio10TargetGenerator()
@@ -289,6 +290,7 @@ void cmVisualStudio10TargetGenerator::Generate()
if(this-MSTools this-Target-GetType() = cmTarget::GLOBAL_TARGET)
{
this-WriteApplicationTypeSettings();
+this-VerifyNecessaryFiles();
}
const char* vsProjectTypes =
@@ -325,6 +327,11 @@ void cmVisualStudio10TargetGenerator::Generate()
}
}
+ if(this-Target-GetPropertyAsBool(VS_WINRT_COMPONENT))
+{
+this-WriteString(WinMDAssemblytrue/WinMDAssembly\n, 2);
+}
+
const char* vsGlobalKeyword =
this-Target-GetProperty(VS_GLOBAL_KEYWORD);
if(!vsGlobalKeyword)
@@ -396,6 +403,7 @@ void cmVisualStudio10TargetGenerator::Generate()
this-WriteString(
Import Project=\$(VCTargetsPath)\\Microsoft.Cpp.targets\
/\n, 1);
+ this-WriteTargetSpecificReferences();
this-WriteString(ImportGroup Label=\ExtensionTargets\\n, 1);
if (this-GlobalGenerator-IsMasmEnabled())
{
@@ -475,6 +483,22 @@ void
cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
}
}
+void cmVisualStudio10TargetGenerator::WriteTargetSpecificReferences()
+{
+ if(this-MSTools)
+{
+if(this-GlobalGenerator-TargetsWindowsPhone()
+ this-GlobalGenerator-GetSystemVersion() == 8.0)
+ {
+ this-WriteString(
+Import Project=\
+
[Cmake-commits] CMake branch, master, updated. v3.0.1-1717-gafc6344
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 afc63445dcdceae6bb9f87a03e4ccd320e0d5e03 (commit) from f7ab23837994a4a6eff1c5ebf183ae915380b41c (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=afc63445dcdceae6bb9f87a03e4ccd320e0d5e03 commit afc63445dcdceae6bb9f87a03e4ccd320e0d5e03 Author: Kitware Robot kwro...@kitware.com AuthorDate: Tue Aug 19 00:01:08 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Tue Aug 19 00:01:08 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7a5d940..c94821b 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) -set(CMake_VERSION_PATCH 20140818) +set(CMake_VERSION_PATCH 20140819) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
