diff options
| author | Josh Blum | 2012-09-28 21:17:40 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-09-28 21:17:40 -0700 |
| commit | a6850d87f4f0be82605e00f41cf00da726b87569 (patch) | |
| tree | 0392e75155cd1991f55e0925e5c89706097b2d19 | |
| parent | 0aec712e35b937479b99b6486f91fc182217b1a9 (diff) | |
| download | sandhi-a6850d87f4f0be82605e00f41cf00da726b87569.tar.gz sandhi-a6850d87f4f0be82605e00f41cf00da726b87569.tar.bz2 sandhi-a6850d87f4f0be82605e00f41cf00da726b87569.zip | |
started apology integration, removed tsbe
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | Apology | 0 | ||||
| m--------- | Theron | 0 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 38 | ||||
| m--------- | tsbe | 0 |
5 files changed, 16 insertions, 28 deletions
diff --git a/.gitmodules b/.gitmodules index c68e8a6..a725202 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,9 @@ [submodule "numanuma"] path = numanuma url = https://github.com/guruofquality/numanuma.git -[submodule "tsbe"] - path = tsbe - url = https://github.com/guruofquality/tsbe.git [submodule "Theron"] path = Theron url = https://github.com/guruofquality/Theron.git +[submodule "Apology"] + path = Apology + url = https://github.com/guruofquality/Apology.git diff --git a/Apology b/Apology new file mode 160000 +Subproject e3a41481ba41cbd8160d5d303271a1fe45426b1 diff --git a/Theron b/Theron -Subproject c6388f54e6ce75495ffd14d3aa6f24a66bb2545 +Subproject 87cbb28824ea255e3dedc93ababe5f7639de504 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index fd24ccd..73a919c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -9,37 +9,25 @@ set(GRAS_BINARY_DIR ${CMAKE_BINARY_DIR}/gruel/src) set(RUNTIME_SOURCE_DIR ${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/runtime) ######################################################################## -# Setup TSBE +# Setup Theron Deps ######################################################################## -include_directories(${GRAS_SOURCE_DIR}/tsbe/include) -include_directories(${GRAS_SOURCE_DIR}/tsbe/lib) +set(THERON_SOURCE_DIR ${GRAS_SOURCE_DIR}/Theron) +include(${THERON_SOURCE_DIR}/TheronSetup.cmake) +include_directories(${THERON_INCLUDE_DIRS}) +link_directories(${THERON_LIBRARY_DIRS}) +add_definitions(${THERON_DEFINES}) -file(GLOB tsbe_sources - "${GRAS_SOURCE_DIR}/tsbe/lib/*.cpp" -) - -list(APPEND gnuradio_core_sources ${tsbe_sources}) +list(APPEND gnuradio_core_libs ${THERON_LIBRARIES}) +list(APPEND gnuradio_core_sources ${THERON_SOURCES}) ######################################################################## -# Setup Theron +# Setup Apology Deps ######################################################################## -include_directories(${GRAS_SOURCE_DIR}/Theron/Include) -include_directories(${GRAS_SOURCE_DIR}/Theron/Include/External) - -if(MSVC) - include_directories(${GRAS_SOURCE_DIR}/Theron/Include/External/Standard) -endif(MSVC) - -if (NOT WIN32) #not on windows? tell theron headers to use boost - add_definitions(-DTHERON_USE_BOOST_THREADS) -endif() - -file(GLOB theron_sources - "${GRAS_SOURCE_DIR}/Theron/Theron/*.cpp" - "${GRAS_SOURCE_DIR}/Theron/Source/*.cpp" -) +include_directories(${GRAS_SOURCE_DIR}/Apology/include) +include_directories(${GRAS_SOURCE_DIR}/Apology/lib) -list(APPEND gnuradio_core_sources ${theron_sources}) +file(GLOB apology_sources "${GRAS_SOURCE_DIR}/Apology/lib/*.cpp") +list(APPEND gnuradio_core_sources ${apology_sources}) ######################################################################## # Setup NumaNuma diff --git a/tsbe b/tsbe deleted file mode 160000 -Subproject 26ee37a3042d3e05ea1a2b58edd4325b50da93f |