Commit ce96397b authored by Floris Berendsen's avatar Floris Berendsen
Browse files

COMP: BUG: WIP: cmake module system performed add_library twice. Improperly merged?

parent 49579641
......@@ -109,11 +109,6 @@ macro( _selxmodule_enable MODULE UPSTREAM )
list( APPEND SUPERELASTIX_TEST_SOURCE_FILES ${${MODULE}_TEST_SOURCE_FILES} )
endif()
# Header-only modules should not be compiled
if( ${MODULE}_SOURCE_FILES )
add_library( ${MODULE} ${${MODULE}_HEADER_FILES} ${${MODULE}_SOURCE_FILES} )
endif()
if( ${MODULE}_LIBRARIES )
list( APPEND SUPERELASTIX_LIBRARIES ${${MODULE}_LIBRARIES} )
endif()
......
......@@ -121,9 +121,9 @@ set( Boost_USE_MULTITHREADED ON )
set( Boost_USE_STATIC_RUNTIME OFF )
# TODO: These are hardcoded for the SuperBuild
set( BOOST_INCLUDEDIR "${BOOST_ROOT}/BOOST-prefix/src/Boost/boost/" )
set( BOOST_LIBRARYDIR "${BOOST_ROOT}/BOOST-prefix/src/Boost/stage/lib/" )
set( BOOST_ROOT "${BOOST_ROOT}/BOOST-prefix/src/Boost/" )
# set( BOOST_INCLUDEDIR "${BOOST_ROOT}/BOOST-prefix/src/Boost/boost/" )
# set( BOOST_LIBRARYDIR "${BOOST_ROOT}/BOOST-prefix/src/Boost/stage/lib/" )
# set( BOOST_ROOT "${BOOST_ROOT}/BOOST-prefix/src/Boost/" )
find_package( Boost COMPONENTS filesystem system log date_time thread regex REQUIRED QUIET ) # graph ?
include_directories( ${Boost_INCLUDE_DIRS} )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment