jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the cmake code to support external modules

Browse Source
This commit is contained in:
jfmcarreira
2019-04-03 18:51:36 +01:00
parent e42f0d02bb
commit a8a8043ced
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/ModulesFct.cmake
-4
View File
@@ -43,11 +43,8 @@ ENDMACRO()
# #
# Create header # Create header
# #
MACRO(CREATE_MODULE_MACROS ) MACRO(CREATE_MODULE_MACROS )
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "// This files add the header files of each module\n" 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" ) "#ifndef __MODULESLISTHEADER_H__\n#define __MODULESLISTHEADER_H__\n" )
foreach(module ${MODULES_LIST_FILES}) foreach(module ${MODULES_LIST_FILES})
@@ -60,5 +57,4 @@ MACRO(CREATE_MODULE_MACROS )
endforeach(module ${MODULES_LIST_NAME}) endforeach(module ${MODULES_LIST_NAME})
file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "\n#endif // __MODULESLISTHEADER_H__\n" ) file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "\n#endif // __MODULESLISTHEADER_H__\n" )
ENDMACRO() ENDMACRO()
modules/CMakeLists.txt
+1 -1
View File
@@ -44,7 +44,7 @@ ADD_MODULE_USE_OPENCV( SaliencyDetectionFineGrained "SaliencyDetection" VERSION
ADD_MODULE_USE_OPENCV( SaliencyDetectionBinWangApr2014 "SaliencyDetection" VERSION 3.3.0 MODULES saliency ) ADD_MODULE_USE_OPENCV( SaliencyDetectionBinWangApr2014 "SaliencyDetection" VERSION 3.3.0 MODULES saliency )
IF(EXISTS ${CALYP_EXTRA_MODULES}) IF(EXISTS ${CALYP_EXTRA_MODULES})
ADD_SUBDIRECTORY( ${CALYP_EXTRA_MODULES} ) ADD_SUBDIRECTORY( ${CALYP_EXTRA_MODULES} ${CMAKE_CURRENT_BINARY_DIR}/extra-modules )
ENDIF() ENDIF()
# #