From 4d1730f928d5228fed888838c451637f863dc2fe Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 13 Feb 2021 23:49:36 +0000 Subject: [PATCH 1/2] Explicitly use static library for modules --- modules/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 69fed69..cc0751d 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -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 ) From 2debe78ed8d626f86000554029f7c8126b5dc7e9 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 14 Feb 2021 00:51:21 +0000 Subject: [PATCH 2/2] Refactoring lib CMakeLists.txt --- lib/CMakeLists.txt | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d73bccb..ff419df 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -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,26 @@ 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} )