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 4f36d8840546f9722b223b72424d404a84eb95a5 (commit)
via b35a949bb6ce6ae5204de2cf867dac903cb71262 (commit)
via 01347954187ebccf83fc7540163f150a5f430c36 (commit)
from ada4028f25cbac073191b7e466b19281eebd9f29 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f36d8840546f9722b223b72424d404a84eb95a5
commit 4f36d8840546f9722b223b72424d404a84eb95a5
Merge: ada4028 b35a949
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sun Feb 26 10:46:56 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Feb 26 10:46:56 2017 -0500
Merge topic 'test-objlib-deps-cleanup' into next
b35a949b Tests: Change RunCMake.ObjectLibrary dependencies case to C
01347954 Tests: Fix RunCMake.ObjectLibrary dependency delay
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b35a949bb6ce6ae5204de2cf867dac903cb71262
commit b35a949bb6ce6ae5204de2cf867dac903cb71262
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sun Feb 26 10:38:39 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Sun Feb 26 10:43:32 2017 -0500
Tests: Change RunCMake.ObjectLibrary dependencies case to C
diff --git a/Tests/RunCMake/ObjectLibrary/Dependencies.cmake
b/Tests/RunCMake/ObjectLibrary/Dependencies.cmake
index 4e3db5f..6ddf545 100644
--- a/Tests/RunCMake/ObjectLibrary/Dependencies.cmake
+++ b/Tests/RunCMake/ObjectLibrary/Dependencies.cmake
@@ -1,10 +1,6 @@
-cmake_minimum_required(VERSION 3.7)
-
-project(Dependencies)
-
-add_library(myobj OBJECT ${CMAKE_BINARY_DIR}/depends_obj.cpp)
-add_library(mylib STATIC $<TARGET_OBJECTS:myobj> depends_lib.cpp)
-add_executable(myexe depends_main.cpp)
+add_library(myobj OBJECT ${CMAKE_BINARY_DIR}/depends_obj.c)
+add_library(mylib STATIC $<TARGET_OBJECTS:myobj> depends_lib.c)
+add_executable(myexe depends_main.c)
target_link_libraries(myexe mylib)
enable_testing()
diff --git a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
index 0ac5b8c..e932693 100644
--- a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
@@ -31,11 +31,11 @@ function(run_Dependencies)
set(fs_delay 1.125)
endif()
- run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E copy
${RunCMake_SOURCE_DIR}/depends_obj1.cpp
${RunCMake_TEST_BINARY_DIR}/depends_obj.cpp)
+ run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E copy
${RunCMake_SOURCE_DIR}/depends_obj1.c ${RunCMake_TEST_BINARY_DIR}/depends_obj.c)
run_cmake(Dependencies)
run_cmake_command(Dependencies-build ${CMAKE_COMMAND} --build . --config
Debug)
run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E sleep ${fs_delay})
- run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E copy
${RunCMake_SOURCE_DIR}/depends_obj0.cpp
${RunCMake_TEST_BINARY_DIR}/depends_obj.cpp)
+ run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E copy
${RunCMake_SOURCE_DIR}/depends_obj0.c ${RunCMake_TEST_BINARY_DIR}/depends_obj.c)
run_cmake_command(Dependencies-build ${CMAKE_COMMAND} --build . --config
Debug)
run_cmake_command(Dependencies-build ${CMAKE_CTEST_COMMAND} -C Debug -V)
endfunction()
diff --git a/Tests/RunCMake/ObjectLibrary/depends_lib.c
b/Tests/RunCMake/ObjectLibrary/depends_lib.c
new file mode 100644
index 0000000..a41b32c
--- /dev/null
+++ b/Tests/RunCMake/ObjectLibrary/depends_lib.c
@@ -0,0 +1,7 @@
+#include <stdlib.h>
+extern int myobj_foo(void);
+
+void mylib_foo(void)
+{
+ exit(myobj_foo());
+}
diff --git a/Tests/RunCMake/ObjectLibrary/depends_lib.cpp
b/Tests/RunCMake/ObjectLibrary/depends_lib.cpp
deleted file mode 100644
index 540b536..0000000
--- a/Tests/RunCMake/ObjectLibrary/depends_lib.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-int myobj_foo();
-
-void mylib_foo()
-{
- exit(myobj_foo());
-}
diff --git a/Tests/RunCMake/ObjectLibrary/depends_main.c
b/Tests/RunCMake/ObjectLibrary/depends_main.c
new file mode 100644
index 0000000..acc66c7
--- /dev/null
+++ b/Tests/RunCMake/ObjectLibrary/depends_main.c
@@ -0,0 +1,7 @@
+extern void mylib_foo(void);
+
+int main(void)
+{
+ mylib_foo();
+ return 0;
+}
diff --git a/Tests/RunCMake/ObjectLibrary/depends_main.cpp
b/Tests/RunCMake/ObjectLibrary/depends_main.cpp
deleted file mode 100644
index a9d323d..0000000
--- a/Tests/RunCMake/ObjectLibrary/depends_main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void mylib_foo();
-
-int main()
-{
- mylib_foo();
- return 0;
-}
diff --git a/Tests/RunCMake/ObjectLibrary/depends_obj0.c
b/Tests/RunCMake/ObjectLibrary/depends_obj0.c
new file mode 100644
index 0000000..649d507
--- /dev/null
+++ b/Tests/RunCMake/ObjectLibrary/depends_obj0.c
@@ -0,0 +1,4 @@
+int myobj_foo(void)
+{
+ return 0;
+}
diff --git a/Tests/RunCMake/ObjectLibrary/depends_obj0.cpp
b/Tests/RunCMake/ObjectLibrary/depends_obj0.cpp
deleted file mode 100644
index 73a17e7..0000000
--- a/Tests/RunCMake/ObjectLibrary/depends_obj0.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-int myobj_foo()
-{
- return 0;
-}
diff --git a/Tests/RunCMake/ObjectLibrary/depends_obj1.c
b/Tests/RunCMake/ObjectLibrary/depends_obj1.c
new file mode 100644
index 0000000..e1f9f6a
--- /dev/null
+++ b/Tests/RunCMake/ObjectLibrary/depends_obj1.c
@@ -0,0 +1,4 @@
+int myobj_foo(void)
+{
+ return 1;
+}
diff --git a/Tests/RunCMake/ObjectLibrary/depends_obj1.cpp
b/Tests/RunCMake/ObjectLibrary/depends_obj1.cpp
deleted file mode 100644
index f62ef70..0000000
--- a/Tests/RunCMake/ObjectLibrary/depends_obj1.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-int myobj_foo()
-{
- return 1;
-}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01347954187ebccf83fc7540163f150a5f430c36
commit 01347954187ebccf83fc7540163f150a5f430c36
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sun Feb 26 10:34:48 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Sun Feb 26 10:43:30 2017 -0500
Tests: Fix RunCMake.ObjectLibrary dependency delay
Sleep before the second copy to avoid the need for a touch.
Sleep for longer on generators whose build tools have low
resolution timestamps.
diff --git a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
index 9291218..0ac5b8c 100644
--- a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
@@ -24,14 +24,20 @@ function(run_Dependencies)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+ if(RunCMake_GENERATOR STREQUAL "Borland Makefiles" OR
+ RunCMake_GENERATOR STREQUAL "Watcom WMake")
+ set(fs_delay 3)
+ else()
+ set(fs_delay 1.125)
+ endif()
+
run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E copy
${RunCMake_SOURCE_DIR}/depends_obj1.cpp
${RunCMake_TEST_BINARY_DIR}/depends_obj.cpp)
run_cmake(Dependencies)
- run_cmake_command(Dependencies-build ${CMAKE_COMMAND} --build .)
+ run_cmake_command(Dependencies-build ${CMAKE_COMMAND} --build . --config
Debug)
+ run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E sleep ${fs_delay})
run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E copy
${RunCMake_SOURCE_DIR}/depends_obj0.cpp
${RunCMake_TEST_BINARY_DIR}/depends_obj.cpp)
- run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E sleep 1)
- run_cmake_command(Dependencies-build ${CMAKE_COMMAND} -E touch_nocreate
${RunCMake_TEST_BINARY_DIR}/depends_obj.cpp)
- run_cmake_command(Dependencies-build ${CMAKE_COMMAND} --build .)
- run_cmake_command(Dependencies-build ${CMAKE_CTEST_COMMAND} -C Debug)
+ run_cmake_command(Dependencies-build ${CMAKE_COMMAND} --build . --config
Debug)
+ run_cmake_command(Dependencies-build ${CMAKE_CTEST_COMMAND} -C Debug -V)
endfunction()
run_Dependencies()
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/ObjectLibrary/Dependencies.cmake | 10 +++-------
Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake | 20 +++++++++++++-------
Tests/RunCMake/ObjectLibrary/depends_lib.c | 7 +++++++
Tests/RunCMake/ObjectLibrary/depends_lib.cpp | 7 -------
Tests/RunCMake/ObjectLibrary/depends_main.c | 7 +++++++
Tests/RunCMake/ObjectLibrary/depends_main.cpp | 7 -------
Tests/RunCMake/ObjectLibrary/depends_obj0.c | 4 ++++
Tests/RunCMake/ObjectLibrary/depends_obj0.cpp | 4 ----
Tests/RunCMake/ObjectLibrary/depends_obj1.c | 4 ++++
Tests/RunCMake/ObjectLibrary/depends_obj1.cpp | 4 ----
10 files changed, 38 insertions(+), 36 deletions(-)
create mode 100644 Tests/RunCMake/ObjectLibrary/depends_lib.c
delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_lib.cpp
create mode 100644 Tests/RunCMake/ObjectLibrary/depends_main.c
delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_main.cpp
create mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj0.c
delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj0.cpp
create mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj1.c
delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj1.cpp
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
