Skip to content

Commit

Permalink
Documentation updated
Browse files Browse the repository at this point in the history
  • Loading branch information
ConstantRobotics committed Mar 20, 2024
1 parent 2093c18 commit 12ccad5
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 58 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "3rdparty/Frame"]
path = 3rdparty/Frame
url = [email protected]:ConstantRobotics-Ltd/Frame.git
[submodule "3rdparty/ConfigReader"]
path = 3rdparty/ConfigReader
url = https://github.com/ConstantRobotics-Ltd/ConfigReader.git
Expand Down
11 changes: 1 addition & 10 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ SET(${PARENT}_SUBMODULE_CACHE_OVERWRITE OFF CACHE BOOL "" FORCE)
## CONFIGURATION
## 3rd-party submodules configuration
################################################################################
SET(${PARENT}_SUBMODULE_FRAME ON CACHE BOOL "" FORCE)
if (${PARENT}_SUBMODULE_FRAME)
SET(${PARENT}_FRAME ON CACHE BOOL "" FORCE)
SET(${PARENT}_FRAME_TEST OFF CACHE BOOL "" FORCE)
endif()

SET(${PARENT}_SUBMODULE_CONFIG_READER ON CACHE BOOL "" FORCE)
if (${PARENT}_SUBMODULE_CONFIG_READER)
SET(${PARENT}_CONFIG_READER ON CACHE BOOL "" FORCE)
Expand All @@ -50,14 +44,11 @@ if (${PARENT}_SUBMODULE_VCODEC)
endif()



################################################################################
## INCLUDING SUBDIRECTORIES
## Adding subdirectories according to the 3rd-party configuration
################################################################################
if (${PARENT}_SUBMODULE_FRAME)
add_subdirectory(Frame)
endif()

if (${PARENT}_SUBMODULE_CONFIG_READER)
add_subdirectory(ConfigReader)
endif()
Expand Down
1 change: 0 additions & 1 deletion 3rdparty/Frame
Submodule Frame deleted from b621b1
2 changes: 1 addition & 1 deletion 3rdparty/VOverlay
76 changes: 38 additions & 38 deletions README.md

Large diffs are not rendered by default.

Binary file removed VStreamer_C++_interface_lib_v1.1.0.pdf
Binary file not shown.
Binary file added VStreamer_C++_interface_lib_v1.1.1.pdf
Binary file not shown.
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13)
## LIBRARY-PROJECT
## name and version
###############################################################################
project(VStreamer VERSION 1.1.0 LANGUAGES CXX)
project(VStreamer VERSION 1.1.1 LANGUAGES CXX)



Expand Down Expand Up @@ -52,7 +52,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
## LINK LIBRARIES
## linking all dependencies
###############################################################################
target_link_libraries(${PROJECT_NAME} Frame)
target_link_libraries(${PROJECT_NAME} ConfigReader)
target_link_libraries(${PROJECT_NAME} VOverlay)
target_link_libraries(${PROJECT_NAME} VCodec)
4 changes: 2 additions & 2 deletions src/VStreamerVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

#define VSTREAMER_MAJOR_VERSION 1
#define VSTREAMER_MINOR_VERSION 1
#define VSTREAMER_PATCH_VERSION 0
#define VSTREAMER_PATCH_VERSION 1

#define VSTREAMER_VERSION "1.1.0"
#define VSTREAMER_VERSION "1.1.1"

0 comments on commit 12ccad5

Please sign in to comment.