Merge branch 'master' into devel
This commit is contained in:
2 files changed
+26
-13
No files matched your search
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user