[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/06: modtool: added skipping of lib/ and
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/06: modtool: added skipping of lib/ and swig/ if sources list is empty |
Date: |
Sun, 16 Feb 2014 21:11:09 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch maint
in repository gnuradio.
commit 9fb5487a8958e26744ee24dced92d2635fc17136
Author: Marcus Müller <address@hidden>
Date: Wed Feb 12 11:05:13 2014 +0100
modtool: added skipping of lib/ and swig/ if sources list is empty
---
gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt | 6 ++++++
gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt | 8 ++++++++
2 files changed, 14 insertions(+)
diff --git a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt
b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt
index 3125941..a535ead 100644
--- a/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt
@@ -28,6 +28,12 @@ link_directories(${Boost_LIBRARY_DIRS})
list(APPEND howto_sources
)
+set(howto_sources "${howto_sources}" PARENT_SCOPE)
+if(NOT howto_sources)
+ MESSAGE(STATUS "No C++ sources... skipping lib/")
+ return()
+endif(NOT howto_sources)
+
add_library(gnuradio-howto SHARED ${howto_sources})
target_link_libraries(gnuradio-howto ${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES})
set_target_properties(gnuradio-howto PROPERTIES DEFINE_SYMBOL
"gnuradio_howto_EXPORTS")
diff --git a/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt
b/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt
index 9aa1c51..5810b6c 100644
--- a/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/swig/CMakeLists.txt
@@ -18,6 +18,14 @@
# Boston, MA 02110-1301, USA.
########################################################################
+# Check if there is C++ code at all
+########################################################################
+if(NOT howto_sources)
+ MESSAGE(STATUS "No C++ sources... skipping swig/")
+ return()
+endif(NOT howto_sources)
+
+########################################################################
# Include swig generation macros
########################################################################
find_package(SWIG)
- [Commit-gnuradio] [gnuradio] branch maint updated (69323c1 -> 1366dc2), git, 2014/02/16
- [Commit-gnuradio] [gnuradio] 05/06: Merge remote-tracking branch 'mbant/oot-modules-without-cpp-maint' into maint, git, 2014/02/16
- [Commit-gnuradio] [gnuradio] 01/06: modtool: added skipping of lib/ and swig/ if sources list is empty,
git <=
- [Commit-gnuradio] [gnuradio] 02/06: Remove "Bytes to Symbols" block from GRC as bytes_to_syms no longer exists., git, 2014/02/16
- [Commit-gnuradio] [gnuradio] 06/06: add default OSX homebrew path to FindQwt, last in the list; should never conflict with other OSs nor MacPorts or Fink, git, 2014/02/16
- [Commit-gnuradio] [gnuradio] 04/06: Removes qt3 leftovers in qtgui code., git, 2014/02/16
- [Commit-gnuradio] [gnuradio] 03/06: digital: Fixed example which had invalid default values after changing HPD, git, 2014/02/16