Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SofaKernel] Fix FileRepository should not be optional #122

Merged
merged 2 commits into from
Jan 31, 2017
Merged

[SofaKernel] Fix FileRepository should not be optional #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
586820f
[SofaKernel] FIX FileRepository is used by too many components to be …
Jan 9, 2017
6454b77
[SofaKernel] FIX find_package commands do not cumulate
Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions SofaKernel/SofaFramework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
7 changes: 2 additions & 5 deletions SofaKernel/framework/sofa/helper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,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
Expand Down Expand Up @@ -180,6 +181,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
Expand Down Expand Up @@ -219,11 +221,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
Expand Down