diff --git a/cmake/ModulesFct.cmake b/cmake/ModulesFct.cmake index 8267f3a..f0798b2 100644 --- a/cmake/ModulesFct.cmake +++ b/cmake/ModulesFct.cmake @@ -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 ) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 35ed573..160d1f2 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -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