From a8a8043ced86207284fed57d622bd84ad3156c6b Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 3 Apr 2019 18:51:36 +0100 Subject: [PATCH] Fix the cmake code to support external modules --- cmake/ModulesFct.cmake | 4 ---- modules/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/ModulesFct.cmake b/cmake/ModulesFct.cmake index bcf175d..1e2738d 100644 --- a/cmake/ModulesFct.cmake +++ b/cmake/ModulesFct.cmake @@ -43,11 +43,8 @@ ENDMACRO() # # Create header # - MACRO(CREATE_MODULE_MACROS ) - file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "// This files add the header files of each module\n" - "#ifndef __MODULESLISTHEADER_H__\n#define __MODULESLISTHEADER_H__\n" ) foreach(module ${MODULES_LIST_FILES}) @@ -60,5 +57,4 @@ MACRO(CREATE_MODULE_MACROS ) endforeach(module ${MODULES_LIST_NAME}) file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "\n#endif // __MODULESLISTHEADER_H__\n" ) - ENDMACRO() diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 07ae411..2c9f395 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -44,7 +44,7 @@ ADD_MODULE_USE_OPENCV( SaliencyDetectionFineGrained "SaliencyDetection" VERSION ADD_MODULE_USE_OPENCV( SaliencyDetectionBinWangApr2014 "SaliencyDetection" VERSION 3.3.0 MODULES saliency ) IF(EXISTS ${CALYP_EXTRA_MODULES}) - ADD_SUBDIRECTORY( ${CALYP_EXTRA_MODULES} ) + ADD_SUBDIRECTORY( ${CALYP_EXTRA_MODULES} ${CMAKE_CURRENT_BINARY_DIR}/extra-modules ) ENDIF() #