From 78a086ae1bb8347e281e8561114eab5013e41c47 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 29 Sep 2021 00:52:11 +0800 Subject: rename file --- tests/projects/c/library_with_cmakelists/foo/CMakeLists.txt | 4 ++-- tests/projects/c/library_with_cmakelists/foo/src/foo.c | 6 ++++++ tests/projects/c/library_with_cmakelists/foo/src/foo.h | 8 ++++++++ tests/projects/c/library_with_cmakelists/foo/src/interface.c | 6 ------ tests/projects/c/library_with_cmakelists/foo/src/interface.h | 8 -------- tests/projects/c/library_with_cmakelists/src/main.c | 2 +- tests/projects/c/library_with_cmakelists/xmake.lua | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 tests/projects/c/library_with_cmakelists/foo/src/foo.c create mode 100644 tests/projects/c/library_with_cmakelists/foo/src/foo.h delete mode 100644 tests/projects/c/library_with_cmakelists/foo/src/interface.c delete mode 100644 tests/projects/c/library_with_cmakelists/foo/src/interface.h diff --git a/tests/projects/c/library_with_cmakelists/foo/CMakeLists.txt b/tests/projects/c/library_with_cmakelists/foo/CMakeLists.txt index 2654a77a2..4eca38b21 100644 --- a/tests/projects/c/library_with_cmakelists/foo/CMakeLists.txt +++ b/tests/projects/c/library_with_cmakelists/foo/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.13.0) -project(foo_demo LANGUAGES C CXX ASM) +project(foo LANGUAGES C CXX ASM) add_library(foo STATIC "") target_sources(foo PRIVATE - src/interface.c + src/foo.c ) diff --git a/tests/projects/c/library_with_cmakelists/foo/src/foo.c b/tests/projects/c/library_with_cmakelists/foo/src/foo.c new file mode 100644 index 000000000..598d07560 --- /dev/null +++ b/tests/projects/c/library_with_cmakelists/foo/src/foo.c @@ -0,0 +1,6 @@ +#include "interface.h" + +int add(int a, int b) +{ + return a + b; +} diff --git a/tests/projects/c/library_with_cmakelists/foo/src/foo.h b/tests/projects/c/library_with_cmakelists/foo/src/foo.h new file mode 100644 index 000000000..6c2aa9c2a --- /dev/null +++ b/tests/projects/c/library_with_cmakelists/foo/src/foo.h @@ -0,0 +1,8 @@ +/*! calculate add(a, b) + * + * @param a the first argument + * @param b the second argument + * + * @return the result + */ +int add(int a, int b); diff --git a/tests/projects/c/library_with_cmakelists/foo/src/interface.c b/tests/projects/c/library_with_cmakelists/foo/src/interface.c deleted file mode 100644 index 598d07560..000000000 --- a/tests/projects/c/library_with_cmakelists/foo/src/interface.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "interface.h" - -int add(int a, int b) -{ - return a + b; -} diff --git a/tests/projects/c/library_with_cmakelists/foo/src/interface.h b/tests/projects/c/library_with_cmakelists/foo/src/interface.h deleted file mode 100644 index 6c2aa9c2a..000000000 --- a/tests/projects/c/library_with_cmakelists/foo/src/interface.h +++ /dev/null @@ -1,8 +0,0 @@ -/*! calculate add(a, b) - * - * @param a the first argument - * @param b the second argument - * - * @return the result - */ -int add(int a, int b); diff --git a/tests/projects/c/library_with_cmakelists/src/main.c b/tests/projects/c/library_with_cmakelists/src/main.c index 9505a2f75..1e52e7a81 100644 --- a/tests/projects/c/library_with_cmakelists/src/main.c +++ b/tests/projects/c/library_with_cmakelists/src/main.c @@ -1,4 +1,4 @@ -#include "interface.h" +#include "foo.h" #include int main(int argc, char** argv) diff --git a/tests/projects/c/library_with_cmakelists/xmake.lua b/tests/projects/c/library_with_cmakelists/xmake.lua index 337527d0f..bc3260373 100644 --- a/tests/projects/c/library_with_cmakelists/xmake.lua +++ b/tests/projects/c/library_with_cmakelists/xmake.lua @@ -12,7 +12,7 @@ package("foo") os.cp("build/*.a", package:installdir("lib")) end) on_test(function (package) - assert(package:has_cincludes("interface.h")) + assert(package:has_cincludes("foo.h")) end) package_end() -- cgit v1.3.1