Fix cmake code to correctly add extra modules

cmake/ModulesFct.cmake

@@ -1,16 +1,26 @@
 
+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()
+ENDMACRO()
 
 MACRO(ADD_MODULE name file )
-  set(__modulename "Module${name}")
+  SET(__modulename "Module${name}")
   OPTION(MODULE_${name} "Use module ${name}" ON )
   ADD_FEATURE_INFO(${name} MODULE_${name} "Module ${name}" )
-  if( MODULE_${name} )
-    list(APPEND Calyp_Mod_SRCS ${file} )
+  IF( MODULE_${name} )
+    list(APPEND Calyp_Mod_SRCS ${MODULE_LOCATION}${file} )
     LIST(APPEND MODULES_LIST_NAME ${name} )
     LIST(APPEND MODULES_LIST_FILES ${file} )
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h   "#include \"${file}.h\"\n")
-  endif()
-  unset(__modulename)
+    SET( Calyp_Mod_SRCS "${Calyp_Mod_SRCS}" PARENT_SCOPE )
+    SET( MODULES_LIST_NAME "${MODULES_LIST_NAME}" PARENT_SCOPE )
+    SET( MODULES_LIST_FILES "${MODULES_LIST_FILES}" PARENT_SCOPE )
+  ENDIF()
+  UNSET(__modulename)
 ENDMACRO()
 
 
@@ -46,7 +56,6 @@ ENDMACRO()
 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})
     file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h   "#include \"${module}.h\"\n")
   endforeach(module ${MODULES_LIST_FILES})