Merge lp:~davidagraf/zorba/allow_c_files into lp:zorba

Proposed by David Graf
Status: Merged
Approved by: Chris Hillery
Approved revision: 10483
Merged at revision: 10496
Proposed branch: lp:~davidagraf/zorba/allow_c_files
Merge into: lp:zorba
Diff against target: 11 lines (+1/-1)
1 file modified
cmake_modules/ZorbaModule.cmake (+1/-1)
To merge this branch: bzr merge lp:~davidagraf/zorba/allow_c_files
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Review via email: mp+77816@code.launchpad.net

Commit message

Allow the usage of C files in external modules.

Description of the change

This change allows the usage of c files in external modules.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Chris Hillery (ceejatec) wrote :

Seems perfectly reasonable.

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job allow_c_files-2011-10-06T10-58-01.553Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake_modules/ZorbaModule.cmake'
2--- cmake_modules/ZorbaModule.cmake 2011-09-07 23:41:09 +0000
3+++ cmake_modules/ZorbaModule.cmake 2011-10-02 09:11:26 +0000
4@@ -213,7 +213,7 @@
5 SET (_src_dir "${CMAKE_CURRENT_SOURCE_DIR}/${_src_dir}")
6 ENDIF (NOT IS_ABSOLUTE "${_src_dir}")
7 FILE(GLOB_RECURSE _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
8- "${_src_dir}/*.cpp")
9+ "${_src_dir}/*.cpp" "${_src_dir}/*.c")
10 LIST (APPEND SRC_FILES ${_srcs})
11 ENDFOREACH (_src_dir)
12

Subscribers

People subscribed via source and target branches