CMake: It is now possible to have a user folder with Tasks, libraries and configuration files.

Use the same tree as the main dune directory (user/etc/ user/src/ and user/vendor/).
This change allows developers to synchronize with LSTS's repo more easily.

Author: jffortuna

.gitignore

@@ -7,3 +7,4 @@ private/
 .\#*
 *.mo
 CMakeLists.txt.user
+user/

CMakeLists.txt

@@ -213,6 +213,12 @@ foreach(extlib ${extlibs})
   include(${extlib})
 endforeach(extlib ${extlibs})
 
+# User Libraries.
+file(GLOB extlibs ${PROJECT_SOURCE_DIR}/user/vendor/libraries/*/Library.cmake)
+foreach(extlib ${extlibs})
+  include(${extlib})
+endforeach(extlib ${extlibs})
+
 include_directories(${DUNE_GENERATED}/src ${PROJECT_SOURCE_DIR}/src ${DUNE_VENDOR_INCS_DIR})
 link_directories(${DUNE_VENDOR_LIBS_DIR})
 set(DUNE_CORE_FILES ${DUNE_CORE_SOURCES} ${DUNE_VENDOR_FILES})

cmake/I18N.cmake

@@ -53,6 +53,8 @@ if(DUNE_PROGRAM_XGETTEXT)
   file(GLOB_RECURSE sources "${PROJECT_SOURCE_DIR}/src/*.cpp")
   file(GLOB_RECURSE private_headers "${PROJECT_SOURCE_DIR}/private/src/*.hpp")
   file(GLOB_RECURSE private_sources "${PROJECT_SOURCE_DIR}/private/src/*.cpp")
+  file(GLOB_RECURSE user_headers "${PROJECT_SOURCE_DIR}/private/src/*.hpp")
+  file(GLOB_RECURSE user_sources "${PROJECT_SOURCE_DIR}/private/src/*.cpp")
   file(GLOB_RECURSE texts   "${PROJECT_SOURCE_DIR}/i18n/*.txt")
 
   add_custom_target(i18n_extract
@@ -68,7 +70,7 @@ if(DUNE_PROGRAM_XGETTEXT)
     --keyword=DTR_RT
     --no-wrap
     --indent
-    -o dune.pot ${headers} ${sources} ${private_headers} ${private_sources} ${texts}
+    -o dune.pot ${headers} ${sources} ${private_headers} ${private_sources} ${user_headers} ${user_sources} ${texts}
     DEPENDS i18n_texts
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/i18n)
 endif(DUNE_PROGRAM_XGETTEXT)

cmake/Tasks.cmake

@@ -170,6 +170,7 @@ if(TASK_FILE)
 else(TASK_FILE)
   dune_add_tasks(${PROJECT_SOURCE_DIR}/src)
   dune_add_tasks(${PROJECT_SOURCE_DIR}/private/src)
+  dune_add_tasks(${PROJECT_SOURCE_DIR}/user/src)
 endif(TASK_FILE)
 
 list(SORT DUNE_TASKS_ENABLED)