Fix compile error with old catch.hpp header. Also, remove the duplicate

copy and use only the catch.hpp in the event/ submodule.
unifiedstreaming · Jan 10, 2024 · d87f6ec · d87f6ec
1 parent 5df1317
commit d87f6ec
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17,979 deletions.
diff --git a/ingest-tools/CMakeLists.txt b/ingest-tools/CMakeLists.txt
@@ -39,7 +39,7 @@ add_executable(fmp4dump fmp4dump.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4strea
 #target_include_directories(fmp4ingest ${CMAKE_CURRENT_SOURCE_DIR}/event/)
 add_executable(fmp4_init fmp4_init.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.h ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.h)
 #target_include_directories(fmp4ingest ${CMAKE_CURRENT_SOURCE_DIR}/event/)
-add_executable(unittests catch.hpp unittest.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/event_track.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.h ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.h ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/event_track.h)
+add_executable(unittests unittest.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/catch.hpp ${CMAKE_CURRENT_SOURCE_DIR}/event/event_track.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.h ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.h ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/event_track.h)
 #target_include_directories(fmp4ingest ${CMAKE_CURRENT_SOURCE_DIR}/event/)
 
 add_executable(push_markers push_markers.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/event_track.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/fmp4stream.h ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event/base64.h ${CMAKE_CURRENT_SOURCE_DIR}/event/event_track.h)