[cmake-developers] External objects with IDE generators
Hi,
Part of the work on the SOURCES genex feature is that I want to have uniform
handling of it.
So
add_library(ObjLib OBJECT a.cpp b.cpp)
add_executable(exec c.cpp d.o e.cpp $TARGET_OBJECTS:ObjLib f.cpp)
file(GENERATE OUTPUT exec_files CONTENT $TARGET_PROPERTY:exec,SOURCES)
will result in a file containing
c.cpp
d.o
e.cpp
a.o
b.o
f.cpp
by a simple evaluation of the property as a genex. Similarly, generators
should get external objects of a target by calling GT-GetExternalObjects(),
which will output d.o, a.o, b.o without caring whether the files were listed
explicitly (like d.o) or via an OBJECT_LIBRARY (like a.o and b.o). The
separate infrastructure of GT-UseObjectLibraries etc could then be removed.
The UseObjectLibraries is problematic because it uses containers populated
up-front instead of on-demand with a config and head cmTarget. It should be
possible to do this for example:
set(exeOnly $STREQUAL:$TARGET_PROPERTY:TYPE,EXECUTABLE)
INTERFACE_SOURCES $${exeOnly},$TARGET_OBJECTS:ObjLib
This change seems unproblematic with the makefile and ninja generators. The
IDE generators are problematic though.
'git grep GetExternalObjects' shows that the IDEs mostly don't call
GetExternalObjects at all. Xcode does it's own thing entirely. VS10 gets
External objects, but treats them very differently to objects from
OBJECT_LIBRARY targets.
I'm not familiar with those generators or the IDEs, so I don't know where to
go from here.
Thanks,
Steve.
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014776]: find_package for boost broken under cygwin
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=14776 == Reported By:Dmitri Assigned To: == Project:CMake Issue ID: 14776 Category: CCMake Reproducibility:always Severity: major Priority: normal Status: new == Date Submitted: 2014-02-27 05:50 EST Last Modified: 2014-02-27 05:50 EST == Summary:find_package for boost broken under cygwin Description: When using find_package under cygwin, CMake tries looking for the correct path by _appending_ the path to the current path. So it finds c:/boost correctly, but tries to get the header from /cygdrive/c/path/to/my/project/c:/boost/boost/someheader.hpp Steps to Reproduce: Use the find_package to locate Boost on a Cygwin installation. CMake won't be able to find it despite deducing the path correctly. == Issue History Date ModifiedUsername FieldChange == 2014-02-27 05:50 Dmitri New Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014777]: OBJECT libraries cause Fortran to relink each time
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14777 == Reported By:Petr Kmoch Assigned To: == Project:CMake Issue ID: 14777 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2014-02-27 11:55 CET Last Modified: 2014-02-27 11:55 CET == Summary:OBJECT libraries cause Fortran to relink each time Description: When using the Visual Studio 10 generator and the solution includes a Fortran executable using objects from a C[XX] OBJECT library, the executable will relink each time 'Build solution' is run (or the executable's project is built). It ceases to happen when the object files are manually removed from the project as sources and instead added as additional linker dependencies. CMake should probably take this approach when generating a vfproj. I believe the same was happening for me in VS 2005, but I no longer have that on hand for testing. Neither do I have a chance to test this on newer Visual Studios. Using Intel(R) Visual Fortran Compiler XE 13.0.1.119 Steps to Reproduce: Expand the attached testcase and run cmake -G Visual Studio 10 == Issue History Date ModifiedUsername FieldChange == 2014-02-27 11:55 Petr Kmoch New Issue 2014-02-27 11:55 Petr Kmoch File Added: fortran_object_library.zip == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] [Generator] Android.mk
On 02/26/2014 05:21 PM, Vince Harron wrote: The question is, how does the cmake project decide on new features? There is no formal process. It is just discussion here of the feasibility, design, merits, etc. Also for non-trivial changes we'd like to feel confident that the contributor will stick around for a while to deal with repercussions. Before I begin implementation, I would like to know definitively that this would be accepted if implemented properly. An Andorid.mk generator would be well within scope AFAICT. So long as the implementation is sound and maintainable (i.e. properly refactors existing code as needed instead of cut-n-paste) it would be accepted. We'd also ask that nightly testing be contributed to the dashboard on a permanent basis to keep the feature working. Thanks, -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Review request: use PKG_CONFIG
On 02/26/2014 04:09 PM, Christoph Grüninger wrote: hopefully my last try: https://github.com/gruenich/CMake/commit/60de7f7fd5362580ada234a0513284d08a47519e Thanks. I've merged a slightly tweaked version to 'next': FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c53b5cd2 for testing and updated the issue tracker entry. Can I stick to send you contributions by GitHub? CONTRIBUTING.rst requests that you use git format-patch and send them here. If that is not comfortable for you then Github pull requests are okay for small changes that do not require broad-audience discussion. Thanks, -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] External objects with IDE generators
Brad King wrote: On 02/27/2014 03:32 AM, Stephen Kelly wrote: IDE generators are problematic though. 'git grep GetExternalObjects' shows that the IDEs mostly don't call GetExternalObjects at all. In this discussion we must distinguish external objects that are explicit .o files mentioned in the list of sources and OBJECT library objects. Why do we have to distinguish them? I'm trying to not distinguish them. Is the reason related to what you write below about VS10? All the generators, including the IDE generators, funnel handling of OBJECT library objects through UseObjectLibraries. Yes, I'm trying to eliminate UseObjectLibraries. It requires that the list of object libraries is pre-populated (by calling LookupObjectLibraries) and the list of Objects and the ObjectDirectory are pre-populated by the Global generators. Instead we need to be able to determine the objects on demand, based on the calling context. GetExternalObjects is a cmGeneratorTarget method to access the source files classified as external objects. Yes. My intention was to make GetExternalObjects 'the way' to get the objects (without distinction) by evaluating TARGET_OBJECTS in cmGeneratorExpressionEvaluator. Xcode does it's own thing entirely. Hmm, that is true for VS 10 also. All those generators still have their own loops to classify sources. They will have to be refactored to use cmGeneratorTarget. Note that the IDE generators also need to deal with source groups. Can you do this? I'm not familiar enough with the generators or the IDEs themselves. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] External objects with IDE generators
On 02/27/2014 11:20 AM, Stephen Kelly wrote: Why do we have to distinguish them? I'm trying to not distinguish them. I meant to distinguish the existing concepts in this discussion. Hmm, that is true for VS 10 also. All those generators still have their own loops to classify sources. They will have to be refactored to use cmGeneratorTarget. Note that the IDE generators also need to deal with source groups. Can you do this? I'm not familiar enough with the generators or the IDEs themselves. I might be able to look at it but I can't promise it will be soon. -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] Watcom import library fails if no symbols in the DLL
I was recently communicating with openwatcom matinainers; which just
released a version 2.0 fork on sourceforge... but the issue was
basically... if I have a shared library with no exports, it fails to build.
I used to use a method...(and this is how cmake does it)
wlink (...) # build library
wlib (...) # build import library from wlink output
but doing it this way if the .dll has no exports, wlib results in an error,
and faults the build.
I was informed that the correct way is to build the import library during
the wlink step using 'option implib[=libname]'
I was able to successfully modify
./share/cmake-2.8/Modules/Platform/Windows-wcl386.cmake
** remove at line 42
#set(CMAKE_C_CREATE_IMPORT_LIBRARY
# wlib -c -q -n -b TARGET_IMPLIB +'TARGET_UNQUOTED')
#set(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
#
** modify line 69 (65 if 4 lines deleted)
wlink ${CMAKE_START_TEMP_FILE} system nt_dll ${CMAKE_WLINK_QUIET} name
'TARGET_UNQUOTED' LINK_FLAGS option caseexact file {OBJECTS}
LINK_LIBRARIES ${CMAKE_END_TEMP_FILE})
to include option implib=TARGET_IMPLIB
wlink ${CMAKE_START_TEMP_FILE} system nt_dll ${CMAKE_WLINK_QUIET} name
'TARGET_UNQUOTED' LINK_FLAGS option implib=TARGET_IMPLIB option
caseexact file {OBJECTS} LINK_LIBRARIES ${CMAKE_END_TEMP_FILE})
and then the next line...
set(CMAKE_CXX_CREATE_SHARED_LIBRARY
${CMAKE_CXX_CREATE_SHARED_MODULE}
${CMAKE_CXX_CREATE_IMPORT_LIBRARY})
Includes a reference to the IMPORT_LIBRARY symbol removed before so that
can be removed.
Please update this for the future
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0014778]: Allow IMPORTED target in target_include_directories
The following issue has been SUBMITTED.
==
http://public.kitware.com/Bug/view.php?id=14778
==
Reported By:A. Klitzing
Assigned To:
==
Project:CMake
Issue ID: 14778
Category: CMake
Reproducibility:always
Severity: feature
Priority: normal
Status: new
==
Date Submitted: 2014-02-28 02:40 EST
Last Modified: 2014-02-28 02:40 EST
==
Summary:Allow IMPORTED target in target_include_directories
Description:
I'm using cmake 2.8.12 and qt 5.2.1 and I have some artifacts that should be
build as an OBJECT LIBRARY. But cmake and the new IMPORTED TARGETs way does not
allow me to do it.
There should be a way to add all needed compile stuff to OBJECT LIBRARIES like
the new IMPORTED TARGET feature. Intuitional I would use an IMPORTED target in
target_include_directories.
Steps to Reproduce:
FILE(GLOB_RECURSE FILES *.cpp)
ADD_LIBRARY(Example OBJECT ${FILES})
TARGET_LINK_LIBRARIES(Example Qt5::Core)
Error: Object library target Example may not link to anything.
Of course I don't need to link libraries to that OBJECT LIBRARY. But I need
INCLUDES, DEFINITIONS and so on for the compilation because the artifacts uses
qt.
Additional Information:
https://bugreports.qt-project.org/browse/QTBUG-37105
==
Issue History
Date ModifiedUsername FieldChange
==
2014-02-28 02:40 A. KlitzingNew Issue
==
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] Xcode cannot open generated project
Hi I am using cmake 2.8.12.2 on MacOSX 10.9 for managing C/C++ code. Targets are 2 shared libraries and a command line binary, while external libraries are boost and fuse. However, when using Xcode generator I am unable to open the generated project. Using Makefile generator works fine, but I have to debug from command line. Are there any known issues with Xcode generator ? regards Bogdan C. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Xcode cannot open generated project
You can search the bug tracker http://public.kitware.com/Bug for known CMake bugs related to Xcode... I don't recall anything like this being reported recently. What version of Xcode? What error message do you get when trying to open the project with Xcode? D -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Xcode cannot open generated project
On 27 Feb 2014, at 12:15, David Cole dlrd...@aol.com wrote: What version of Xcode? xcode 5.0.2 What error message do you get when trying to open the project with Xcode? The error says that ’the project file cannot be parsed'-- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Xcode cannot open generated project
Anybody else out there using Xcode 5.0.2 with CMake yet? Perhaps open a bug report, and attach the generated Xcode project files. Or send a minimal CMakeLists.txt file that reproduces the problem. Does it happen with the very simplest CMakeLists file? (For example, the one from the tutorial test in the CMake test suite?) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Xcode cannot open generated project
On Thu, 27 Feb 2014 09:35:09 -0500, David Cole said: Anybody else out there using Xcode 5.0.2 with CMake yet? This dashboard of mine is using Xcode 5.0.2 under OS X 10.9: http://open.cdash.org/buildSummary.php?buildid=3234853 It's basically green. Cheers, -- Sean McBride, B. Eng s...@rogue-research.com Rogue Researchwww.rogue-research.com Mac Software Developer Montréal, Québec, Canada -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Xcode cannot open generated project
On Thu, Feb 27, 2014, at 06:35 AM, David Cole wrote: Anybody else out there using Xcode 5.0.2 with CMake yet? Yes, I'm using LLVM's CMake-generated xcodeproj with Xcode 5.0.2. But I haven't tried regenerating the xcodeproj since upgrading. --Kyle Sluder -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1801-gb8ebeea
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 b8ebeeaa7d8adeaaf7e207595fc882b207545966 (commit)
via ac42bca8330e0501d2fbf80dbe6d4d93234ba0c0 (commit)
via c50325b8e55e55306fbf8bca38128303b82a51a9 (commit)
from 18210400c7c76a2f4f0b7cefa8ead43938144109 (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=b8ebeeaa7d8adeaaf7e207595fc882b207545966
commit b8ebeeaa7d8adeaaf7e207595fc882b207545966
Merge: 1821040 ac42bca
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 08:55:09 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 08:55:09 2014 -0500
Merge topic 'FindGTest-AUTO-SOURCES' into next
ac42bca8 Help: Add FindGTest-AUTO-SOURCES topic release notes
c50325b8 FindGTest: Optionally detect sources automatically (#14775)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac42bca8330e0501d2fbf80dbe6d4d93234ba0c0
commit ac42bca8330e0501d2fbf80dbe6d4d93234ba0c0
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 08:54:13 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 08:54:13 2014 -0500
Help: Add FindGTest-AUTO-SOURCES topic release notes
diff --git a/Help/release/dev/FindGTest-AUTO-SOURCES.rst
b/Help/release/dev/FindGTest-AUTO-SOURCES.rst
new file mode 100644
index 000..17b2a1b
--- /dev/null
+++ b/Help/release/dev/FindGTest-AUTO-SOURCES.rst
@@ -0,0 +1,7 @@
+FindGTest-AUTO-SOURCES
+--
+
+* The :module:`FindGTest` module ``gtest_add_tests`` macro learned
+ a new ``AUTO`` option to automatically read the :prop_tgt:`SOURCES`
+ target property of the test executable and scan the source files
+ for tests to be added.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50325b8e55e55306fbf8bca38128303b82a51a9
commit c50325b8e55e55306fbf8bca38128303b82a51a9
Author: Nikolay Orliuk virk...@gmail.com
AuthorDate: Wed Feb 26 14:47:38 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 08:52:18 2014 -0500
FindGTest: Optionally detect sources automatically (#14775)
Teach GTEST_ADD_TESTS an AUTO option to read the source files from the
SOURCES target property of an executable.
diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index c00a750..aa3c235 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -79,7 +79,7 @@
# extra_args = Pass a list of extra arguments to be passed to
# executable enclosed in quotes (or for none)
# ARGN = A list of source files to search for tests test
-# fixtures.
+# fixtures. Or AUTO to find them from executable target.
#
#
#
@@ -88,7 +88,7 @@
# Example:
# set(FooTestArgs --foo 1 --bar 2)
# add_executable(FooTest FooUnitTest.cc)
-# GTEST_ADD_TESTS(FooTest ${FooTestArgs} FooUnitTest.cc)
+# GTEST_ADD_TESTS(FooTest ${FooTestArgs} AUTO)
#=
# Copyright 2009 Kitware, Inc.
@@ -111,6 +111,10 @@ function(GTEST_ADD_TESTS executable extra_args)
if(NOT ARGN)
message(FATAL_ERROR Missing ARGN: Read the documentation for
GTEST_ADD_TESTS)
endif()
+if(ARGN STREQUAL AUTO)
+# obtain sources used for building that executable
+get_property(ARGN TARGET ${executable} PROPERTY SOURCES)
+endif()
foreach(source ${ARGN})
file(READ ${source} contents)
string(REGEX MATCHALL TEST_?F?\\(([A-Za-z_0-9 ,]+)\\) found_tests
${contents})
---
Summary of changes:
Help/release/dev/FindGTest-AUTO-SOURCES.rst |7 +++
Modules/FindGTest.cmake |8 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/FindGTest-AUTO-SOURCES.rst
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1803-gd430024
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 d430024891b6a83af7b71cc2a32e028b02f15079 (commit) via 02a74a7d9f7bd7f8abc789c980a2ecca16471b51 (commit) from b8ebeeaa7d8adeaaf7e207595fc882b207545966 (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=d430024891b6a83af7b71cc2a32e028b02f15079 commit d430024891b6a83af7b71cc2a32e028b02f15079 Merge: b8ebeea 02a74a7 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Feb 27 09:05:02 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Feb 27 09:05:02 2014 -0500 Merge topic 'FindHg-add-WC_INFO' into next 02a74a7d Help: Add FindHg-WC_INFO topic release notes http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02a74a7d9f7bd7f8abc789c980a2ecca16471b51 commit 02a74a7d9f7bd7f8abc789c980a2ecca16471b51 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Feb 27 09:03:32 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Feb 27 09:03:32 2014 -0500 Help: Add FindHg-WC_INFO topic release notes diff --git a/Help/release/dev/FindHg-WC_INFO.rst b/Help/release/dev/FindHg-WC_INFO.rst new file mode 100644 index 000..0caf2b3 --- /dev/null +++ b/Help/release/dev/FindHg-WC_INFO.rst @@ -0,0 +1,5 @@ +FindHg-WC_INFO +-- + +* The :module:`FindHg` module gained a new ``Hg_WC_INFO`` macro to + help run ``hg`` to extract information about a Mercurial work copy. --- Summary of changes: Help/release/dev/FindHg-WC_INFO.rst |5 + 1 file changed, 5 insertions(+) create mode 100644 Help/release/dev/FindHg-WC_INFO.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1805-g646c444
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 646c444359faccd06b897b5745b79f8e64e20666 (commit) via 755b378e57cf859b3dc28db004b8596e44d07175 (commit) from d430024891b6a83af7b71cc2a32e028b02f15079 (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=646c444359faccd06b897b5745b79f8e64e20666 commit 646c444359faccd06b897b5745b79f8e64e20666 Merge: d430024 755b378 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Feb 27 09:08:32 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Feb 27 09:08:32 2014 -0500 Merge topic 'ExternalProject-BUILD_ALWAYS' into next 755b378e Help: Add ExternalProject-BUILD_ALWAYS topic release notes http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=755b378e57cf859b3dc28db004b8596e44d07175 commit 755b378e57cf859b3dc28db004b8596e44d07175 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Feb 27 09:08:25 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Feb 27 09:09:02 2014 -0500 Help: Add ExternalProject-BUILD_ALWAYS topic release notes diff --git a/Help/release/dev/ExternalProject-BUILD_ALWAYS.rst b/Help/release/dev/ExternalProject-BUILD_ALWAYS.rst new file mode 100644 index 000..5384671 --- /dev/null +++ b/Help/release/dev/ExternalProject-BUILD_ALWAYS.rst @@ -0,0 +1,6 @@ +ExternalProject-BUILD_ALWAYS + + +* The :module:`ExternalProject` module ``ExternalProject_Add`` command + learned a new ``BUILD_ALWAYS`` option to cause the external project + build step to run every time the host project is built. --- Summary of changes: Help/release/dev/ExternalProject-BUILD_ALWAYS.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/ExternalProject-BUILD_ALWAYS.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1807-g37c294a
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 37c294a775cd2a7dc3a34553b271b1dc7738dd2d (commit) via ba0a2254802c57e3b837d1bbf0911c0719731dd1 (commit) from 646c444359faccd06b897b5745b79f8e64e20666 (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=37c294a775cd2a7dc3a34553b271b1dc7738dd2d commit 37c294a775cd2a7dc3a34553b271b1dc7738dd2d Merge: 646c444 ba0a225 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Feb 27 09:29:17 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Feb 27 09:29:17 2014 -0500 Merge topic 'dev/faster-evis' into next ba0a2254 tests: Fix RunCMake.Syntax UnterminatedBrace2 expected stderr http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba0a2254802c57e3b837d1bbf0911c0719731dd1 commit ba0a2254802c57e3b837d1bbf0911c0719731dd1 Author: Brad King brad.k...@kitware.com AuthorDate: Thu Feb 27 09:29:08 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Thu Feb 27 09:29:08 2014 -0500 tests: Fix RunCMake.Syntax UnterminatedBrace2 expected stderr diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt index 582a25e..b332d34 100644 --- a/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt +++ b/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt @@ -1,7 +1,7 @@ CMake Error at UnterminatedBrace2.cmake:4 \(set\): Syntax error in cmake code at - /home/boeckb/code/cmake/src/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake:4 +.*/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake:4 when parsing string --- Summary of changes: Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1810-g853a0e3
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 853a0e370cde10035906d6f68aacf1e13fdd2bb1 (commit)
via 0f55f2547f45090d093a6f0871b107bf1fac4458 (commit)
via 0f9dbc1608969c3b2dd7e4842e338fa5f90f0b43 (commit)
from 37c294a775cd2a7dc3a34553b271b1dc7738dd2d (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=853a0e370cde10035906d6f68aacf1e13fdd2bb1
commit 853a0e370cde10035906d6f68aacf1e13fdd2bb1
Merge: 37c294a 0f55f25
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 09:57:01 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 09:57:01 2014 -0500
Merge topic 'vs-Fortran-use-OBJECT-lib' into next
0f55f254 VS: For Intel Fortran .vfproj put OBJECT libs in link line (#14777)
0f9dbc16 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f55f2547f45090d093a6f0871b107bf1fac4458
commit 0f55f2547f45090d093a6f0871b107bf1fac4458
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 09:53:16 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 09:53:16 2014 -0500
VS: For Intel Fortran .vfproj put OBJECT libs in link line (#14777)
The Intel Fortran .vfproj format accepts the $(Configuration) placeholder
in the path to an input file but appears to consider it always out of
date. Therefore adding OBJECT library objects as external object source
files causes the referencing binary to re-link on every build. Work
around this problem by putting OBJECT library objects on the link line
as is done for VS 8 already.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index ce24d8d..d11bf55 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1044,7 +1044,7 @@ void
cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream fout,
fout \t\t\tTool\n
\t\t\t\tName=\ tool \\n;
-if(this-GetVersion() VS8)
+if(this-GetVersion() VS8 || this-FortranProject)
{
cmOStringStream libdeps;
this-Internal-OutputObjects(libdeps, target);
@@ -1104,7 +1104,7 @@ void
cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream fout,
// libraries which may be set by the user to something bad.
fout \t\t\t\tAdditionalDependencies=\$(NOINHERIT)
this-Makefile-GetSafeDefinition(standardLibsVar.c_str());
-if(this-GetVersion() VS8)
+if(this-GetVersion() VS8 || this-FortranProject)
{
this-Internal-OutputObjects(fout, target, );
}
@@ -1202,7 +1202,7 @@ void
cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream fout,
// libraries which may be set by the user to something bad.
fout \t\t\t\tAdditionalDependencies=\$(NOINHERIT)
this-Makefile-GetSafeDefinition(standardLibsVar.c_str());
-if(this-GetVersion() VS8)
+if(this-GetVersion() VS8 || this-FortranProject)
{
this-Internal-OutputObjects(fout, target, );
}
@@ -1423,7 +1423,7 @@ void
cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream fout,
this-WriteGroup(sg, target, fout, libName, configs);
}
- if(this-GetVersion() = VS8)
+ if(this-GetVersion() = VS8 !this-FortranProject)
{
// VS = 8 support per-config source locations so we
// list object library content as external objects.
---
Summary of changes:
Source/CMakeVersion.cmake|2 +-
Source/cmLocalVisualStudio7Generator.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1812-g1c8323b
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 1c8323b3d143650ee9d0077e1ed2831db1e95d3b (commit)
via c53b5cd2215a25e0661cbaf88b22664d1ec09412 (commit)
from 853a0e370cde10035906d6f68aacf1e13fdd2bb1 (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=1c8323b3d143650ee9d0077e1ed2831db1e95d3b
commit 1c8323b3d143650ee9d0077e1ed2831db1e95d3b
Merge: 853a0e3 c53b5cd
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 10:33:37 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 10:33:37 2014 -0500
Merge topic 'FindPkgConfig-PKG_CONFIG' into next
c53b5cd2 FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c53b5cd2215a25e0661cbaf88b22664d1ec09412
commit c53b5cd2215a25e0661cbaf88b22664d1ec09412
Author: Christoph Grüninger f...@grueninger.de
AuthorDate: Wed Feb 26 20:48:18 2014 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 10:29:01 2014 -0500
FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175)
If the environment variable PKG_CONFIG is set, use this as the
default pkg-config executable.
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index e6fdefe..7179d17 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -6,6 +6,11 @@
#
#
#
+# To find the pkg-config executable, it uses the variable
+# PKG_CONFIG_EXECUTABLE or the environment variable PKG_CONFIG first.
+#
+#
+#
# Usage:
#
# ::
@@ -134,8 +139,9 @@
#pkg_search_module (BAR libxml-2.0 libxml2 libxml=2)
#=
-# Copyright 2006-2009 Kitware, Inc.
-# Copyright 2006 Enrico Scholz enrico.sch...@informatik.tu-chemnitz.de
+# Copyright 2006-2014 Kitware, Inc.
+# Copyright 2014 Christoph Grüninger f...@grueninger.de
+# Copyright 2006 Enrico Scholz enrico.sch...@informatik.tu-chemnitz.de
#
# Distributed under the OSI-approved BSD License (the License);
# see accompanying file Copyright.txt for details.
@@ -150,6 +156,10 @@
### Common stuff
set(PKG_CONFIG_VERSION 1)
+# find pkg-config, use PKG_CONFIG if set
+if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT $ENV{PKG_CONFIG} STREQUAL ))
+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG} CACHE FILEPATH pkg-config
executable)
+endif()
find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC pkg-config
executable)
mark_as_advanced(PKG_CONFIG_EXECUTABLE)
---
Summary of changes:
Modules/FindPkgConfig.cmake | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1814-g8f1c50f
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 8f1c50feffe3061e14bc4ee8af5e4b24f58de0d2 (commit)
via c9ba700365e6038238c682601aa7c0159fb60cde (commit)
from 1c8323b3d143650ee9d0077e1ed2831db1e95d3b (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=8f1c50feffe3061e14bc4ee8af5e4b24f58de0d2
commit 8f1c50feffe3061e14bc4ee8af5e4b24f58de0d2
Merge: 1c8323b c9ba700
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 10:38:04 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 10:38:04 2014 -0500
Merge topic 'dev/faster-evis' into next
c9ba7003 tests: Fix RunCMake.CMP0052 test on OS X
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9ba700365e6038238c682601aa7c0159fb60cde
commit c9ba700365e6038238c682601aa7c0159fb60cde
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 10:36:45 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 10:36:45 2014 -0500
tests: Fix RunCMake.CMP0052 test on OS X
Use min req 2.8.12 instead of 3.0 because the latter causes the
-DCMAKE_POLICY_DEFAULT_CMP0025=NEW option RunCMake.cmake passes on the
command line on APPLE to go unused, and that warning breaks the expected
results. A future topic will need to convert RunCMake testing to work
with min req 3.0.
diff --git a/Tests/RunCMake/CMP0052/CMakeLists.txt
b/Tests/RunCMake/CMP0052/CMakeLists.txt
index 1c39221..667561e 100644
--- a/Tests/RunCMake/CMP0052/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0052/CMakeLists.txt
@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 2.8.12)
project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
---
Summary of changes:
Tests/RunCMake/CMP0052/CMakeLists.txt |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1816-g8c2a1f9
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 8c2a1f91d3625a3afdf667a9d7507c357059a0e1 (commit) via 50b64b4d412e067413401c188c4177339e86b72c (commit) from 8f1c50feffe3061e14bc4ee8af5e4b24f58de0d2 (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=8c2a1f91d3625a3afdf667a9d7507c357059a0e1 commit 8c2a1f91d3625a3afdf667a9d7507c357059a0e1 Merge: 8f1c50f 50b64b4 Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu Feb 27 12:43:33 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Feb 27 12:43:33 2014 -0500 Merge topic 'dev/faster-evis' into next 50b64b4d tests: Update expected output for CMP0052 tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50b64b4d412e067413401c188c4177339e86b72c commit 50b64b4d412e067413401c188c4177339e86b72c Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu Feb 27 12:42:52 2014 -0500 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Thu Feb 27 12:43:19 2014 -0500 tests: Update expected output for CMP0052 tests diff --git a/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt index acfa30a..5dcd4d7 100644 --- a/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt +++ b/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt @@ -1 +1 @@ -^--wrong--$ +--wrong-- --- Summary of changes: Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1818-gb18cb5a
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 b18cb5acb5b1a094e46457514f7bf02cb3b9b735 (commit)
via 6b47af939d49c22178f7e841bbaaea73aae1ed25 (commit)
from 8c2a1f91d3625a3afdf667a9d7507c357059a0e1 (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=b18cb5acb5b1a094e46457514f7bf02cb3b9b735
commit b18cb5acb5b1a094e46457514f7bf02cb3b9b735
Merge: 8c2a1f9 6b47af9
Author: Matt McCormick matt.mccorm...@kitware.com
AuthorDate: Thu Feb 27 13:04:15 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 13:04:15 2014 -0500
Merge topic 'different-python-header-libs-exe-0013794' into next
6b47af93 BUG: Find consistent Python interp, headers, libs #0013794
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b47af939d49c22178f7e841bbaaea73aae1ed25
commit 6b47af939d49c22178f7e841bbaaea73aae1ed25
Author: Matt McCormick matt.mccorm...@kitware.com
AuthorDate: Wed Feb 26 21:47:20 2014 -0500
Commit: Matt McCormick matt.mccorm...@kitware.com
CommitDate: Thu Feb 27 11:36:46 2014 -0500
BUG: Find consistent Python interp, headers, libs #0013794
When possible, get consistent version of the Python interpreter, headers
path,
and library.
find_package(PythonLibs) internally calls find_package(PythonInterp QUIET)
and
uses the resulting PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR to prefer
these versions when looking for the header path and library.
The Python_ADDITIONAL_VERSIONS variable has priority over the interpreter
version.
Co-authored-by: Adam Wolf
Co-authored-by: Gert Wollny gw.foss...@gmail.com
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 0749efc..27d9e45 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -80,10 +80,15 @@ endif()
# Set up the versions we know about, in the order we will search. Always add
# the user supplied additional versions to the front.
-set(_Python_VERSIONS
- ${Python_ADDITIONAL_VERSIONS}
- ${_PYTHON_FIND_OTHER_VERSIONS}
- )
+# If FindPythonInterp has already found the major and minor version,
+# insert that version between the user supplied versions and the stock
+# version list.
+find_package(PythonInterp QUIET)
+set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
+if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
+ list(APPEND _Python_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+endif()
+list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
unset(_PYTHON_FIND_OTHER_VERSIONS)
unset(_PYTHON1_VERSIONS)
---
Summary of changes:
Modules/FindPythonLibs.cmake | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1820-gd2042f7
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 d2042f77d15d238d3a27d466a97b58fb76869b3f (commit)
via 7cd239ed38b2951e7fdd506d24a3f8e723e95b5f (commit)
from b18cb5acb5b1a094e46457514f7bf02cb3b9b735 (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=d2042f77d15d238d3a27d466a97b58fb76869b3f
commit d2042f77d15d238d3a27d466a97b58fb76869b3f
Merge: b18cb5a 7cd239e
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 13:26:02 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 13:26:02 2014 -0500
Merge topic 'tests-RunCMake-no-unused' into next
7cd239ed Tests/RunCMake: Tell cmake not to report unused command-line
options
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cd239ed38b2951e7fdd506d24a3f8e723e95b5f
commit 7cd239ed38b2951e7fdd506d24a3f8e723e95b5f
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 13:22:58 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 13:25:23 2014 -0500
Tests/RunCMake: Tell cmake not to report unused command-line options
On OS X we pass -DCMAKE_POLICY_DEFAULT_CMP0025=NEW to all tests.
Once tests start using cmake_minimum_required(VERSION 3.0) then
CMake will warn that CMAKE_POLICY_DEFAULT_CMP0025 is unused.
These warnings are not part of the expected test output and can
cause such tests to fail. Pass --no-warn-unused-cli to each test
cmake invocation to tell it not to produce these warnings.
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 1d1c523..ed3afc5 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -53,6 +53,7 @@ function(run_cmake test)
-G ${RunCMake_GENERATOR}
-T ${RunCMake_GENERATOR_TOOLSET}
-DRunCMake_TEST=${test}
+--no-warn-unused-cli
${RunCMake_TEST_OPTIONS}
WORKING_DIRECTORY ${RunCMake_TEST_BINARY_DIR}
OUTPUT_VARIABLE actual_stdout
---
Summary of changes:
Tests/RunCMake/RunCMake.cmake |1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1822-gffa09c3
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 ffa09c3fc70a23dcde02dafbca1ceb44b691a60a (commit)
via f0f2b21d52a0c3f1799c7747f0e7f5b52410054f (commit)
from d2042f77d15d238d3a27d466a97b58fb76869b3f (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=ffa09c3fc70a23dcde02dafbca1ceb44b691a60a
commit ffa09c3fc70a23dcde02dafbca1ceb44b691a60a
Merge: d2042f7 f0f2b21
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 13:49:14 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 13:49:14 2014 -0500
Merge topic 'release-aix-access' into next
f0f2b21d Utilities/Release: Update IBM AIX build machine access
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0f2b21d52a0c3f1799c7747f0e7f5b52410054f
commit f0f2b21d52a0c3f1799c7747f0e7f5b52410054f
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Feb 27 13:03:29 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Feb 27 13:03:29 2014 -0500
Utilities/Release: Update IBM AIX build machine access
diff --git a/Utilities/Release/create-cmake-release.cmake
b/Utilities/Release/create-cmake-release.cmake
index 95428b6..841aba5 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -10,7 +10,7 @@ set(RELEASE_SCRIPTS_BATCH_1
dashmacmini2_release.cmake # Mac Darwin universal ppc;i386
dashmacmini5_release.cmake # Mac Darwin64 universal x86_64;i386
magrathea_release.cmake # Linux
- v20n250_aix_release.cmake # AIX 5.3
+ ibm_aix_release.cmake # AIX
ferrari_sgi64_release.cmake # IRIX 64
ferrari_sgi_release.cmake # IRIX
)
diff --git a/Utilities/Release/v20n250_aix_release.cmake
b/Utilities/Release/ibm_aix_release.cmake
similarity index 62%
rename from Utilities/Release/v20n250_aix_release.cmake
rename to Utilities/Release/ibm_aix_release.cmake
index cc8cd05..5a6efe6 100644
--- a/Utilities/Release/v20n250_aix_release.cmake
+++ b/Utilities/Release/ibm_aix_release.cmake
@@ -1,8 +1,7 @@
set(CMAKE_RELEASE_DIRECTORY /bench1/noibm34/CMakeReleaseDirectory)
-set(FINAL_PATH /u/noibm34/cmake-release)
-set(PROCESSORS 2)
-set(HOST sshserv.centers.ihost.com)
-set(EXTRA_HOP rsh p90n03)
+set(PROCESSORS 64)
+set(HOST ibm-backend)
+set(SCRIPT_NAME aix)
set(MAKE_PROGRAM make)
set(CC xlc_r)
set(CXX xlC_r)
@@ -12,11 +11,5 @@ set(INITIAL_CACHE
CMAKE_BUILD_TYPE:STRING=Release
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
)
-set(EXTRA_COPY
-rm -rf ~/cmake-release
-mkdir ~/cmake-release
-mv *.sh ~/cmake-release
-mv *.Z ~/cmake-release
-mv *.gz ~/cmake-release)
get_filename_component(path ${CMAKE_CURRENT_LIST_FILE} PATH)
include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/release_cmake.cmake
b/Utilities/Release/release_cmake.cmake
index a8772ee..7a1652d 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -4,9 +4,6 @@ get_filename_component(SCRIPT_PATH ${CMAKE_CURRENT_LIST_FILE}
PATH)
if(NOT DEFINED CPACK_BINARY_GENERATORS)
set(CPACK_BINARY_GENERATORS STGZ TGZ TZ)
endif()
-if(DEFINED EXTRA_COPY)
- set(HAS_EXTRA_COPY 1)
-endif()
if(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
set(CMAKE_RELEASE_DIRECTORY ~/CMakeReleaseDirectory)
endif()
@@ -55,11 +52,11 @@ message(Creating CMake release ${CMAKE_CREATE_VERSION} on
${HOST} with parallel
macro(remote_command comment command)
message(${comment})
if(${ARGC} GREATER 2)
-message(ssh ${HOST} ${EXTRA_HOP} ${command})
-execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command}
RESULT_VARIABLE result INPUT_FILE ${ARGV2})
+message(ssh ${HOST} ${command})
+execute_process(COMMAND ssh ${HOST} ${command} RESULT_VARIABLE result
INPUT_FILE ${ARGV2})
else()
-message(ssh ${HOST} ${EXTRA_HOP} ${command})
-execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command}
RESULT_VARIABLE result)
+message(ssh ${HOST} ${command})
+execute_process(COMMAND ssh ${HOST} ${command} RESULT_VARIABLE result)
endif()
if(${result} GREATER 0)
message(FATAL_ERROR Error running command: ${command}, return value =
${result})
diff --git a/Utilities/Release/release_cmake.sh.in
b/Utilities/Release/release_cmake.sh.in
index 1f57c28..76fdb3a 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -155,11 +155,6 @@ done
-# need to add an extra copy thing here
-if [ ! -z @EXTRA_COPY@ ]; then
-@EXTRA_COPY@
-check_exit_value $? Extra copy step @EXTRA_COPY@ || exit 1
-fi
echo End release
date
echo
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1825-ga3ff0e7
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 a3ff0e7b0cc739a5308f7a0e4ebeea78e9e4fc6b (commit)
via 5c75f99533d9e00197c63e7fa348cf921c49c825 (commit)
via 47cee699ccad40cd861fdb213fc9908091b6849a (commit)
from ffa09c3fc70a23dcde02dafbca1ceb44b691a60a (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=a3ff0e7b0cc739a5308f7a0e4ebeea78e9e4fc6b
commit a3ff0e7b0cc739a5308f7a0e4ebeea78e9e4fc6b
Merge: ffa09c3 5c75f99
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Feb 27 16:31:09 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Feb 27 16:31:09 2014 -0500
Merge topic 'tests-alternative-generator' into next
5c75f995 Tests: Don't run fortran tests when using Ninja.
47cee699 Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c75f99533d9e00197c63e7fa348cf921c49c825
commit 5c75f99533d9e00197c63e7fa348cf921c49c825
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Feb 27 17:10:45 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Feb 27 17:12:43 2014 +0100
Tests: Don't run fortran tests when using Ninja.
diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake
index ebbb426..79db360 100644
--- a/Tests/CheckFortran.cmake
+++ b/Tests/CheckFortran.cmake
@@ -12,6 +12,12 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+if (CMAKE_TEST_GENERATOR STREQUAL Ninja)
+ # Ninja generator does not support Fortran.
+ unset(CMAKE_Fortran_COMPILER CACHE)
+ return()
+endif()
+
if(NOT DEFINED CMAKE_Fortran_COMPILER)
set(_desc Looking for a Fortran compiler)
message(STATUS ${_desc})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47cee699ccad40cd861fdb213fc9908091b6849a
commit 47cee699ccad40cd861fdb213fc9908091b6849a
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Feb 27 17:05:41 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Feb 27 17:05:41 2014 +0100
Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport test.
diff --git a/Tests/ExportImport/CMakeLists.txt
b/Tests/ExportImport/CMakeLists.txt
index 02a0371..77528aa 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -45,7 +45,7 @@ add_custom_command(
--build-target install
--build-generator ${CMAKE_GENERATOR}
--build-generator-toolset ${CMAKE_GENERATOR_TOOLSET}
---build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
+--build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
-DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
VERBATIM
)
add_custom_target(ExportTarget ALL DEPENDS
${ExportImport_BINARY_DIR}/ExportProject)
@@ -66,7 +66,7 @@ add_custom_command(
--build-project Import
--build-generator ${CMAKE_GENERATOR}
--build-generator-toolset ${CMAKE_GENERATOR_TOOLSET}
- --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
+ --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
-DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
VERBATIM
)
add_custom_target(ImportTarget ALL DEPENDS
${ExportImport_BINARY_DIR}/ImportProject)
---
Summary of changes:
Tests/CheckFortran.cmake |6 ++
Tests/ExportImport/CMakeLists.txt |4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1827-ga5c312b
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 a5c312be24e966f5b14367065a2e7b6109405f3a (commit) via e30915e1ff7675434a37aa6800ebb663b246b63d (commit) from a3ff0e7b0cc739a5308f7a0e4ebeea78e9e4fc6b (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=a5c312be24e966f5b14367065a2e7b6109405f3a commit a5c312be24e966f5b14367065a2e7b6109405f3a Merge: a3ff0e7 e30915e Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu Feb 27 17:15:26 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Feb 27 17:15:26 2014 -0500 Merge topic 'dev/faster-evis' into next e30915e1 Revert tests: Update expected output for CMP0052 tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e30915e1ff7675434a37aa6800ebb663b246b63d commit e30915e1ff7675434a37aa6800ebb663b246b63d Author: Ben Boeckel ben.boec...@kitware.com AuthorDate: Thu Feb 27 17:15:20 2014 -0500 Commit: Ben Boeckel ben.boec...@kitware.com CommitDate: Thu Feb 27 17:15:20 2014 -0500 Revert tests: Update expected output for CMP0052 tests This reverts commit 50b64b4d412e067413401c188c4177339e86b72c. diff --git a/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt b/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt index 5dcd4d7..acfa30a 100644 --- a/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt +++ b/Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt @@ -1 +1 @@ ---wrong-- +^--wrong--$ --- Summary of changes: Tests/RunCMake/CMP0052/CMP0052-At-OLD-stderr.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1554-ga3a178f
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 a3a178fcac3d141360da343e032ba6c40d2583ee (commit) from 0f9dbc1608969c3b2dd7e4842e338fa5f90f0b43 (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=a3a178fcac3d141360da343e032ba6c40d2583ee commit a3a178fcac3d141360da343e032ba6c40d2583ee Author: Kitware Robot kwro...@kitware.com AuthorDate: Fri Feb 28 00:01:06 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Fri Feb 28 00:01:06 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 1146f89..ccc5183 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 20140227) +set(CMake_VERSION_PATCH 20140228) #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/cgi-bin/mailman/listinfo/cmake-commits
