Browse Source

Tests: Change RunCMake.ObjectLibrary dependencies case to C

Brad King 8 years ago
parent
commit
b35a949bb6

+ 3 - 7
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()

+ 2 - 2
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()

+ 7 - 0
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());
+}

+ 0 - 7
Tests/RunCMake/ObjectLibrary/depends_lib.cpp

@@ -1,7 +0,0 @@
-#include <stdlib.h>
-int myobj_foo();
-
-void mylib_foo()
-{
-  exit(myobj_foo());
-}

+ 7 - 0
Tests/RunCMake/ObjectLibrary/depends_main.c

@@ -0,0 +1,7 @@
+extern void mylib_foo(void);
+
+int main(void)
+{
+  mylib_foo();
+  return 0;
+}

+ 0 - 7
Tests/RunCMake/ObjectLibrary/depends_main.cpp

@@ -1,7 +0,0 @@
-void mylib_foo();
-
-int main()
-{
-  mylib_foo();
-  return 0;
-}

+ 4 - 0
Tests/RunCMake/ObjectLibrary/depends_obj0.c

@@ -0,0 +1,4 @@
+int myobj_foo(void)
+{
+  return 0;
+}

+ 0 - 4
Tests/RunCMake/ObjectLibrary/depends_obj0.cpp

@@ -1,4 +0,0 @@
-int myobj_foo()
-{
-  return 0;
-}

+ 4 - 0
Tests/RunCMake/ObjectLibrary/depends_obj1.c

@@ -0,0 +1,4 @@
+int myobj_foo(void)
+{
+  return 1;
+}

+ 0 - 4
Tests/RunCMake/ObjectLibrary/depends_obj1.cpp

@@ -1,4 +0,0 @@
-int myobj_foo()
-{
-  return 1;
-}