Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2021-02-14 01:35:55 +00:00
commit e755608b02
2 files changed
+26 -13

No files matched your search

+25 -12
View File
@@ -6,17 +6,15 @@ INCLUDE(GNUInstallDirs)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
SET(Calyp_Lib_SRCS
LibMemory.h
CalypLib.h
CalypDefs.h
# Frame
CalypFrame.h
CalypFrame.cpp
set(Calyp_Lib_Frame_SRCS
CalypPixel.cpp
PixelFormats.h
PixelFormats.cpp
# Stream
CalypFrame.h
CalypFrame.cpp
)
set(Calyp_Lib_Stream_SRCS
CalypStream.h
CalypStream.cpp
CalypStreamHandlerIf.h
@@ -24,12 +22,27 @@ SET(Calyp_Lib_SRCS
StreamHandlerRaw.cpp
StreamHandlerPortableMap.h
StreamHandlerPortableMap.cpp
# Options Parser
)
set(Calyp_Lib_OptionParser_SRCS
CalypOptions.h
CalypOptions.cpp
# Modules
CalypModuleIf.h
CalypOpenCVModuleIf.h)
)
set(Calyp_Lib_Modules_SRCS
CalypOptions.h
CalypOptions.cpp
)
set(Calyp_Lib_SRCS
LibMemory.h
CalypLib.h
CalypDefs.h
${Calyp_Lib_Frame_SRCS}
${Calyp_Lib_Stream_SRCS}
${Calyp_Lib_OptionParser_SRCS}
${Calyp_Lib_Modules_SRCS}
)
LIST(APPEND CMAKE_CFG_LINKER_LIBSS ${PROJECT_LIBRARY})
LIST(APPEND CMAKE_CFG_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+1 -1
View File
@@ -61,7 +61,7 @@ ENDIF()
#
CREATE_MODULE_MACROS()
INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
ADD_LIBRARY(CalypModules ${Calyp_Mod_SRCS})
ADD_LIBRARY(CalypModules STATIC ${Calyp_Mod_SRCS})
TARGET_LINK_LIBRARIES(CalypModules ${PROJECT_LIBRARY} ${OpenCV_LIBRARIES})
IF(USE_DYNLOAD)
TARGET_LINK_LIBRARIES(CalypModules -ldl)