[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1238-g9cd2ff9
Brad King
brad.king at kitware.com
Tue Jul 21 16:12:21 EDT 2015
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 9cd2ff9b8f18396b9750002a6ab4e5a1050bff60 (commit)
via 778a69573177e8d9f624f1b1f0a789aa4d8d63a3 (commit)
via 0dacae35bf40d1787860de909274eaaf6f377b1e (commit)
via a43558934e0465d6258f373efd073f91d901a54f (commit)
from f074efbf369210d7b61ec58ef48f3471b585fd95 (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=9cd2ff9b8f18396b9750002a6ab4e5a1050bff60
commit 9cd2ff9b8f18396b9750002a6ab4e5a1050bff60
Merge: f074efb 778a695
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 16:12:20 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 16:12:20 2015 -0400
Merge topic 'vs-OBJECT_DEPENDS-vcxproj' into next
778a6957 Revert "VS: Implement OBJECT_DEPENDS for VS >= 10 .vcxproj files"
0dacae35 Revert "Tests: Extend BuildDepends test to cover OBJECT_DEPENDS"
a4355893 Tests: Extend BuildDepends test to cover OBJECT_DEPENDS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=778a69573177e8d9f624f1b1f0a789aa4d8d63a3
commit 778a69573177e8d9f624f1b1f0a789aa4d8d63a3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 16:11:37 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 21 16:11:37 2015 -0400
Revert "VS: Implement OBJECT_DEPENDS for VS >= 10 .vcxproj files"
This reverts commit baf485b35ef80ef2f0c58716de02bee0c2960f5c.
According to the msbuild "CL Task" documentation:
https://msdn.microsoft.com/en-us/library/ee862477.aspx
No "AdditionalInputs" element is supported. From experiments the
dependency does not seem to do anything even though it is tolerated.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d9395e1..67d52b8 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1623,11 +1623,6 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
{
defines += cdefs;
}
- std::vector<std::string> depends;
- if (const char* deps = sf.GetProperty("OBJECT_DEPENDS"))
- {
- cmSystemTools::ExpandListArgument(deps, depends);
- }
std::string lang =
this->GlobalGenerator->GetLanguageFromExtension
(sf.GetExtension().c_str());
@@ -1688,8 +1683,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
}
// if we have flags or defines for this config then
// use them
- if(!flags.empty() || !configDefines.empty() ||
- compileAs || noWinRT || !depends.empty())
+ if(!flags.empty() || !configDefines.empty() || compileAs || noWinRT)
{
(*this->BuildFileStream ) << firstString;
firstString = ""; // only do firstString once
@@ -1717,10 +1711,6 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
clOptions.AppendFlag("DisableSpecificWarnings",
"%(DisableSpecificWarnings)");
}
- if (!depends.empty())
- {
- clOptions.AddFlag("AdditionalInputs", depends);
- }
clOptions.AddDefines(configDefines.c_str());
clOptions.SetConfiguration((*config).c_str());
clOptions.OutputAdditionalOptions(*this->BuildFileStream, " ", "");
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dacae35bf40d1787860de909274eaaf6f377b1e
commit 0dacae35bf40d1787860de909274eaaf6f377b1e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 16:11:19 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 21 16:11:19 2015 -0400
Revert "Tests: Extend BuildDepends test to cover OBJECT_DEPENDS"
This reverts commit a43558934e0465d6258f373efd073f91d901a54f.
diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt
index 57f175a..2be59b6 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -69,9 +69,6 @@ file(WRITE ${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_exe.h
"#define link_depends_no_shared_exe_value 0\n")
set(link_depends_no_shared_check_txt ${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_check.txt)
-file(WRITE ${BuildDepends_BINARY_DIR}/Project/object_depends.txt "0\n")
-set(object_depends_check_txt ${BuildDepends_BINARY_DIR}/Project/object_depends_check.txt)
-
file(WRITE ${BuildDepends_BINARY_DIR}/Project/external.in "external original\n")
file(WRITE ${BuildDepends_BINARY_DIR}/Project/multi1-in.txt "multi1-in original\n")
file(WRITE ${BuildDepends_BINARY_DIR}/Project/multi2-stamp.txt "multi2-stamp original\n")
@@ -249,8 +246,6 @@ file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot_macro_tgt.hxx
file(WRITE ${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_lib.h
"#define link_depends_no_shared_lib_value 0\n")
-file(WRITE ${BuildDepends_BINARY_DIR}/Project/object_depends.txt "1\n")
-
if(TEST_LINK_DEPENDS)
file(WRITE ${TEST_LINK_DEPENDS} "2")
endif()
@@ -364,20 +359,6 @@ else()
"Targets link_depends_no_shared_lib and link_depends_no_shared_exe not both built.")
endif()
-if(EXISTS "${object_depends_check_txt}")
- file(STRINGS "${object_depends_check_txt}" object_depends_check LIMIT_COUNT 1)
- if("${object_depends_check}" STREQUAL "1")
- message(STATUS "object_depends exe is newer than object_depends.txt as expected.")
- elseif(XCODE)
- message(STATUS "Known limitation: OBJECT_DEPENDS not implemented for Xcode.")
- else()
- message(SEND_ERROR "Project did not rebuild properly: object_depends exe is not newer than object_depends.txt.")
- endif()
-else()
- message(SEND_ERROR "Project did not rebuild properly. "
- "object_depends exe and object_depends.txt are not both present.")
-endif()
-
if(EXISTS ${BuildDepends_BINARY_DIR}/Project/external.out)
file(STRINGS ${BuildDepends_BINARY_DIR}/Project/external.out external_out)
if("${external_out}" STREQUAL "external changed")
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt
index 3aa57fc..0db39c5 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -182,15 +182,3 @@ if(TEST_MULTI3)
set_property(SOURCE multi3-real.txt multi3-dummy.txt PROPERTY SYMBOLIC 1)
add_custom_target(multi3 ALL DEPENDS multi3-real.txt)
endif()
-
-add_executable(object_depends object_depends.cxx)
-set_property(SOURCE object_depends.cxx PROPERTY OBJECT_DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/object_depends.txt)
-add_custom_target(object_depends_check ALL
- COMMAND ${CMAKE_COMMAND}
- -Dexe=$<TARGET_FILE:object_depends>
- -Dout=${CMAKE_CURRENT_BINARY_DIR}/object_depends_check.txt
- -Dtxt=${CMAKE_CURRENT_BINARY_DIR}/object_depends.txt
- -P ${CMAKE_CURRENT_SOURCE_DIR}/object_depends_check.cmake
- )
-add_dependencies(object_depends_check object_depends)
diff --git a/Tests/BuildDepends/Project/object_depends.cxx b/Tests/BuildDepends/Project/object_depends.cxx
deleted file mode 100644
index 76e8197..0000000
--- a/Tests/BuildDepends/Project/object_depends.cxx
+++ /dev/null
@@ -1 +0,0 @@
-int main() { return 0; }
diff --git a/Tests/BuildDepends/Project/object_depends_check.cmake b/Tests/BuildDepends/Project/object_depends_check.cmake
deleted file mode 100644
index e009892..0000000
--- a/Tests/BuildDepends/Project/object_depends_check.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-if(NOT EXISTS "${txt}" OR NOT EXISTS "${exe}")
- file(REMOVE "${out}")
-elseif("${exe}" IS_NEWER_THAN "${txt}")
- file(WRITE "${out}" "1\n")
-else()
- file(WRITE "${out}" "0\n")
-endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a43558934e0465d6258f373efd073f91d901a54f
commit a43558934e0465d6258f373efd073f91d901a54f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 15:54:10 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 21 15:54:25 2015 -0400
Tests: Extend BuildDepends test to cover OBJECT_DEPENDS
diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt
index 2be59b6..57f175a 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -69,6 +69,9 @@ file(WRITE ${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_exe.h
"#define link_depends_no_shared_exe_value 0\n")
set(link_depends_no_shared_check_txt ${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_check.txt)
+file(WRITE ${BuildDepends_BINARY_DIR}/Project/object_depends.txt "0\n")
+set(object_depends_check_txt ${BuildDepends_BINARY_DIR}/Project/object_depends_check.txt)
+
file(WRITE ${BuildDepends_BINARY_DIR}/Project/external.in "external original\n")
file(WRITE ${BuildDepends_BINARY_DIR}/Project/multi1-in.txt "multi1-in original\n")
file(WRITE ${BuildDepends_BINARY_DIR}/Project/multi2-stamp.txt "multi2-stamp original\n")
@@ -246,6 +249,8 @@ file(WRITE ${BuildDepends_BINARY_DIR}/Project/zot_macro_tgt.hxx
file(WRITE ${BuildDepends_BINARY_DIR}/Project/link_depends_no_shared_lib.h
"#define link_depends_no_shared_lib_value 0\n")
+file(WRITE ${BuildDepends_BINARY_DIR}/Project/object_depends.txt "1\n")
+
if(TEST_LINK_DEPENDS)
file(WRITE ${TEST_LINK_DEPENDS} "2")
endif()
@@ -359,6 +364,20 @@ else()
"Targets link_depends_no_shared_lib and link_depends_no_shared_exe not both built.")
endif()
+if(EXISTS "${object_depends_check_txt}")
+ file(STRINGS "${object_depends_check_txt}" object_depends_check LIMIT_COUNT 1)
+ if("${object_depends_check}" STREQUAL "1")
+ message(STATUS "object_depends exe is newer than object_depends.txt as expected.")
+ elseif(XCODE)
+ message(STATUS "Known limitation: OBJECT_DEPENDS not implemented for Xcode.")
+ else()
+ message(SEND_ERROR "Project did not rebuild properly: object_depends exe is not newer than object_depends.txt.")
+ endif()
+else()
+ message(SEND_ERROR "Project did not rebuild properly. "
+ "object_depends exe and object_depends.txt are not both present.")
+endif()
+
if(EXISTS ${BuildDepends_BINARY_DIR}/Project/external.out)
file(STRINGS ${BuildDepends_BINARY_DIR}/Project/external.out external_out)
if("${external_out}" STREQUAL "external changed")
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt
index 0db39c5..3aa57fc 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -182,3 +182,15 @@ if(TEST_MULTI3)
set_property(SOURCE multi3-real.txt multi3-dummy.txt PROPERTY SYMBOLIC 1)
add_custom_target(multi3 ALL DEPENDS multi3-real.txt)
endif()
+
+add_executable(object_depends object_depends.cxx)
+set_property(SOURCE object_depends.cxx PROPERTY OBJECT_DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/object_depends.txt)
+add_custom_target(object_depends_check ALL
+ COMMAND ${CMAKE_COMMAND}
+ -Dexe=$<TARGET_FILE:object_depends>
+ -Dout=${CMAKE_CURRENT_BINARY_DIR}/object_depends_check.txt
+ -Dtxt=${CMAKE_CURRENT_BINARY_DIR}/object_depends.txt
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/object_depends_check.cmake
+ )
+add_dependencies(object_depends_check object_depends)
diff --git a/Tests/BuildDepends/Project/object_depends.cxx b/Tests/BuildDepends/Project/object_depends.cxx
new file mode 100644
index 0000000..76e8197
--- /dev/null
+++ b/Tests/BuildDepends/Project/object_depends.cxx
@@ -0,0 +1 @@
+int main() { return 0; }
diff --git a/Tests/BuildDepends/Project/object_depends_check.cmake b/Tests/BuildDepends/Project/object_depends_check.cmake
new file mode 100644
index 0000000..e009892
--- /dev/null
+++ b/Tests/BuildDepends/Project/object_depends_check.cmake
@@ -0,0 +1,7 @@
+if(NOT EXISTS "${txt}" OR NOT EXISTS "${exe}")
+ file(REMOVE "${out}")
+elseif("${exe}" IS_NEWER_THAN "${txt}")
+ file(WRITE "${out}" "1\n")
+else()
+ file(WRITE "${out}" "0\n")
+endif()
-----------------------------------------------------------------------
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list