[Cmake-commits] CMake branch, master, updated. v2.8.8-197-gf2656e4
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 f2656e4ccb7b05cb1bef17ccf61dc9af7ed3f5fc (commit) from 4af648041dd1f5589bd117145b091fc088aee56e (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=f2656e4ccb7b05cb1bef17ccf61dc9af7ed3f5fc commit f2656e4ccb7b05cb1bef17ccf61dc9af7ed3f5fc Author: Kitware Robot AuthorDate: Tue May 22 00:01:04 2012 -0400 Commit: Kitware Robot CommitDate: Tue May 22 00:01:04 2012 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3f5edf4..c2c577e 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 8) SET(CMake_VERSION_PATCH 8) -SET(CMake_VERSION_TWEAK 20120521) +SET(CMake_VERSION_TWEAK 20120522) #SET(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.8-2908-gc3352f9
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 c3352f94791c11a47050ef26515e4d7374d2bfb8 (commit)
via c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe (commit)
via 4af648041dd1f5589bd117145b091fc088aee56e (commit)
via 4742eec96a115641033662fd1594a96cea15cef7 (commit)
via e2d71bb69354facbdd1df4d487ee897cecb9f30e (commit)
via cb37cae6918782d5bef6d30c30bee033de000372 (commit)
from e86f944d54cc9cc59732a613e2dc483b56e0e730 (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=c3352f94791c11a47050ef26515e4d7374d2bfb8
commit c3352f94791c11a47050ef26515e4d7374d2bfb8
Merge: e86f944 c9097c7
Author: Brad King
AuthorDate: Mon May 21 18:59:49 2012 -0400
Commit: CMake Topic Stage
CommitDate: Mon May 21 18:59:49 2012 -0400
Merge topic 'ExternalProject-Ninja-superbuild' into next
c9097c7 ExternalProject: Fix 'make' builds with Ninja (#13159)
4af6480 CMake Nightly Date Stamp
4742eec CMake Nightly Date Stamp
e2d71bb CMake Nightly Date Stamp
cb37cae CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe
commit c9097c74b6fdf6b457a0d1fb1c034c3e9d5fd8fe
Author: Matt McCormick
AuthorDate: Mon May 21 14:49:00 2012 -0400
Commit: Brad King
CommitDate: Mon May 21 18:57:11 2012 -0400
ExternalProject: Fix 'make' builds with Ninja (#13159)
Fix the build command when Ninja is the CMake Generator, but the
external project is created for a project that does not use CMake but
does use "make".
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0353e45..a0a9aea 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -712,8 +712,12 @@ function(_ep_get_build_command name step cmd_var)
endif()
else() # if(cfg_cmd_id STREQUAL "configure")
# Non-CMake project. Guess "make" and "make install" and "make test".
- # But use "$(MAKE)" to get recursive parallel make.
- set(cmd "$(MAKE)")
+ if("${CMAKE_GENERATOR}" MATCHES "Makefiles")
+# Try to get the parallel arguments
+set(cmd "$(MAKE)")
+ else()
+set(cmd "make")
+ endif()
if(step STREQUAL "INSTALL")
set(args install)
endif()
---
Summary of changes:
Modules/ExternalProject.cmake |8 ++--
Source/CMakeVersion.cmake |2 +-
2 files changed, 7 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.8-2902-ge86f944
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 e86f944d54cc9cc59732a613e2dc483b56e0e730 (commit)
via 113fb567b6908670faf49fd1860896b442f344b0 (commit)
from a8c7bd98847059b4ff29d7e254aa97f658c50804 (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=e86f944d54cc9cc59732a613e2dc483b56e0e730
commit e86f944d54cc9cc59732a613e2dc483b56e0e730
Merge: a8c7bd9 113fb56
Author: Stephen Kelly
AuthorDate: Mon May 21 13:06:52 2012 -0400
Commit: CMake Topic Stage
CommitDate: Mon May 21 13:06:52 2012 -0400
Merge topic 'relative-INCLUDE_DIRECTORIES' into next
113fb56 Revert "Make the INCLUDE_DIRECTORIES property relative to the
source dir by default."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=113fb567b6908670faf49fd1860896b442f344b0
commit 113fb567b6908670faf49fd1860896b442f344b0
Author: Stephen Kelly
AuthorDate: Mon May 21 19:04:42 2012 +0200
Commit: Stephen Kelly
CommitDate: Mon May 21 19:04:42 2012 +0200
Revert "Make the INCLUDE_DIRECTORIES property relative to the source dir by
default."
This reverts commit 3905129ad9bcf0147457ca26c02ba2a66125a3cf.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2c64579..4789197 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4709,13 +4709,9 @@ std::vector
cmTarget::GetIncludeDirectories()
for(std::vector::const_iterator
li = includes.begin(); li != includes.end(); ++li)
{
-// Treat relative paths as relative to the source dir.
-std::string dir = (cmSystemTools::CollapseFullPath
- (li->c_str(), this->Makefile->GetCurrentDirectory()));
-
-if(uniqueIncludes.insert(dir).second)
+if(uniqueIncludes.insert(*li).second)
{
- orderedAndUniqueIncludes.push_back(dir);
+ orderedAndUniqueIncludes.push_back(*li);
}
}
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 503f09f..2cf36f5 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -23,7 +23,4 @@ add_executable(TargetIncludeDirectories main.cpp)
set_property(TARGET TargetIncludeDirectories APPEND PROPERTY
INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/bat")
set_property(TARGET TargetIncludeDirectories APPEND PROPERTY
INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
-# Test that relative directories are relative to the source dir.
-set_property(TARGET TargetIncludeDirectories APPEND PROPERTY
INCLUDE_DIRECTORIES "source_include_dir")
-
include_directories("${CMAKE_CURRENT_BINARY_DIR}/baz")
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
index c854052..8aa3532 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
@@ -4,8 +4,6 @@
#include "foo.h"
#include "baz.h"
-#include "source_header.h"
-
int main(int, char**)
{
return 0;
diff --git
a/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
b/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
deleted file mode 100644
index 1296bcf..000
---
a/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef SOURCE_HEADER_H
-#define SOURCE_HEADER_H
-
-enum {
- non_empty_header = 10
-};
-
-#endif
---
Summary of changes:
Source/cmTarget.cxx|8 ++--
.../TargetIncludeDirectories/CMakeLists.txt|3 ---
.../TargetIncludeDirectories/main.cpp |2 --
.../source_include_dir/source_header.h |9 -
4 files changed, 2 insertions(+), 20 deletions(-)
delete mode 100644
Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
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.8-2900-ga8c7bd9
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 a8c7bd98847059b4ff29d7e254aa97f658c50804 (commit)
via 801ea70c08a15071a22149c8f8f829a34e628c6a (commit)
from 8bf185c42eafb51321a9bdb6c0c2720eaebe20b8 (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=a8c7bd98847059b4ff29d7e254aa97f658c50804
commit a8c7bd98847059b4ff29d7e254aa97f658c50804
Merge: 8bf185c 801ea70
Author: Eric Noulard
AuthorDate: Mon May 21 08:42:11 2012 -0400
Commit: CMake Topic Stage
CommitDate: Mon May 21 08:42:11 2012 -0400
Merge topic 'CPack-activateRPM-DEB-onMacOS' into next
801ea70 Calm down Borland compiler warning about "always true"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=801ea70c08a15071a22149c8f8f829a34e628c6a
commit 801ea70c08a15071a22149c8f8f829a34e628c6a
Author: Eric NOULARD
AuthorDate: Mon May 21 14:39:18 2012 +0200
Commit: Eric NOULARD
CommitDate: Mon May 21 14:39:18 2012 +0200
Calm down Borland compiler warning about "always true"
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx
b/Source/CPack/cmCPackGeneratorFactory.cxx
index dbfdbbc..37ff460 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -40,6 +40,10 @@
#include "cmCPackLog.h"
+#if defined(__BORLANDC__)
+# pragma warn -8008 /* condition is always true */
+#endif
+
//--
cmCPackGeneratorFactory::cmCPackGeneratorFactory()
{
---
Summary of changes:
Source/CPack/cmCPackGeneratorFactory.cxx |4
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
