[Cmake-commits] CMake branch, next, updated. v2.8.7-2751-g82c3726
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 82c3726537c24183459270355db507a638ee07e1 (commit)
via df19b9cadb5caca0f77ee87b8e28181e61c0658e (commit)
from a9dd6f0248572cc14896970b2a6d45a504a9333c (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=82c3726537c24183459270355db507a638ee07e1
commit 82c3726537c24183459270355db507a638ee07e1
Merge: a9dd6f0 df19b9c
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Feb 21 11:31:34 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 21 11:31:34 2012 -0500
Merge topic 'fix-12189-support-SBCS-in-VS' into next
df19b9c VS6: Avoid _MBCS define when _SBCS is defined (#12189)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df19b9cadb5caca0f77ee87b8e28181e61c0658e
commit df19b9cadb5caca0f77ee87b8e28181e61c0658e
Author: David Cole david.c...@kitware.com
AuthorDate: Tue Feb 21 11:29:06 2012 -0500
Commit: David Cole david.c...@kitware.com
CommitDate: Tue Feb 21 11:29:06 2012 -0500
VS6: Avoid _MBCS define when _SBCS is defined (#12189)
Should fix the failing SBCS test on the VS6 dashboard.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index 1dfcbea..fe5d48d 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1605,11 +1605,13 @@ void cmLocalVisualStudio6Generator
flagsDebugRel = this-Makefile-GetSafeDefinition(flagVar.c_str());
flagsDebugRel += -DCMAKE_INTDIR=\\\RelWithDebInfo\\\ ;
}
-
-// if unicode is not found, then add -D_MBCS
+
+// if _UNICODE and _SBCS are not found, then add -D_MBCS
std::string defs = this-Makefile-GetDefineFlags();
if(flags.find(D_UNICODE) == flags.npos
- defs.find(D_UNICODE) == flags.npos)
+ defs.find(D_UNICODE) == flags.npos
+ flags.find(D_SBCS) == flags.npos
+ defs.find(D_SBCS) == flags.npos)
{
flags += /D \_MBCS\;
}
---
Summary of changes:
Source/cmLocalVisualStudio6Generator.cxx |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2756-g63152d0
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 63152d002f40c9426845246aef04636ce416e72c (commit)
via 35c48e12706f9426eda43b3b077925a2fab0df44 (commit)
via 61cb4ea72e608370b581bae9d9810ca6ae8f84d0 (commit)
via c9f2886b3db9783eaa455c21288eabdc7e6366a1 (commit)
via 628f36514070037dd3dc4f09c61c4df8688e3a2b (commit)
from 82c3726537c24183459270355db507a638ee07e1 (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=63152d002f40c9426845246aef04636ce416e72c
commit 63152d002f40c9426845246aef04636ce416e72c
Merge: 82c3726 35c48e1
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 21 15:45:33 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 21 15:45:33 2012 -0500
Merge topic 'HandleTargetsInCMakeRequiredLibraries' into next
35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES
61cb4ea bootstrap: move while() and endwhile() into the bootstrap build
c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being
built
628f365 -remove trailing whitespace
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35c48e12706f9426eda43b3b077925a2fab0df44
commit 35c48e12706f9426eda43b3b077925a2fab0df44
Author: Alex Neundorf neund...@kde.org
AuthorDate: Thu Feb 16 23:35:43 2012 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Feb 21 15:38:15 2012 -0500
Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES
Add the function cmake_expand_imported_targets() to expand imported
targets in a list of libraries into their on-disk file names for a
particular configuration. Adapt the implementation from KDE's
HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES which has been in
use for over 2 years. Call the function from all the Check*.cmake
macros to handle imported targets named in CMAKE_REQUIRED_LIBRARIES.
Alex
diff --git a/Modules/CMakeExpandImportedTargets.cmake
b/Modules/CMakeExpandImportedTargets.cmake
new file mode 100644
index 000..fba071a
--- /dev/null
+++ b/Modules/CMakeExpandImportedTargets.cmake
@@ -0,0 +1,129 @@
+# CMAKE_EXPAND_IMPORTED_TARGETS(var LIBRARIES lib1 lib2...libN
+# [CONFIGURATION config] )
+#
+# CMAKE_EXPAND_IMPORTED_TARGETS() takes a list of libraries and replaces
+# all imported targets contained in this list with their actual file paths
+# of the referenced libraries on disk, including the libraries from their
+# link interfaces.
+# If a CONFIGURATION is given, it uses the respective configuration of the
+# imported targets if it exists. If no CONFIGURATION is given, it uses
+# the first configuration from ${CMAKE_CONFIGURATION_TYPES} if set, otherwise
+# ${CMAKE_BUILD_TYPE}.
+# This macro is used by all Check*.cmake files which use
+# TRY_COMPILE() or TRY_RUN() and support CMAKE_REQUIRED_LIBRARIES , so that
+# these checks support imported targets in CMAKE_REQUIRED_LIBRARIES:
+#cmake_expand_imported_targets(expandedLibs LIBRARIES
${CMAKE_REQUIRED_LIBRARIES}
+# CONFIGURATION
${CMAKE_TRY_COMPILE_CONFIGURATION} )
+
+
+#=
+# Copyright 2012 Kitware, Inc.
+# Copyright 2009-2012 Alexander Neundorf neund...@kde.org
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+include(CMakeParseArguments)
+
+function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT )
+
+ set(options )
+ set(oneValueArgs CONFIGURATION )
+ set(multiValueArgs LIBRARIES )
+
+ cmake_parse_arguments(CEIT ${options} ${oneValueArgs}
${multiValueArgs} ${ARGN})
+
+ if(CEIT_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR Unknown keywords given to
CMAKE_EXPAND_IMPORTED_TARGETS(): \${CEIT_UNPARSED_ARGUMENTS}\)
+ endif()
+
+ if(NOT CEIT_CONFIGURATION)
+ if(CMAKE_CONFIGURATION_TYPES)
+ list(GET CMAKE_CONFIGURATION_TYPES 0 CEIT_CONFIGURATION)
+ else()
+ set(CEIT_CONFIGURATION ${CMAKE_BUILD_TYPE})
+ endif()
+ endif()
+
+ # handle imported library targets
+
+ set(_CCSR_REQ_LIBS ${CEIT_LIBRARIES})
+
+
[Cmake-commits] CMake branch, next, updated. v2.8.7-2762-gae376fb
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 ae376fb0a499baf6e758ebfd1b71104069da700f (commit)
via 810edef9d66bee2001d01ad34de90059f2f5d160 (commit)
via 1f581c860dded4bcdc0a7dffa9f7e2d3ec25ac68 (commit)
via 0793a28b1aa5d332eecfb90242ee5db8d032031c (commit)
via fffdbc1b871805ab617fd3de475477672ce5a4fa (commit)
via cffebe643c9002ee3411c8f293abdf7c23fc622c (commit)
from 63152d002f40c9426845246aef04636ce416e72c (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=ae376fb0a499baf6e758ebfd1b71104069da700f
commit ae376fb0a499baf6e758ebfd1b71104069da700f
Merge: 63152d0 810edef
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Tue Feb 21 15:46:25 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 21 15:46:25 2012 -0500
Merge topic 'improve-findpythonlibs' into next
810edef FindPythonLibs: put debug libraries into PYTHON_LIBRARIES
1f581c8 FindPythonLibs: get the exact version of the found library (#3080)
0793a28 FindPythonLibs: make the version selection work as for PythonInterp
fffdbc1 FindPython{Interp,Libs}: document Python_ADDITIONAL_VERSIONS as
input
cffebe6 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=810edef9d66bee2001d01ad34de90059f2f5d160
commit 810edef9d66bee2001d01ad34de90059f2f5d160
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Tue Feb 21 21:40:02 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Tue Feb 21 21:44:47 2012 +0100
FindPythonLibs: put debug libraries into PYTHON_LIBRARIES
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 9401dbb..6360d53 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -7,7 +7,7 @@
# PYTHON_LIBRARIES - path to the python library
# PYTHON_INCLUDE_PATH- path to where Python.h is found (deprecated)
# PYTHON_INCLUDE_DIRS- path to where Python.h is found
-# PYTHON_DEBUG_LIBRARIES - path to the debug library
+# PYTHON_DEBUG_LIBRARIES - path to the debug library (deprecated)
# PYTHONLIBS_VERSION_STRING - version of the Python libs found (since CMake
2.8.8)
#
# The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
@@ -148,9 +148,14 @@ MARK_AS_ADVANCED(
# library. We now set the variables listed by the documentation for this
# module.
SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
-SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
SET(PYTHON_DEBUG_LIBRARIES ${PYTHON_DEBUG_LIBRARY})
+# These variables have been historically named in this module different from
+# what SELECT_LIBRARY_CONFIGURATIONS() expects.
+SET(PYTHON_LIBRARY_DEBUG ${PYTHON_DEBUG_LIBRARY})
+SET(PYTHON_LIBRARY_RELEASE ${PYTHON_LIBRARY})
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+SELECT_LIBRARY_CONFIGURATIONS(PYTHON)
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f581c860dded4bcdc0a7dffa9f7e2d3ec25ac68
commit 1f581c860dded4bcdc0a7dffa9f7e2d3ec25ac68
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Tue Feb 21 21:12:16 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Tue Feb 21 21:44:41 2012 +0100
FindPythonLibs: get the exact version of the found library (#3080)
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 8ba2d39..9401dbb 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -8,6 +8,7 @@
# PYTHON_INCLUDE_PATH- path to where Python.h is found (deprecated)
# PYTHON_INCLUDE_DIRS- path to where Python.h is found
# PYTHON_DEBUG_LIBRARIES - path to the debug library
+# PYTHONLIBS_VERSION_STRING - version of the Python libs found (since CMake
2.8.8)
#
# The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
# version numbers that should be taken into account when searching for Python.
@@ -126,6 +127,14 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
SET(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE_DIR} CACHE INTERNAL
Path to where Python.h is found (deprecated))
+ IF(PYTHON_INCLUDE_DIR AND EXISTS ${PYTHON_INCLUDE_DIR}/patchlevel.h)
+FILE(STRINGS ${PYTHON_INCLUDE_DIR}/patchlevel.h python_version_str
+ REGEX ^#define[ \t]+PY_VERSION[ \t]+\[^\]+\)
+STRING(REGEX REPLACE ^#define[ \t]+PY_VERSION[ \t]+\([^\]+)\.* \\1
+ PYTHONLIBS_VERSION_STRING ${python_version_str})
+UNSET(python_version_str)
+
[Cmake-commits] CMake branch, master, updated. v2.8.7-386-ge1a6c9b
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 e1a6c9b9a1affb846d997fcf19dc90dbc79b60c1 (commit) via afc75bb7f520b7405a08f24a25a42542d3e3c92f (commit) from 27431d2886ea0062fa0a024d4472dd20e8a23ea1 (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=e1a6c9b9a1affb846d997fcf19dc90dbc79b60c1 commit e1a6c9b9a1affb846d997fcf19dc90dbc79b60c1 Merge: 27431d2 afc75bb Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:53:41 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:53:41 2012 -0500 Merge topic 'link-OpenBSD-shared-libs-issue-12954' afc75bb Recognize OpenBSD versioned .so names (#12954) --- Summary of changes: Source/cmComputeLinkInformation.cxx | 14 +- Source/cmComputeLinkInformation.h |1 + 2 files changed, 14 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-388-gd84233a
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 d84233a70dea19b5188700c63c2b1164c97cf8fe (commit) via 10dfec3bb63a8f6552c1d343b6cad245e6b1abdf (commit) from e1a6c9b9a1affb846d997fcf19dc90dbc79b60c1 (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=d84233a70dea19b5188700c63c2b1164c97cf8fe commit d84233a70dea19b5188700c63c2b1164c97cf8fe Merge: e1a6c9b 10dfec3 Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:53:50 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:53:50 2012 -0500 Merge topic 'findperllibs-windows' 10dfec3 FindPerlLibs: properly detect libperl on Windows (#12224) --- Summary of changes: Modules/FindPerlLibs.cmake | 54 ++- 1 files changed, 23 insertions(+), 31 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-394-ge17f270
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 e17f270b7acdfc5e6cfd3179a9f48da53a258996 (commit) via 14dadbde809d5091de44ef880376f69f6be2e23e (commit) from cee42a73e8809ffb0bd877a121d0c042530f8018 (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=e17f270b7acdfc5e6cfd3179a9f48da53a258996 commit e17f270b7acdfc5e6cfd3179a9f48da53a258996 Merge: cee42a7 14dadbd Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:54:19 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:54:19 2012 -0500 Merge topic 'improve-findglut' 14dadbd FindGLUT: honor REQUIRED (#12466) --- Summary of changes: Modules/FindGLUT.cmake | 34 -- 1 files changed, 16 insertions(+), 18 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-406-g7023f61
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 7023f610d4aab3f37197e829a3ba07bc4c30a502 (commit) via 854e76237ce3e8f03d9cabcad1f8f37e04992ad3 (commit) from d39acfa10585e0e671ff6bb7109a4a1f8d917f2a (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=7023f610d4aab3f37197e829a3ba07bc4c30a502 commit 7023f610d4aab3f37197e829a3ba07bc4c30a502 Merge: d39acfa 854e762 Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:55:26 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:55:26 2012 -0500 Merge topic 'improve-findruby' 854e762 FindRuby: clean up querying variables from Ruby --- Summary of changes: Modules/FindRuby.cmake | 57 +-- 1 files changed, 26 insertions(+), 31 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-408-g40d2da0
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 40d2da09c5d2b8659119da31b2f3d43acef3df6b (commit) via 70697a85a0bd273c0b1773471b7ae11b2c7ceb57 (commit) from 7023f610d4aab3f37197e829a3ba07bc4c30a502 (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=40d2da09c5d2b8659119da31b2f3d43acef3df6b commit 40d2da09c5d2b8659119da31b2f3d43acef3df6b Merge: 7023f61 70697a8 Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:55:34 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:55:34 2012 -0500 Merge topic 'improve-findlibxslt' 70697a8 FindLibXslt: support version selection --- Summary of changes: Modules/FindLibXslt.cmake | 18 +++--- 1 files changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-410-gae61602
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 ae616023855d4e3772faa424fbf9970143a66b63 (commit) via 378f2291593c5b1d7d9fcd03029b931ce674a3d2 (commit) from 40d2da09c5d2b8659119da31b2f3d43acef3df6b (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=ae616023855d4e3772faa424fbf9970143a66b63 commit ae616023855d4e3772faa424fbf9970143a66b63 Merge: 40d2da0 378f229 Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:55:50 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:55:50 2012 -0500 Merge topic 'document-test-layout' 378f229 Tests: document where to put tests --- Summary of changes: Tests/README | 34 ++ 1 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 Tests/README 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.7-426-g6c6c266
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 6c6c2664394d9542cf611b7941c0f45cffd1e108 (commit) via 54e1f6f5a572e47c5598fd53e3b9eb0a66739def (commit) from 09c16ca4883db2fff9b3138e348db6bd0560c4cb (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=6c6c2664394d9542cf611b7941c0f45cffd1e108 commit 6c6c2664394d9542cf611b7941c0f45cffd1e108 Merge: 09c16ca 54e1f6f Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:57:02 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:57:02 2012 -0500 Merge topic 'GenerateExportHeader_MinorFix' 54e1f6f GenerateExportHeader: use double quotes around _gcc_version --- Summary of changes: Modules/GenerateExportHeader.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-436-g7d02020
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 7d02020d682018a541b10460b28d6a8d0ef9bcf3 (commit) via 9a8103e929de7569fd2e5459a6676dff64d88892 (commit) via 4da2223ab768e44b7ef6e789ab193ea54c9b5e27 (commit) via cfac874b7783a5c464334bfc13d969a667f1c397 (commit) via dee0a38648195786bae0abce437ef4617ea0912e (commit) via b4abcfecbe281373fd3c28adccf4c3002b7909c4 (commit) via 9717727d5fa29a993b22b9437e67cc28d8eaf52c (commit) via 7a8f44a2d6d23ec0345a1413f3a79c21f9566456 (commit) via b8a274c091b63e6203b61f5aee40393d1409c9fc (commit) via a6bce55aefd332f148a2753d5be0ec4383534473 (commit) from 6c6c2664394d9542cf611b7941c0f45cffd1e108 (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=7d02020d682018a541b10460b28d6a8d0ef9bcf3 commit 7d02020d682018a541b10460b28d6a8d0ef9bcf3 Merge: 6c6c266 9a8103e Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:57:17 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:57:17 2012 -0500 Merge topic 'CPack-dynamicDocSection' 9a8103e Try to fix compile error on Win32-vs70 4da2223 Fix typo in end markup cfac874 More documentation concerning CPack Components dee0a38 Put CPack DMG and PackageMaker doc in separate files b4abcfe Correct copy/paste section name mistake 9717727 Suppress unecessary (now empty) doc sections 7a8f44a Add structure documentation for CPack Bundle generator b8a274c Add structured documentation for NSIS a6bce55 Dynamically add documentation section specified in documented script. --- Summary of changes: Modules/CPack.cmake | 55 -- Modules/CPackBundle.cmake | 12 +++ Modules/CPackComponent.cmake| 47 +- Modules/CPackDMG.cmake | 70 +++ Modules/CPackDeb.cmake |2 +- Modules/CPackNSIS.cmake | 42 +++ Modules/CPackPackageMaker.cmake | 34 +++ Modules/CPackRPM.cmake |2 +- Source/CPack/cpack.cxx |3 +- Source/cmDocumentation.cxx | 24 ++--- Source/cmDocumentation.h|6 ++- 11 files changed, 230 insertions(+), 67 deletions(-) create mode 100644 Modules/CPackDMG.cmake create mode 100644 Modules/CPackPackageMaker.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-443-gbf65600
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 bf6560091d2d3cc2c57852d414580643036a1974 (commit) via f5066217db3911754006ae64e2a9001382ff66e1 (commit) from 0c00c179380ea5c6d8507249329551b1c63ac91b (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=bf6560091d2d3cc2c57852d414580643036a1974 commit bf6560091d2d3cc2c57852d414580643036a1974 Merge: 0c00c17 f506621 Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:58:06 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:58:06 2012 -0500 Merge topic 'qt3-find-qtmain' f506621 Fix paths/hints for finding qtmain. --- Summary of changes: Modules/FindQt3.cmake |5 - 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-448-g8ef15df
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 8ef15df7000bc514b941f04784bccb340f9638b4 (commit) via 35c48e12706f9426eda43b3b077925a2fab0df44 (commit) via 61cb4ea72e608370b581bae9d9810ca6ae8f84d0 (commit) via c9f2886b3db9783eaa455c21288eabdc7e6366a1 (commit) via 628f36514070037dd3dc4f09c61c4df8688e3a2b (commit) from bf6560091d2d3cc2c57852d414580643036a1974 (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=8ef15df7000bc514b941f04784bccb340f9638b4 commit 8ef15df7000bc514b941f04784bccb340f9638b4 Merge: bf65600 35c48e1 Author: David Cole david.c...@kitware.com AuthorDate: Tue Feb 21 15:58:27 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 15:58:27 2012 -0500 Merge topic 'HandleTargetsInCMakeRequiredLibraries' 35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 61cb4ea bootstrap: move while() and endwhile() into the bootstrap build c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built 628f365 -remove trailing whitespace --- Summary of changes: Modules/CMakeExpandImportedTargets.cmake | 129 Modules/CheckCSourceCompiles.cmake |7 ++- Modules/CheckCSourceRuns.cmake | 13 ++- Modules/CheckCXXSourceCompiles.cmake |7 ++- Modules/CheckCXXSourceRuns.cmake | 17 +++-- Modules/CheckFortranFunctionExists.cmake | 11 ++- Modules/CheckFunctionExists.cmake | 13 ++- Modules/CheckLibraryExists.cmake | 17 +++-- Modules/CheckPrototypeDefinition.cmake |7 ++- Modules/CheckSymbolExists.cmake|7 ++- Modules/CheckTypeSize.cmake|7 ++- Modules/CheckVariableExists.cmake | 15 ++- Source/cmBootstrapCommands.cxx |8 ++- Source/cmCommands.cxx |4 - Source/cmWhileCommand.cxx | 18 ++-- Tests/ExportImport/Import/A/CMakeLists.txt | 11 +++ Utilities/cmcurl/CMakeLists.txt| 33 +++ 17 files changed, 257 insertions(+), 67 deletions(-) create mode 100644 Modules/CMakeExpandImportedTargets.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2791-g7815a15
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 7815a1531d8dc1c290ed120955eb2f83270b3e99 (commit) via 40efa4db7462312ab9b2c82e601acba0ab67ca19 (commit) from d8b6fca02b789d2d6da6df5fba901074b5b75e02 (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=7815a1531d8dc1c290ed120955eb2f83270b3e99 commit 7815a1531d8dc1c290ed120955eb2f83270b3e99 Merge: d8b6fca 40efa4d Author: Stephen Kelly steve...@gmail.com AuthorDate: Tue Feb 21 17:57:08 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Feb 21 17:57:08 2012 -0500 Merge topic 'fix-generate_export_header-docs' into next 40efa4d Fix documented function signature to match reality. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40efa4db7462312ab9b2c82e601acba0ab67ca19 commit 40efa4db7462312ab9b2c82e601acba0ab67ca19 Author: Stephen Kelly steve...@gmail.com AuthorDate: Tue Feb 21 23:54:01 2012 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Tue Feb 21 23:54:01 2012 +0100 Fix documented function signature to match reality. The function description is already correct. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index f3f61f6..0d9a3b8 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -18,7 +18,7 @@ # [PREFIX_NAME prefix_name] # ) # -# ADD_COMPILER_EXPORT_FLAGS( [FATAL_WARNINGS] ) +# ADD_COMPILER_EXPORT_FLAGS( [output_variable] ) # # By default GENERATE_EXPORT_HEADER() generates macro names in a file name # determined by the name of the library. The ADD_COMPILER_EXPORT_FLAGS function --- Summary of changes: Modules/GenerateExportHeader.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
