Merge pull request #122 from Anatoscope/FIX_boost_locale_mandatory

[SofaKernel] Fix FileRepository should not be optional

SofaKernel/SofaFramework/CMakeLists.txt

@@ -146,13 +146,11 @@ endif()
 set(SOFA_HAVE_PNG ${PNG_FOUND})
 
 ## Boost
-find_package(Boost COMPONENTS thread system date_time filesystem locale QUIET)
-
-set(SOFA_HAVE_BOOST_SYSTEM ${Boost_SYSTEM_FOUND})
+# optional boost libraries
+find_package(Boost REQUIRED system filesystem locale
+                   OPTIONAL_COMPONENTS thread date_time)
 set(SOFA_HAVE_BOOST_THREAD ${Boost_THREAD_FOUND})
 set(SOFA_HAVE_BOOST_DATE_TIME ${Boost_DATE_TIME_FOUND})
-set(SOFA_HAVE_BOOST_FILESYSTEM ${Boost_FILESYSTEM_FOUND})
-set(SOFA_HAVE_BOOST_LOCALE ${Boost_LOCALE_FOUND})
 
 list(APPEND Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
 

SofaKernel/framework/sofa/helper/CMakeLists.txt

@@ -99,6 +99,7 @@ set(HEADER_FILES
     system/thread/debug.h
     system/thread/thread_specific_ptr.h
     system/FileMonitor.h
+    system/FileRepository.h
     vector.h
     vectorData.h
     vectorLinks.h
@@ -181,6 +182,7 @@ set(SOURCE_FILES
     system/thread/CTime.cpp
     system/thread/CircularQueue.cpp
     system/thread/debug.cpp
+    system/FileRepository.cpp
     vector.cpp
     logging/Message.cpp
     logging/MessageDispatcher.cpp
@@ -220,11 +222,6 @@ if(Boost_thread_FOUND)
     list(APPEND SOURCE_FILES system/thread/TimeoutWatchdog.cpp)
 endif()
 
-if(Boost_FILESYSTEM_FOUND AND Boost_LOCALE_FOUND)
-    list(APPEND HEADER_FILES system/FileRepository.h)
-    list(APPEND SOURCE_FILES system/FileRepository.cpp)
-endif()
-
 if(NOT SOFA_NO_OPENGL)
     list(APPEND HEADER_FILES
         gl/Capture.h