[cmake-developers] [CMake 0015579]: Visual Studio 2015 RC and cross-platform development
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=15579 == Reported By:yak32 Assigned To: == Project:CMake Issue ID: 15579 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2015-05-21 03:16 EDT Last Modified: 2015-05-21 03:16 EDT == Summary:Visual Studio 2015 RC and cross-platform development Description: Visual Studio 2015 RC now supports cross-platform (Android and IOS) development, but it's not possible to generate project files for Android or IOS. == Issue History Date ModifiedUsername FieldChange == 2015-05-21 03:16 yak32 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
Re: [CMake] How to skip steps and use default values in ExternalProject_Add command?
Hi Cedric.
When doing things like that, remember that CMake's named arguments are
arguments just like any other. So you can easily obtain them from variable
expansion; something like this:
if(${LIBRARY}_CONFIGURE_COMMAND)
set(the_configure_command CONFIGURE_COMMAND
${${LIBRARY}_CONFIGURE_COMMAND})
else()
set(the_configure_command )
endif()
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
${the_configure_command}
BUILD_COMMAND ${${LIBRARY}_BUILD_COMMAND}
INSTALL_COMMAND ${${LIBRARY}_INSTALL_COMMAND}
)
The same trick can be applied to any other command you need to
conditionally exclude, of course.
Petr
On Thu, May 21, 2015 at 1:10 PM, Cedric Doucet cedric.dou...@inria.fr
wrote:
Hello,
I would like to loop on a list of libraries to download and install, by
calling the ExternalProject_Add command for each of these libraries.
To do that, I need to define some commands for each library, like
CONFIGURE_COMMAND, BUILD_COMMAND and INSTALL_COMMAND.
These commands may differ from one library to another; for example, some
of them may be based on make, or autoconfig, or cmake, etc.
Furthermore, some of these libraries may not need to be built.
What is the good way to skip some steps?
Is it possible to use default values for some commands?
The problem in my situation is that I have to fill in each command since I
want to design way of downloading and installing third party libraries.
To be clear, I wrote a loop which looks like this:
==
foreach(LIBRARY IN LISTS NOT_FOUND_LIBRARIES)
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
CONFIGURE_COMMAND
${${LIBRARY}_CONFIGURE_COMMAND}
BUILD_COMMAND
${${LIBRARY}_BUILD_COMMAND}
INSTALL_COMMAND
${${LIBRARY}_INSTALL_COMMAND}
)
endforeach(LIBRARY)
==
However, if a library is based on cmake, I do not need to specify commands
for configuration and building.
Is it possible to say that the default value of CONFIGURE_COMMAND will be
used for example?
The only way I know to do that is to suppress the line
defining CONFIGURE_COMMAND but I can't do that since other libraries may
need to define it.
To skip steps, I replace the corresponding command by 'ls' but it's not
very clean.
That is to say, the value of ${LIBRARY}_CONFIGURE_COMMAND is 'ls' when I
want to skip the configuration step.
Thank you very much for your help.
Cédric
--
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
[Cmake-commits] CMake branch, master, updated. v3.2.2-1258-gf3e4e3e
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 f3e4e3ecde21e790c6428f553f81e4d544f4e73b (commit) via b0ea36730847695c5e9579de92e7dd4272cfc27a (commit) from e604bb1be9358f72b479b1710a3251b0cecca13c (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=f3e4e3ecde21e790c6428f553f81e4d544f4e73b commit f3e4e3ecde21e790c6428f553f81e4d544f4e73b Merge: e604bb1 b0ea367 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 09:03:48 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 21 09:03:48 2015 -0400 Merge topic 'doc-cache-option-space' b0ea3673 Help: Spell '-D' option consistently across documentation (#15575) --- Summary of changes: Help/manual/OPTIONS_BUILD.txt |3 +++ Help/manual/cmake.1.rst |2 +- Source/cmake.h|2 +- 3 files changed, 5 insertions(+), 2 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.2.2-1265-g3e3a09d
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 3e3a09d1d3c91a6522260734b4542b420152e21c (commit) via 6fbd4cae0d7765d305d753a78d167b3fcaa6eaf6 (commit) from 2c54622ff57b2ccb44d4e99e2fefb0501dbccb92 (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=3e3a09d1d3c91a6522260734b4542b420152e21c commit 3e3a09d1d3c91a6522260734b4542b420152e21c Merge: 2c54622 6fbd4ca Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 09:03:52 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 21 09:03:52 2015 -0400 Merge topic 'clean-up-CMAKE_COMMAND' 6fbd4cae Use cmSystemTools::GetCMakeCommand() to get path to cmake internally --- Summary of changes: Source/CPack/cmCPackDebGenerator.cxx | 10 -- Source/cmCacheManager.cxx | 11 +++ Source/cmExtraEclipseCDT4Generator.cxx|6 +++--- Source/cmExtraKateGenerator.cxx |2 +- Source/cmGlobalGenerator.cxx |7 +++ Source/cmGlobalNinjaGenerator.cxx | 11 --- Source/cmGlobalVisualStudio8Generator.cxx |4 +--- Source/cmGlobalXCodeGenerator.cxx |6 +++--- Source/cmLocalGenerator.cxx |4 +--- Source/cmLocalUnixMakefileGenerator3.cxx |6 ++ Source/cmLocalVisualStudio6Generator.cxx |6 ++ Source/cmLocalVisualStudio7Generator.cxx |4 +--- Source/cmLocalVisualStudioGenerator.cxx |2 +- Source/cmMakefile.cxx |1 - Source/cmNinjaNormalTargetGenerator.cxx |6 ++ Source/cmQtAutoGenerators.cxx |2 +- 16 files changed, 32 insertions(+), 56 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [CMake] How to skip steps and use default values in ExternalProject_Add command?
Thank you very much for your help, Petr!
I will try it!
Cheers,
Cédric
- Mail original -
De: Petr Kmoch petr.km...@gmail.com
À: Cedric Doucet cedric.dou...@inria.fr
Cc: cmake@cmake.org
Envoyé: Jeudi 21 Mai 2015 14:21:48
Objet: Re: [CMake] How to skip steps and use default values in
ExternalProject_Add command?
No idea on this one. The trick I showed is vanilla CMake, a direct
consequence of the CMake parsing string processing algorithm. What you're
asking is about the internals of ExternalProject_Add, of which I know
nothing.
Petr
On Thu, May 21, 2015 at 1:43 PM, Cedric Doucet cedric.dou...@inria.fr
wrote:
Hi Petr!
Thank you for the trick: it's very powerful!
Does this mean that these two calls are equivalent if I write:
set(the_configure_command CONFIGURE_COMMAND) ?
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
${the_configure_command}
)
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
)
I guess the default value of CONFIGURE_COMMAND will be used, right?
Cédric
De: Petr Kmoch petr.km...@gmail.com
À: Cedric Doucet cedric.dou...@inria.fr
Cc: cmake@cmake.org
Envoyé: Jeudi 21 Mai 2015 13:33:27
Objet: Re: [CMake] How to skip steps and use default values in
ExternalProject_Add command?
Hi Cedric.
When doing things like that, remember that CMake's named arguments are
arguments just like any other. So you can easily obtain them from
variable
expansion; something like this:
if(${LIBRARY}_CONFIGURE_COMMAND)
set(the_configure_command CONFIGURE_COMMAND
${${LIBRARY}_CONFIGURE_COMMAND})
else()
set(the_configure_command )
endif()
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
${the_configure_command}
BUILD_COMMAND ${${LIBRARY}_BUILD_COMMAND}
INSTALL_COMMAND ${${LIBRARY}_INSTALL_COMMAND}
)
The same trick can be applied to any other command you need to
conditionally
exclude, of course.
Petr
On Thu, May 21, 2015 at 1:10 PM, Cedric Doucet cedric.dou...@inria.fr
wrote:
Hello,
I would like to loop on a list of libraries to download and install, by
calling the ExternalProject_Add command for each of these libraries.
To do that, I need to define some commands for each library, like
CONFIGURE_COMMAND, BUILD_COMMAND and INSTALL_COMMAND.
These commands may differ from one library to another; for example,
some
of
them may be based on make, or autoconfig, or cmake, etc.
Furthermore, some of these libraries may not need to be built.
What is the good way to skip some steps?
Is it possible to use default values for some commands?
The problem in my situation is that I have to fill in each command
since
I
want to design way of downloading and installing third party libraries.
To be clear, I wrote a loop which looks like this:
==
foreach(LIBRARY IN LISTS NOT_FOUND_LIBRARIES)
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
CONFIGURE_COMMAND ${${LIBRARY}_CONFIGURE_COMMAND}
BUILD_COMMAND ${${LIBRARY}_BUILD_COMMAND}
INSTALL_COMMAND ${${LIBRARY}_INSTALL_COMMAND}
)
endforeach(LIBRARY)
==
However, if a library is based on cmake, I do not need to specify
commands
for configuration and building.
Is it possible to say that the default value of CONFIGURE_COMMAND will
be
used for example?
The only way I know to do that is to suppress the line defining
CONFIGURE_COMMAND but I can't do that since other libraries may need to
define it.
To skip steps, I replace the corresponding command by 'ls' but it's not
very
clean.
That is to say, the value of ${LIBRARY}_CONFIGURE_COMMAND is 'ls' when
I
want
to skip the configuration step.
Thank you very much for your help.
Cédric
--
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:
Re: [cmake-developers] CMake strips MAKEFLAGS from environment
On 05/21/2015 08:43 AM, Taylor Braun-Jones wrote: Why is CMake stripping MAKEFLAGS from its environment? This has been done since our very early days in this commit: BUG: Need to remove the MAKEFLAGS when cmake starts. If cmake is run from inside make, we don't want the try-compiles to inherit the makeflags. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02f7cfbc What are you trying to do? -Brad -- 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-commits] CMake branch, next, updated. v3.2.2-3053-gdc7377c
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 dc7377cb0c319462ec1830e3ea43d6bb2b38f99c (commit)
via deec97d8eca4db67be09031757fd11f66c1a037b (commit)
from 482438b97ac5d5be76cbb457c6187478a5fa50dd (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=dc7377cb0c319462ec1830e3ea43d6bb2b38f99c
commit dc7377cb0c319462ec1830e3ea43d6bb2b38f99c
Merge: 482438b deec97d
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 21 09:08:58 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 21 09:08:58 2015 -0400
Merge topic 'revert-extra-qbs-generator' into next
deec97d8 Revert Qbs: Add new 'extra' generator for qbs project files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=deec97d8eca4db67be09031757fd11f66c1a037b
commit deec97d8eca4db67be09031757fd11f66c1a037b
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 21 09:05:58 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu May 21 09:05:58 2015 -0400
Revert Qbs: Add new 'extra' generator for qbs project files
This reverts commit f85db2f32358e6de921aba7d1cb8ecb81da934c0.
Discussion by the QtCreator community at
https://bugreports.qt.io/browse/QTCREATORBUG-13695
raises concerns about this particular approach to working with CMake
projects using QtCreator. Also, the functionality and design of the QBS
extra generator was never discussed on the CMake mailing list or with
QtCreator developers. There may be better ways to make the two tools
work together.
In order to avoid committing to long-term support of this generator
prior to such discussion taking place, revert it from CMake for now.
We may restore this or use an alternative design based on results of
such discussion.
diff --git a/Help/generator/Qbs.rst b/Help/generator/Qbs.rst
deleted file mode 100644
index e569b77..000
--- a/Help/generator/Qbs.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-Qbs
-
-Generates Qbs project files.
-
-Project files for Qbs will be created in the top directory and
-in every subdirectory which features a CMakeLists.txt file containing
-a PROJECT() call. Additionally a hierarchy of makefiles is generated
-into the build tree. The appropriate make program can build the
-project through the default make target. A make install target is
-also provided.
-
-This extra generator may be specified as:
-
-``Qbs - MinGW Makefiles``
- Generate with :generator:`MinGW Makefiles`.
-
-``Qbs - NMake Makefiles``
- Generate with :generator:`NMake Makefiles`.
-
-``Qbs - Ninja``
- Generate with :generator:`Ninja`.
-
-``Qbs - Unix Makefiles``
- Generate with :generator:`Unix Makefiles`.
diff --git a/Help/manual/cmake-generators.7.rst
b/Help/manual/cmake-generators.7.rst
index 4482f95..cde8de8 100644
--- a/Help/manual/cmake-generators.7.rst
+++ b/Help/manual/cmake-generators.7.rst
@@ -110,4 +110,3 @@ The following extra generators are known to CMake.
/generator/KDevelop3
/generator/Kate
/generator/Sublime Text 2
- /generator/Qbs
diff --git a/Help/release/dev/add-extra-qbs-generator.rst
b/Help/release/dev/add-extra-qbs-generator.rst
deleted file mode 100644
index edb441f..000
--- a/Help/release/dev/add-extra-qbs-generator.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-add-extra-qbs-geneator
---
-
-* It is now possible to generate :generator:`Qbs` project files
- for use with QtCreator IDE, matching make tool must be used
- to build the project through the generated makefiles.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 6f12785..9624401 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -233,8 +233,6 @@ set(SRCS
cmExtraKateGenerator.h
cmExtraSublimeTextGenerator.cxx
cmExtraSublimeTextGenerator.h
- cmExtraQbsGenerator.cxx
- cmExtraQbsGenerator.h
cmFileLock.cxx
cmFileLock.h
cmFileLockPool.cxx
diff --git a/Source/cmExtraQbsGenerator.cxx b/Source/cmExtraQbsGenerator.cxx
deleted file mode 100644
index c15f8da..000
--- a/Source/cmExtraQbsGenerator.cxx
+++ /dev/null
@@ -1,262 +0,0 @@
-#include cmExtraQbsGenerator.h
-
-#include cmGlobalGenerator.h
-#include cmLocalGenerator.h
-#include cmMakefile.h
-#include cmGeneratedFileStream.h
-#include cmSourceFile.h
-
-cmExtraQbsGenerator::cmExtraQbsGenerator()
-{
-#if defined(_WIN32)
- this-SupportedGlobalGenerators.push_back(MinGW Makefiles);
- this-SupportedGlobalGenerators.push_back(NMake Makefiles);
-#endif
- this-SupportedGlobalGenerators.push_back(Ninja);
- this-SupportedGlobalGenerators.push_back(Unix
Re: [CMake] How to skip steps and use default values in ExternalProject_Add command?
No idea on this one. The trick I showed is vanilla CMake, a direct
consequence of the CMake parsing string processing algorithm. What you're
asking is about the internals of ExternalProject_Add, of which I know
nothing.
Petr
On Thu, May 21, 2015 at 1:43 PM, Cedric Doucet cedric.dou...@inria.fr
wrote:
Hi Petr!
Thank you for the trick: it's very powerful!
Does this mean that these two calls are equivalent if I write:
set(the_configure_command
CONFIGURE_COMMAND)?
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
${the_configure_command}
)
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
)
I guess the default value of CONFIGURE_COMMAND will be used, right?
Cédric
--
*De: *Petr Kmoch petr.km...@gmail.com
*À: *Cedric Doucet cedric.dou...@inria.fr
*Cc: *cmake@cmake.org
*Envoyé: *Jeudi 21 Mai 2015 13:33:27
*Objet: *Re: [CMake] How to skip steps and use default values in
ExternalProject_Add command?
Hi Cedric.
When doing things like that, remember that CMake's named arguments are
arguments just like any other. So you can easily obtain them from variable
expansion; something like this:
if(${LIBRARY}_CONFIGURE_COMMAND)
set(the_configure_command CONFIGURE_COMMAND
${${LIBRARY}_CONFIGURE_COMMAND})
else()
set(the_configure_command )
endif()
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
${the_configure_command}
BUILD_COMMAND ${${LIBRARY}_BUILD_COMMAND}
INSTALL_COMMAND ${${LIBRARY}_INSTALL_COMMAND}
)
The same trick can be applied to any other command you need to
conditionally exclude, of course.
Petr
On Thu, May 21, 2015 at 1:10 PM, Cedric Doucet cedric.dou...@inria.fr
wrote:
Hello,
I would like to loop on a list of libraries to download and install, by
calling the ExternalProject_Add command for each of these libraries.
To do that, I need to define some commands for each library, like
CONFIGURE_COMMAND, BUILD_COMMAND and INSTALL_COMMAND.
These commands may differ from one library to another; for example, some
of them may be based on make, or autoconfig, or cmake, etc.
Furthermore, some of these libraries may not need to be built.
What is the good way to skip some steps?
Is it possible to use default values for some commands?
The problem in my situation is that I have to fill in each command since
I want to design way of downloading and installing third party libraries.
To be clear, I wrote a loop which looks like this:
==
foreach(LIBRARY IN LISTS NOT_FOUND_LIBRARIES)
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
CONFIGURE_COMMAND
${${LIBRARY}_CONFIGURE_COMMAND}
BUILD_COMMAND
${${LIBRARY}_BUILD_COMMAND}
INSTALL_COMMAND
${${LIBRARY}_INSTALL_COMMAND}
)
endforeach(LIBRARY)
==
However, if a library is based on cmake, I do not need to specify
commands for configuration and building.
Is it possible to say that the default value of CONFIGURE_COMMAND will be
used for example?
The only way I know to do that is to suppress the line
defining CONFIGURE_COMMAND but I can't do that since other libraries may
need to define it.
To skip steps, I replace the corresponding command by 'ls' but it's not
very clean.
That is to say, the value of ${LIBRARY}_CONFIGURE_COMMAND is 'ls' when I
want to skip the configuration step.
Thank you very much for your help.
Cédric
--
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
[Cmake-commits] CMake branch, next, updated. v3.2.2-3055-g8070c4f
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 8070c4f252293e7dfe44fd2c53d5d7498b307c67 (commit)
via 2f4bb4e9b033e1ac3daf63c0dc7c588ccbd70bf4 (commit)
from dc7377cb0c319462ec1830e3ea43d6bb2b38f99c (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=8070c4f252293e7dfe44fd2c53d5d7498b307c67
commit 8070c4f252293e7dfe44fd2c53d5d7498b307c67
Merge: dc7377c 2f4bb4e
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 21 09:17:10 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 21 09:17:10 2015 -0400
Merge topic 'vs-cleanup-internal-configs' into next
2f4bb4e9 VS: Do not accumulate configurations globally (#15577)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f4bb4e9b033e1ac3daf63c0dc7c588ccbd70bf4
commit 2f4bb4e9b033e1ac3daf63c0dc7c588ccbd70bf4
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed May 20 13:55:21 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu May 21 09:06:49 2015 -0400
VS: Do not accumulate configurations globally (#15577)
Drop the VS = 7 generator's global Configurations member and instead
lookup configurations using cmMakefile::GetConfigurations where needed.
This avoids accumulating all CMAKE_CONFIGURATION_TYPES values ever
encountered by a project() or enable_language() command and allows
the final value to be used in each directory. We don't officially
support per-directory CMAKE_CONFIGURATION_TYPES values but we certainly
should not generate configurations not in the final value in the top
level directory.
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx
b/Source/cmGlobalVisualStudio71Generator.cxx
index e3636bb..80858b4 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -83,6 +83,9 @@ void cmGlobalVisualStudio71Generator
cmLocalGenerator* root,
std::vectorcmLocalGenerator* generators)
{
+ std::vectorstd::string configs;
+ root-GetMakefile()-GetConfigurations(configs);
+
// Write out the header for a SLN file
this-WriteSLNHeader(fout);
@@ -104,11 +107,11 @@ void cmGlobalVisualStudio71Generator
// Write out the configurations information for the solution
fout Global\n;
// Write out the configurations for the solution
- this-WriteSolutionConfigurations(fout);
+ this-WriteSolutionConfigurations(fout, configs);
fout \tGlobalSection( this-ProjectConfigurationSectionName
) = postSolution\n;
// Write out the configurations for all the targets in the project
- this-WriteTargetConfigurations(fout, orderedProjectTargets);
+ this-WriteTargetConfigurations(fout, configs, orderedProjectTargets);
fout \tEndGlobalSection\n;
if (useFolderProperty)
@@ -129,11 +132,12 @@ void cmGlobalVisualStudio71Generator
//
void
cmGlobalVisualStudio71Generator
-::WriteSolutionConfigurations(std::ostream fout)
+::WriteSolutionConfigurations(std::ostream fout,
+ std::vectorstd::string const configs)
{
fout \tGlobalSection(SolutionConfiguration) = preSolution\n;
- for(std::vectorstd::string::iterator i = this-Configurations.begin();
- i != this-Configurations.end(); ++i)
+ for(std::vectorstd::string::const_iterator i = configs.begin();
+ i != configs.end(); ++i)
{
fout \t\t *i = *i \n;
}
@@ -269,14 +273,15 @@ void cmGlobalVisualStudio71Generator
void cmGlobalVisualStudio71Generator
::WriteProjectConfigurations(
std::ostream fout, const std::string name, cmTarget::TargetType,
+ std::vectorstd::string const configs,
const std::setstd::string configsPartOfDefaultBuild,
std::string const platformMapping)
{
const std::string platformName =
!platformMapping.empty() ? platformMapping : this-GetPlatformName();
std::string guid = this-GetGUID(name);
- for(std::vectorstd::string::iterator i = this-Configurations.begin();
- i != this-Configurations.end(); ++i)
+ for(std::vectorstd::string::const_iterator i = configs.begin();
+ i != configs.end(); ++i)
{
fout \t\t{ guid }. *i
.ActiveCfg = *i | platformName std::endl;
diff --git a/Source/cmGlobalVisualStudio71Generator.h
b/Source/cmGlobalVisualStudio71Generator.h
index 7223ebc..dbae43d 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -54,7 +54,8 @@ protected:
virtual void WriteSLNFile(std::ostream fout,
[cmake-developers] CMake strips MAKEFLAGS from environment
This is what I'm seeing:
$ echo 'message(MAKEFLAGS: $ENV{MAKEFLAGS}\nFOO: $ENV{FOO})'
CMakeLists.txt
$ MAKEFLAGS=test FOO=bar cmake .
-- The C compiler identification is GNU 4.8.3
-- The CXX compiler identification is GNU 4.8.3
-- Check for working C compiler: /usr/lib64/ccache/cc
-- Check for working C compiler: /usr/lib64/ccache/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/lib64/ccache/c++
-- Check for working CXX compiler: /usr/lib64/ccache/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
MAKEFLAGS:
FOO: bar
-- Configuring done
-- Generating done
-- Build files have been written to: /tmp/test_env_makeflags
Why is CMake stripping MAKEFLAGS from its environment? I couldn't find any
documentation describing this as normal/expected behavior.
Thanks,
Taylor
--
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-commits] CMake branch, next, updated. v3.2.2-3037-g831e03d
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 831e03dd36b80a02cd47bbb0aa9a17b46306f799 (commit) via e462ef74e55f2c4c1169797d4916f8076a927485 (commit) via 8ea2db2639b55b5c3590a594f9beddd9740cf679 (commit) via 438ce4a0fb92b7288a46e17524418522468eb0a2 (commit) from a17f3b295d1ce7f8135cbb4ed823a1a92aacff41 (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=831e03dd36b80a02cd47bbb0aa9a17b46306f799 commit 831e03dd36b80a02cd47bbb0aa9a17b46306f799 Merge: a17f3b2 e462ef7 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 08:59:57 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 21 08:59:57 2015 -0400 Merge topic 'cmake-gui-osx-install-command-line' into next e462ef74 Help: Add notes for topic 'cmake-gui-osx-install-command-line' 8ea2db26 cmake-gui: Replace command-line install dialog with information box 438ce4a0 cmake-gui: Add --install option to add command-line tools on OS X http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e462ef74e55f2c4c1169797d4916f8076a927485 commit e462ef74e55f2c4c1169797d4916f8076a927485 Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 19 10:37:29 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 21 08:59:32 2015 -0400 Help: Add notes for topic 'cmake-gui-osx-install-command-line' diff --git a/Help/release/dev/cmake-gui-osx-install-command-line.rst b/Help/release/dev/cmake-gui-osx-install-command-line.rst new file mode 100644 index 000..e0f0369 --- /dev/null +++ b/Help/release/dev/cmake-gui-osx-install-command-line.rst @@ -0,0 +1,10 @@ +cmake-gui-osx-install-command-line +-- + +* On OS X the :manual:`cmake-gui(1)` no longer has the + ``Install For Command Line Use`` menu item. Instead there + is a ``How to Install For Command Line Use`` menu item + that shows an informational dialog box explaining how to + make the command line tools available. For example:: + +/Applications/CMake.app/Contents/bin/cmake-gui --install http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ea2db2639b55b5c3590a594f9beddd9740cf679 commit 8ea2db2639b55b5c3590a594f9beddd9740cf679 Author: Brad King brad.k...@kitware.com AuthorDate: Tue May 19 10:13:08 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 21 08:59:32 2015 -0400 cmake-gui: Replace command-line install dialog with information box The QMacInstallDialog infrastructure no longer works on modern OS X versions. Drop it and replace the dialog with a simple info box that explains to the user how to run 'cmake-gui --install' to add symlinks. Also suggest simply modifying the PATH. This approach is similar to the Xcode 'xcode-select --install' method of installing Xcode Command Line Tools. diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 9cc993a..168f57d 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -99,15 +99,12 @@ set(SRCS QCMakeCacheView.h QCMakeWidgets.cxx QCMakeWidgets.h - QMacInstallDialog.cxx - QMacInstallDialog.h ) QT4_WRAP_UI(UI_SRCS CMakeSetupDialog.ui Compilers.ui CrossCompiler.ui AddCacheEntry.ui - MacInstallDialog.ui ) QT4_WRAP_CPP(MOC_SRCS AddCacheEntry.h @@ -117,7 +114,6 @@ QT4_WRAP_CPP(MOC_SRCS QCMake.h QCMakeCacheView.h QCMakeWidgets.h - QMacInstallDialog.h ) QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc) diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 167f37c..2d336ee 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -15,7 +15,6 @@ #include QTranslator #include QLocale #include QTextCodec -#include QMacInstallDialog.h #include CMakeSetupDialog.h #include cmDocumentation.h #include cmake.h diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index b8077f2..426fa12 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -27,7 +27,6 @@ #include QUrl #include QShortcut #include QKeySequence -#include QMacInstallDialog.h #include QInputDialog #include QCMake.h @@ -121,7 +120,7 @@ CMakeSetupDialog::CMakeSetupDialog() this, SLOT(showUserChanges())); #if defined(Q_WS_MAC) || defined(Q_OS_MAC) this-InstallForCommandLineAction -= ToolsMenu-addAction(tr(Install For Command Line Use)); += ToolsMenu-addAction(tr(How to Install For Command Line Use));
[Cmake-commits] CMake branch, master, updated. v3.2.2-1226-g41d833e
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 41d833e1e9decb422c019f16626fe61e38c03eec (commit) via b3795df2f4e042f8db74a1d9024ca3d03eccea2d (commit) via a4596f204822c91581ca69d513e0ed3638eee495 (commit) from a696974298aebdf5b618ce981a4a355a872d474e (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=41d833e1e9decb422c019f16626fe61e38c03eec commit 41d833e1e9decb422c019f16626fe61e38c03eec Merge: a696974 b3795df Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 09:03:38 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 21 09:03:38 2015 -0400 Merge topic 'cleanup-module-policies' b3795df2 FortranCInterface: Do not use cmake_policy(VERSION) a4596f20 CheckTypeSize: Do not use cmake_policy(VERSION) --- Summary of changes: Modules/CheckTypeSize.cmake |1 - Modules/FortranCInterface.cmake |3 +-- 2 files changed, 1 insertion(+), 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.2.2-1271-gdb90e7c
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 db90e7c6bcd40c2cdc27232f5305800ae215ce14 (commit) via e54d2fdf50d7e1170f9e3dcbcb62ebacc7205de6 (commit) via 20c2fe4d10ac72b8352bdbea361124296a515d6c (commit) via 7601a7b12d1c4a3bddb1ca34dcf38e1aea188698 (commit) via 4080ca497e9841c73324e8cd4d1017a87065e879 (commit) via ad70681909c75d266e297725eadd9f47e9bf001f (commit) from 3e3a09d1d3c91a6522260734b4542b420152e21c (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=db90e7c6bcd40c2cdc27232f5305800ae215ce14 commit db90e7c6bcd40c2cdc27232f5305800ae215ce14 Merge: 3e3a09d e54d2fd Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 09:03:54 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 21 09:03:54 2015 -0400 Merge topic 'clean-up-cmLocalGenerator' e54d2fdf Convert: Remove specification of default parameter. 20c2fe4d cmLocalGenerator: Get enabled languages from cmState. 7601a7b1 cmLocalGenerator: Implement IsRootMakefile in terms of cmState. 4080ca49 cmLocalGenerator: Inline ReadListFile method. ad706819 cmLocalGenerator: Devirtualize method. --- Summary of changes: Source/cmLocalGenerator.cxx | 26 +- Source/cmLocalGenerator.h |5 + Source/cmMakefileLibraryTargetGenerator.cxx |2 +- Source/cmNinjaNormalTargetGenerator.cxx |3 +-- Source/cmake.cxx|3 +-- 5 files changed, 13 insertions(+), 26 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.2.2-1273-g26a04a6
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 26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2 (commit) via b5906ed03ab98b7749522d4f8211e9bcc55596c4 (commit) from db90e7c6bcd40c2cdc27232f5305800ae215ce14 (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=26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2 commit 26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2 Merge: db90e7c b5906ed Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 09:03:55 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 21 09:03:55 2015 -0400 Merge topic 'use-std-unordered_map' b5906ed0 Check for std::unordered_map only if we are building CMake --- Summary of changes: CMakeLists.txt |4 +++- 1 file changed, 3 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.2.2-1263-g2c54622
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 2c54622ff57b2ccb44d4e99e2fefb0501dbccb92 (commit) via e462ef74e55f2c4c1169797d4916f8076a927485 (commit) via 8ea2db2639b55b5c3590a594f9beddd9740cf679 (commit) via 438ce4a0fb92b7288a46e17524418522468eb0a2 (commit) via 41477d5c0705baa33878c16e979283088efe2c4a (commit) from f3e4e3ecde21e790c6428f553f81e4d544f4e73b (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=2c54622ff57b2ccb44d4e99e2fefb0501dbccb92 commit 2c54622ff57b2ccb44d4e99e2fefb0501dbccb92 Merge: f3e4e3e e462ef7 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 09:03:50 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 21 09:03:50 2015 -0400 Merge topic 'cmake-gui-osx-install-command-line' e462ef74 Help: Add notes for topic 'cmake-gui-osx-install-command-line' 8ea2db26 cmake-gui: Replace command-line install dialog with information box 438ce4a0 cmake-gui: Add --install option to add command-line tools on OS X 41477d5c cmake-gui: Drop undocumented and unused --mac-install option --- Summary of changes: .../dev/cmake-gui-osx-install-command-line.rst | 10 ++ Source/QtDialog/CMakeLists.txt |4 - Source/QtDialog/CMakeSetup.cxx | 78 +++-- Source/QtDialog/CMakeSetupDialog.cxx | 36 +- Source/QtDialog/MacInstallDialog.ui| 103 - Source/QtDialog/QMacInstallDialog.cxx | 121 Source/QtDialog/QMacInstallDialog.h| 20 7 files changed, 109 insertions(+), 263 deletions(-) create mode 100644 Help/release/dev/cmake-gui-osx-install-command-line.rst delete mode 100644 Source/QtDialog/MacInstallDialog.ui delete mode 100644 Source/QtDialog/QMacInstallDialog.cxx delete mode 100644 Source/QtDialog/QMacInstallDialog.h 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.2.2-3051-g482438b
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 482438b97ac5d5be76cbb457c6187478a5fa50dd (commit) via 3541fc73a12a52f87a2faa9790a65651658162d8 (commit) via 26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2 (commit) via db90e7c6bcd40c2cdc27232f5305800ae215ce14 (commit) via 3e3a09d1d3c91a6522260734b4542b420152e21c (commit) via 2c54622ff57b2ccb44d4e99e2fefb0501dbccb92 (commit) via f3e4e3ecde21e790c6428f553f81e4d544f4e73b (commit) via e604bb1be9358f72b479b1710a3251b0cecca13c (commit) via f05d9308c9c01949071a764acceb4bf88875f8a9 (commit) via a23fdec8d2bfb8f2ce88972d93e23c83923ec4af (commit) via 03a65dab30a0ef34ec900126c03a01cc9da55f36 (commit) via 41d833e1e9decb422c019f16626fe61e38c03eec (commit) via a696974298aebdf5b618ce981a4a355a872d474e (commit) via f3c308dd82dce64b0bbf862d65dc473d35116b32 (commit) from 831e03dd36b80a02cd47bbb0aa9a17b46306f799 (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=482438b97ac5d5be76cbb457c6187478a5fa50dd commit 482438b97ac5d5be76cbb457c6187478a5fa50dd Merge: 831e03d 3541fc7 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 21 09:04:09 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 21 09:04:09 2015 -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] How to skip steps and use default values in ExternalProject_Add command?
Hello,
I would like to loop on a list of libraries to download and install, by calling
the ExternalProject_Add command for each of these libraries.
To do that, I need to define some commands for each library, like
CONFIGURE_COMMAND, BUILD_COMMAND and INSTALL_COMMAND.
These commands may differ from one library to another; for example, some of
them may be based on make, or autoconfig, or cmake, etc.
Furthermore, some of these libraries may not need to be built.
What is the good way to skip some steps?
Is it possible to use default values for some commands?
The problem in my situation is that I have to fill in each command since I want
to design way of downloading and installing third party libraries.
To be clear, I wrote a loop which looks like this:
==
foreach(LIBRARY IN LISTS NOT_FOUND_LIBRARIES)
ExternalProject_Add(${${LIBRARY}_LOWERNAME}
PREFIX ${${LIBRARY}_PREFIX}
URL ${${LIBRARY}_URL}
CONFIGURE_COMMAND ${${LIBRARY}_CONFIGURE_COMMAND}
BUILD_COMMAND ${${LIBRARY}_BUILD_COMMAND}
INSTALL_COMMAND ${${LIBRARY}_INSTALL_COMMAND}
)
endforeach(LIBRARY)
==
However, if a library is based on cmake, I do not need to specify commands for
configuration and building.
Is it possible to say that the default value of CONFIGURE_COMMAND will be used
for example?
The only way I know to do that is to suppress the line defining
CONFIGURE_COMMAND but I can't do that since other libraries may need to define
it.
To skip steps, I replace the corresponding command by 'ls' but it's not very
clean.
That is to say, the value of ${LIBRARY}_CONFIGURE_COMMAND is 'ls' when I want
to skip the configuration step.
Thank you very much for your help.
Cédric
--
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-developers] Running coverage tool with environment (was: CMake strips MAKEFLAGS from environment)
On Thu, May 21, 2015 at 10:19 AM, Brad King brad.k...@kitware.com wrote: We typically run coverage as part of nightly testing with a 'ctest -S' dashboard client script. The script surrounds the actual build invocation and can take responsibility for adding things like COVFILE to the environment. Ya, that was one of my first thoughts and it does make things simpler. But I wanted developers to be able to get instant coverage feedback at their desktop to shorten the write test/check coverage cycle. We have high MC/DC coverage goals and as you start to approach 100% coverage it's not always obvious what conditions/decisions are the missing coverage. I also want to keep the usage simple and consistent meaning that code coverage and static analysis reports should be available as a build target (e.g. `make coverage_report coverity_report`) Taylor -- 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] Ninja generator: skip checking of dependencies when building a target
Does the CMake Ninja generator support a way to skip dependencies when building a target? Something like the target_name/fast feature for the Makefile generator? [1] Thanks, Taylor [1] http://www.cmake.org/Wiki/CMake_FAQ#Is_there_a_way_to_skip_checking_of_dependent_libraries_when_compiling.3F -- 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-developers] CMake strips MAKEFLAGS from environment
On Thu, May 21, 2015 at 9:44 AM, Ben Boeckel ben.boec...@kitware.com
wrote:
The problem with MAKEFLAGS is that `-i` also gets inherited and that is
not acceptable to use when running things like try_compile since it
causes false positives (e.g., detecting NEON extensions on x86). CMake
clears it so that it has a better expectation of how things will run. Is
there a reason you can't use a CMake cache variable to set
`environment_build_flags` rather than the environment (since it would
get remembered between cmake runs while the environment needs to be
specified every time)?
Ya, I could definitely use a cache variable and that probably makes sense
to do here. But I'm not sure how it solves my problem. For example, with
this CMakeLists.txt:
cmake_minimum_required(VERSION 3.0)
set(environment_build_flags $ENV{MAKEFLAGS} CACHE STRING MAKEFLAGS)
add_custom_target(echo_makeflags COMMAND echo environment_build_flags:
${environment_build_flags} VERBATIM)
I still just get:
$ make echo_makeflags
environment_build_flags:
Built target echo_makeflags
Taylor
--
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] CMake strips MAKEFLAGS from environment
On Thu, May 21, 2015 at 8:56 AM, Brad King brad.k...@kitware.com wrote:
What are you trying to do?
I'm trying to implement a workaround solution for setting environment
variables in my Makefiles at build time. So what I started with was this:
set(bullseye_environment COVFILE=${PROJECT_BINARY_DIR}/bullseye/test.cov)
add_custom_target(coverage_data
COMMAND env ${bullseye_environment}
${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR} --clean-first
COMMAND env ${bullseye_environment} ${CMAKE_CTEST_COMMAND}
--output-on-failure
COMMENT Generating test coverage data
VERBATIM
)
Which works fine for Ninja generator. It works for Unix Makefiles too,
except that the parallelism is lost. I get errors like:
gmake[1]: warning: jobserver unavailable: using -j1. Add `+' to parent
make rule.
So I added another workound for that:
if(${CMAKE_GENERATOR} MATCHES .* Makefiles$)
set(environment_build_flags $ENV{MAKEFLAGS})
endif()
add_custom_target(coverage_data
COMMAND env --unset=MAKEFLAGS ${bullseye_environment}
${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR} --clean-first --
${environment_build_flags}
COMMAND env ${bullseye_environment} ${CMAKE_CTEST_COMMAND}
--output-on-failure
COMMENT Generating test coverage data
VERBATIM
)
Which allows the parallelism to work properly in an environment like:
export MAKEFLAGS=$(grep -i -c ^processor /proc/cpuinfo)
make coverage_data
Taylor
--
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] CMake strips MAKEFLAGS from environment
On 05/21/2015 09:31 AM, Taylor Braun-Jones wrote: gmake[1]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. I don't think that is caused by the MAKEFLAGS removal I linked. The code I linked does not run during 'cmake --build'. It only runs while configuring a project to protect try_compile. The problem is that make does not pass MAKEFLAGS when invoking a tool it does not think is 'make'. For example: - $ cat env.make all: @env make -f env.make other other: @echo MAKEFLAGS='$(MAKEFLAGS)' $ make -j2 -f env.make other MAKEFLAGS= -j --jobserver-fds=3,4 $ make -j2 -f env.make all make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. MAKEFLAGS=w - You could try using +env as your COMMAND instead, though I wouldn't consider this an officially supported approach. -Brad -- 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] Running coverage tool with environment (was: CMake strips MAKEFLAGS from environment)
On 05/21/2015 09:31 AM, Taylor Braun-Jones wrote:
I'm trying to implement a workaround solution for setting environment
variables
in my Makefiles at build time. So what I started with was this:
set(bullseye_environment COVFILE=${PROJECT_BINARY_DIR}/bullseye/test.cov)
add_custom_target(coverage_data
COMMAND env ${bullseye_environment}
${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR} --clean-first
COMMAND env ${bullseye_environment} ${CMAKE_CTEST_COMMAND}
--output-on-failure
We typically run coverage as part of nightly testing with a 'ctest -S'
dashboard client script. The script surrounds the actual build
invocation and can take responsibility for adding things like COVFILE
to the environment.
-Brad
--
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] CMake strips MAKEFLAGS from environment
On Thu, May 21, 2015 at 09:31:41 -0400, Taylor Braun-Jones wrote:
So I added another workound for that:
if(${CMAKE_GENERATOR} MATCHES .* Makefiles$)
set(environment_build_flags $ENV{MAKEFLAGS})
endif()
add_custom_target(coverage_data
COMMAND env --unset=MAKEFLAGS ${bullseye_environment}
${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR} --clean-first --
${environment_build_flags}
COMMAND env ${bullseye_environment} ${CMAKE_CTEST_COMMAND}
--output-on-failure
COMMENT Generating test coverage data
VERBATIM
)
Which allows the parallelism to work properly in an environment like:
export MAKEFLAGS=$(grep -i -c ^processor /proc/cpuinfo)
make coverage_data
The problem with MAKEFLAGS is that `-i` also gets inherited and that is
not acceptable to use when running things like try_compile since it
causes false positives (e.g., detecting NEON extensions on x86). CMake
clears it so that it has a better expectation of how things will run. Is
there a reason you can't use a CMake cache variable to set
`environment_build_flags` rather than the environment (since it would
get remembered between cmake runs while the environment needs to be
specified every time)?
--Ben
--
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-commits] CMake branch, next, updated. v3.2.2-3060-g75e0711
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 75e071117161e8e01a5fd3144279f276dcf8f1a1 (commit)
via 65d0930ef5fffaf0538f4be23c8d6bc933964f82 (commit)
via a6edb953434166e3b539a020c31d825457eb4aa6 (commit)
via 726bee71d6bffe8a878ebad4f7ae2c10716fe76a (commit)
via 38d55c7ccbd0dddbf12592cc55730a854ea4d9a4 (commit)
from 8070c4f252293e7dfe44fd2c53d5d7498b307c67 (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=75e071117161e8e01a5fd3144279f276dcf8f1a1
commit 75e071117161e8e01a5fd3144279f276dcf8f1a1
Merge: 8070c4f 65d0930
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 21 09:57:58 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 21 09:57:58 2015 -0400
Merge topic 'FindOpenGL-target' into next
65d0930e FindOpenGL: Provide imported targets for GL and GLU (#15267)
a6edb953 Allow imported INTERFACE libraries to specify a link item
726bee71 cmTarget: Refactor GetMappedConfig to choose location property up
front
38d55c7c cmTarget: Clarify comments in GetMappedConfig
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65d0930ef5fffaf0538f4be23c8d6bc933964f82
commit 65d0930ef5fffaf0538f4be23c8d6bc933964f82
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 19 15:40:55 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu May 21 09:19:07 2015 -0400
FindOpenGL: Provide imported targets for GL and GLU (#15267)
Create OpenGL::GL and OpenGL::GLU imported targets using the locations
found. On Windows the MS opengl32 library is provided by the platform
SDK so we do not know the full path to the library file. In this case,
provide the target as an interface library with IMPORTED_LINK_ITEM set
so that we simply ask the linker to search for the library.
This restores the change originally made by commit v3.1.0-rc1~420^2~2
(FindOpenGL: Provide imported targets for GL and GLU, 2014-05-31) and
later reverted by commit v3.1.0-rc3~10^2 (FindOpenGL: Revert support for
imported targets, 2014-12-01) but resolves the reasons it was reverted.
Add a test for the FindOpenGL module that always runs but skips actually
building anything if OpenGL is not found. Provide an option that a
dashboard script can use to require that OpenGL be found on a machine
where it is expected to work.
Inspired-by: Philipp Möller bootsare...@googlemail.com
diff --git a/Help/release/dev/FindOpenGL-target.rst
b/Help/release/dev/FindOpenGL-target.rst
new file mode 100644
index 000..670507e
--- /dev/null
+++ b/Help/release/dev/FindOpenGL-target.rst
@@ -0,0 +1,5 @@
+FindOpenGL-target
+-
+
+* The :module:`FindOpenGL` module now provides imported targets
+ ``OpenGL::GL`` and ``OpenGL::GLU`` when the libraries are found.
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index a7eefa7..f4cf6d7 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -4,6 +4,16 @@
#
# FindModule for OpenGL and GLU.
#
+# IMPORTED Targets
+#
+#
+# This module defines the :prop_tgt:`IMPORTED` targets:
+#
+# ``OpenGL::GL``
+# Defined if the system has OpenGL.
+# ``OpenGL::GLU``
+# Defined if the system has GLU.
+#
# Result Variables
#
#
@@ -168,6 +178,55 @@
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL REQUIRED_VARS
${_OpenGL_REQUIRED_VARS})
unset(_OpenGL_REQUIRED_VARS)
+# OpenGL:: targets
+if(OPENGL_FOUND)
+ if(NOT TARGET OpenGL::GL)
+if(IS_ABSOLUTE ${OPENGL_gl_LIBRARY})
+ add_library(OpenGL::GL UNKNOWN IMPORTED)
+ if(OPENGL_gl_LIBRARY MATCHES /([^/]+)\\.framework$)
+set_property(TARGET OpenGL::GL PROPERTY
+ IMPORTED_LOCATION ${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}
+ )
+ else()
+set_property(TARGET OpenGL::GL PROPERTY
+ IMPORTED_LOCATION ${OPENGL_gl_LIBRARY}
+ )
+ endif()
+else()
+ add_library(OpenGL::GL INTERFACE IMPORTED)
+ set_property(TARGET OpenGL::GL PROPERTY
+IMPORTED_LINK_ITEM ${OPENGL_gl_LIBRARY}
+)
+endif()
+set_property(TARGET OpenGL::GL PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES ${OPENGL_INCLUDE_DIR}
+ )
+ endif()
+
+ if(OPENGL_GLU_FOUND AND NOT TARGET OpenGL::GLU)
+if(IS_ABSOLUTE ${OPENGL_glu_LIBRARY})
+ add_library(OpenGL::GLU UNKNOWN IMPORTED)
+ if(OPENGL_glu_LIBRARY MATCHES /([^/]+)\\.framework$)
+set_property(TARGET OpenGL::GLU PROPERTY
+
[cmake-developers] Importing platform SDK libraries without a full path
Hi Folks, Last year FindOpenGL gained imported targets: FindOpenGL: Provide imported targets for GL and GLU http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7804cb6 only to be reverted prior to release: FindOpenGL: Revert support for imported targets http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02e34de2 due to this issue: FindOpenGL: need name-only imported targets on Windows http://www.cmake.org/Bug/view.php?id=15267 The problem is that we need a way to link to 'opengl32.lib' through an imported target without knowing the full path to the library file and instead ask the linker to search for it in the platform SDK directory at link time. Without a full path we cannot set the IMPORTED_LOCATION property of an imported OpenGL::GL target. We cannot lift the requirement that IMPORTED_LOCATION be a full path because that is fundamental to the design of imported targets and is needed for things like $TARGET_FILE:... to work correctly. The only kind of imported target that does not require an IMPORTED_LOCATION is an INTERFACE library, so on Windows the OpenGL::GL target will have to be an imported INTERFACE library. We could use INTERFACE_LINK_LIBRARIES to specify 'opengl32.lib', but that would not preserve the inline library ordering as using IMPORTED_LOCATION does. Instead I propose a new IMPORTED_LINK_ITEM[_CONFIG] property to take the place of IMPORTED_LOCATION[_CONFIG] for an imported INTERFACE library. It will allow one to specify exactly one raw item to be placed on the link line for the interface library since it has no location. For the above case this item would be just 'opengl32'. This could also be used for cases like FindThreads and '-pthread'. I've drafted an implementation of the approach here: Allow imported INTERFACE libraries to specify a link item http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6edb953 and used it to provide the imported OpenGL::GL target: FindOpenGL: Provide imported targets for GL and GLU http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65d0930e I'd appreciate feedback from others on this approach. Thanks, -Brad P.S. My original attempt at allowing link item specification was much more general. It was an INTERFACE_LINK_ITEMS property on INTERFACE libraries that could be specified on in-project targets and exported during installation: Allow INTERFACE libraries to specify link items http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4adad1e I reverted it from 'next' and never merged it to 'master' due to overlap with possible LINK_OPTIONS/ARCHIVE_OPTIONS work discussed previously. Instead I propose the more narrow IMPORTED_LINK_ITEM approach to resolve the problem for FindOpenGL without tackling the larger design goals yet. Basically IMPORTED_LINK_ITEM completes the design of IMPORTED_LOCATION as might have been done if interface libraries existed when imported targets were first created. -- 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] Ninja generator: skip checking of dependencies when building a target
Taylor Braun-Jones wrote: Does the CMake Ninja generator support a way to skip dependencies when building a target? Something like the target_name/fast feature for the Makefile generator? [1] I believe the last time that was raised was http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/3471/focus=3483 If you have new information, feel free to file a bug and link to that. Thanks, Steve. -- 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] (no subject)
Hello, I am trying to compile a code written in C, but using an external library that contains C++ functions. I am on a Cray system and everything works if I manually link with the cray CC wrapper. When I change the linker language with this command: set_property(TARGET adh PROPERTY LINKER_LANGUAGE CXX) CMake is using the CC wrapper, but adding -lstdc++ to the link line. This causes an error. Can anyone tell me how to not get this added library? Thanks, Lucas Pettey, PhD HPCMP PETTT EQM CTA Lead ERDC-DSRC OnSite Vicksburg, MS 512-297-9833 Mobile (preferred) 601-634-2980 Office lucas.pet...@engilitycorp.com -- 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.2.2-3066-gd2a981a
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 d2a981afa7e038dfb44e2643e263f089bfd12541 (commit)
via 8b4b9631f5f79ffee11b33c1e8826cd4064b3a23 (commit)
via 46656aa1fa69b79aa0c645a131d7abfdc34e621c (commit)
via 55fc5e7c9ad018bbb90fbcee6ac09cf224b46246 (commit)
via ca7cc2ebd0bd17b70279a51a3a087b5629175f06 (commit)
via fa752bf3393e583851b333cc41d2507dc217e9a8 (commit)
from 75e071117161e8e01a5fd3144279f276dcf8f1a1 (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=d2a981afa7e038dfb44e2643e263f089bfd12541
commit d2a981afa7e038dfb44e2643e263f089bfd12541
Merge: 75e0711 8b4b963
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu May 21 19:30:14 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 21 19:30:14 2015 -0400
Merge topic 'clean-up-backtrace-handling' into next
8b4b9631 cmake: Add IssueMessage overload taking a single cmListFileContext.
46656aa1 cmake: Extract displayMessage method.
55fc5e7c cmake: Extract printMessageText method.
ca7cc2eb cmake: Extract PrintMessagePreamble method.
fa752bf3 cmake: Move isError determination to a more-natural place.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b4b9631f5f79ffee11b33c1e8826cd4064b3a23
commit 8b4b9631f5f79ffee11b33c1e8826cd4064b3a23
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri May 22 00:38:03 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri May 22 01:21:35 2015 +0200
cmake: Add IssueMessage overload taking a single cmListFileContext.
Port appropriate clients to use it.
diff --git a/Source/cmCommandArgumentParserHelper.cxx
b/Source/cmCommandArgumentParserHelper.cxx
index c816c23..bd098a5 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -14,6 +14,7 @@
#include cmSystemTools.h
#include cmMakefile.h
#include cmState.h
+#include cmLocalGenerator.h
#include cmCommandArgumentLexer.h
@@ -139,14 +140,14 @@ char* cmCommandArgumentParserHelper::ExpandVariable(const
char* var)
this-Makefile-GetHomeOutputDirectory()))
{
std::ostringstream msg;
-cmListFileBacktrace bt(this-Makefile-GetLocalGenerator());
cmListFileContext lfc;
-lfc.FilePath = this-FileName;
+lfc.FilePath = this-Makefile-GetLocalGenerator()
+-Convert(this-FileName, cmLocalGenerator::HOME);
+
lfc.Line = this-FileLine;
-bt.Append(lfc);
msg uninitialized variable \' var \';
this-Makefile-GetCMakeInstance()-IssueMessage(cmake::AUTHOR_WARNING,
-msg.str(), bt);
+msg.str(), lfc);
}
}
return 0;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2a49c8f..3e8ae85 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -249,19 +249,13 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
std::string const text) const
{
// Collect context information.
- cmLocalGenerator* localGen = this-GetLocalGenerator();
- if(this-CallStack.empty() this-GetCMakeInstance()-GetIsInTryCompile())
-{
-localGen = 0;
-}
- cmListFileBacktrace backtrace(localGen);
if(!this-CallStack.empty())
{
if((t == cmake::FATAL_ERROR) || (t == cmake::INTERNAL_ERROR))
{
this-CallStack.back().Status-SetNestedError(true);
}
-backtrace = this-GetBacktrace();
+this-GetCMakeInstance()-IssueMessage(t, text, this-GetBacktrace());
}
else
{
@@ -278,12 +272,15 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
// command. Add whatever context information we have.
lfc.FilePath = this-ListFileStack.back();
}
+if(!this-CallStack.empty()
+ || !this-GetCMakeInstance()-GetIsInTryCompile())
+ {
+ lfc.FilePath = this-LocalGenerator-Convert(lfc.FilePath,
+ cmLocalGenerator::HOME);
+ }
lfc.Line = 0;
-backtrace.Append(lfc);
+this-GetCMakeInstance()-IssueMessage(t, text, lfc);
}
-
- // Issue the message.
- this-GetCMakeInstance()-IssueMessage(t, text, backtrace);
}
//
@@ -1837,22 +1834,22 @@ void cmMakefile::LogUnused(const char* reason,
if (this-WarnUnused)
{
std::string path;
-cmListFileBacktrace bt(this-GetLocalGenerator());
+
[Cmake-commits] CMake branch, master, updated. v3.2.2-1276-g57b5b07
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 57b5b074618d7adc8a50181c12fc944a84112495 (commit) from 3541fc73a12a52f87a2faa9790a65651658162d8 (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=57b5b074618d7adc8a50181c12fc944a84112495 commit 57b5b074618d7adc8a50181c12fc944a84112495 Author: Kitware Robot kwro...@kitware.com AuthorDate: Fri May 22 00:01:07 2015 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Fri May 22 00:01:07 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 54779a5..d5ab129 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 2) -set(CMake_VERSION_PATCH 20150521) +set(CMake_VERSION_PATCH 20150522) #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
Re: [cmake-developers] CMake strips MAKEFLAGS from environment
On Thu, May 21, 2015 at 10:14 AM, Brad King brad.k...@kitware.com wrote: You could try using +env as your COMMAND instead, though I wouldn't consider this an officially supported approach. Thanks - that works and is a much better workaround. -- 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
