Skip to content

Include .cc files in C++ source glob #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuchitak wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Include .cc files in C++ source glob #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----
Expand Down
12 changes: 8 additions & 4 deletions tests/glob_srcs/app_glob_srcs/src/main.xc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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();
Expand Down
3 changes: 3 additions & 0 deletions tests/glob_srcs/app_glob_srcs/src/src0/src0.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
extern "C" {
void src0_cc() {}
}
2 changes: 1 addition & 1 deletion tests/glob_srcs/app_glob_srcs/src/src0/src0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
extern "C" {
void src0_cxx() {}
void src0_cpp() {}
}
3 changes: 3 additions & 0 deletions tests/glob_srcs/app_glob_srcs/src/src1/src1.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
extern "C" {
void src1_cc() {}
}
2 changes: 1 addition & 1 deletion tests/glob_srcs/app_glob_srcs/src/src1/src1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
extern "C" {
void src1_cxx() {}
void src1_cpp() {}
}
2 changes: 1 addition & 1 deletion xcommon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down