Change the condtion checking the extra modules location

This commit is contained in:
jfmcarreira committed 2019-04-03 19:43:23 +01:00
1 parent e4e4994f25
commit 608cc20508
2 files changed
+7 -7

No files matched your search

+4 -6
View File
@@ -1,11 +1,9 @@
MACRO(ADD_EXTRA_MODULES dir)
IF(EXISTS ${dir})
SET( MODULE_LOCATION "${dir}/" )
ADD_SUBDIRECTORY( ${dir} ${CMAKE_CURRENT_BINARY_DIR}/extra-modules )
INCLUDE_DIRECTORIES( ${dir} )
SET( MODULE_LOCATION "${dir}/" PARENT_SCOPE )
ENDIF()
SET( MODULE_LOCATION "${dir}/" )
ADD_SUBDIRECTORY( ${dir} ${CMAKE_CURRENT_BINARY_DIR}/extra-modules )
INCLUDE_DIRECTORIES( ${dir} )
SET( MODULE_LOCATION "${dir}/" PARENT_SCOPE )
ENDMACRO()
MACRO(ADD_MODULE name file )
+3 -1
View File
@@ -45,7 +45,9 @@ ADD_MODULE_USE_OPENCV( SaliencyDetectionSpectral "SaliencyDetection" VERSION 3.3
ADD_MODULE_USE_OPENCV( SaliencyDetectionFineGrained "SaliencyDetection" VERSION 3.3.0 MODULES saliency )
ADD_MODULE_USE_OPENCV( SaliencyDetectionBinWangApr2014 "SaliencyDetection" VERSION 3.3.0 MODULES saliency )
ADD_EXTRA_MODULES( ${CALYP_EXTRA_MODULES} )
IF(EXISTS ${CALYP_EXTRA_MODULES_DIR} )
ADD_EXTRA_MODULES( ${CALYP_EXTRA_MODULES_DIR} )
ENDIF()
#
# Create header and auxiliar files