diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c4f1f59..17851a7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,7 @@ UNRELEASED * ADDED: Troubleshooting section to documentation * FIXED: execute_process() failures were ignored + * ADDED: Include .cc files in C++ source glob 1.3.0 ----- diff --git a/tests/glob_srcs/app_glob_srcs/src/main.xc b/tests/glob_srcs/app_glob_srcs/src/main.xc index 1d15279..acdefb8 100644 --- a/tests/glob_srcs/app_glob_srcs/src/main.xc +++ b/tests/glob_srcs/app_glob_srcs/src/main.xc @@ -5,8 +5,10 @@ void src0_xc(); void src1_xc(); void src0_c(); void src1_c(); -void src0_cxx(); -void src1_cxx(); +void src0_cc(); +void src1_cc(); +void src0_cpp(); +void src1_cpp(); void src0_S(); void src1_S(); @@ -15,8 +17,10 @@ int main() { src1_xc(); src0_c(); src1_c(); - src0_cxx(); - src1_cxx(); + src0_cc(); + src1_cc(); + src0_cpp(); + src1_cpp(); src0_S(); src1_S(); mod0(); diff --git a/tests/glob_srcs/app_glob_srcs/src/src0/src0.cc b/tests/glob_srcs/app_glob_srcs/src/src0/src0.cc new file mode 100644 index 0000000..499d32e --- /dev/null +++ b/tests/glob_srcs/app_glob_srcs/src/src0/src0.cc @@ -0,0 +1,3 @@ +extern "C" { + void src0_cc() {} +} \ No newline at end of file diff --git a/tests/glob_srcs/app_glob_srcs/src/src0/src0.cpp b/tests/glob_srcs/app_glob_srcs/src/src0/src0.cpp index 67b7b5b..c6d34bf 100644 --- a/tests/glob_srcs/app_glob_srcs/src/src0/src0.cpp +++ b/tests/glob_srcs/app_glob_srcs/src/src0/src0.cpp @@ -1,3 +1,3 @@ extern "C" { - void src0_cxx() {} + void src0_cpp() {} } diff --git a/tests/glob_srcs/app_glob_srcs/src/src1/src1.cc b/tests/glob_srcs/app_glob_srcs/src/src1/src1.cc new file mode 100644 index 0000000..aef8302 --- /dev/null +++ b/tests/glob_srcs/app_glob_srcs/src/src1/src1.cc @@ -0,0 +1,3 @@ +extern "C" { + void src1_cc() {} +} \ No newline at end of file diff --git a/tests/glob_srcs/app_glob_srcs/src/src1/src1.cpp b/tests/glob_srcs/app_glob_srcs/src/src1/src1.cpp index 60de836..122947a 100644 --- a/tests/glob_srcs/app_glob_srcs/src/src1/src1.cpp +++ b/tests/glob_srcs/app_glob_srcs/src/src1/src1.cpp @@ -1,3 +1,3 @@ extern "C" { - void src1_cxx() {} + void src1_cpp() {} } diff --git a/xcommon.cmake b/xcommon.cmake index 46cb9cb..aaa8a58 100644 --- a/xcommon.cmake +++ b/xcommon.cmake @@ -175,7 +175,7 @@ macro(glob_srcs prefix src_dir src_subdir) endif() if(NOT DEFINED ${prefix}_CXX_SRCS) - file(GLOB_RECURSE ${prefix}_CXX_SRCS CONFIGURE_DEPENDS ${src_dir}/${src_subdir}/*.cpp) + file(GLOB_RECURSE ${prefix}_CXX_SRCS CONFIGURE_DEPENDS ${src_dir}/${src_subdir}/*.cpp ${src_dir}/${src_subdir}/*.cc) else() list(TRANSFORM ${prefix}_CXX_SRCS PREPEND ${src_dir}/) endif()