nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some modifications for EDO

Browse source 
You have to sove this problems:
EDO: t-dispatcher-round (commented)
MOOE: Lesson4 (commented)
MO: t-moRndIndexedVectorTabuList (commented)
This commit is contained in:
canape 2013-02-07 14:43:11 +01:00
commit 23df679f51
11 changed files with 84 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

52
edo/CMakeLists.txt
View file

@ -1,33 +1,25 @@
IF(EDO_USE_LIB STREQUAL "uBLAS")
FIND_PACKAGE(Boost )
IF( Boost_FOUND )
INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} )
ADD_DEFINITIONS( -DWITH_BOOST )
ELSE()
MESSAGE( "ERROR: You asked for Boost::uBLAS but it has not been found." )
SET(IS_FATAL 1)
ENDIF()
ELSEIF( EDO_USE_LIB STREQUAL "Eigen3" )
# FIXME FindEigen3.cmake does not work
#find_package(Eigen3)
#include_directories(EIGEN3_INCLUDE_DIR)
SET( EIGEN3_FOUND 1)
SET( EIGEN3_INCLUDE_DIR "/usr/include/eigen3/" )
if(EDO_USE_LIB STREQUAL "uBLAS")
find_package(Boost)
if(Boost_FOUND)
include_directories( ${Boost_INCLUDE_DIRS} )
add_definitions( -DWITH_BOOST )
else()
message(FATAL_ERROR "\n\nERROR: You asked for Boost::uBLAS but it has not been found.\n" )
endif()
elseif(EDO_USE_LIB STREQUAL "Eigen3")
find_package(Eigen3)
if(EIGEN3_FOUND)
include_directories(EIGEN3_INCLUDE_DIR)
add_definitions( -DWITH_EIGEN )
else()
message(FATAL_ERROR "\n\nERROR: You asked for Eigen3 but it has not been found.\n" )
endif()
IF( EIGEN3_FOUND )
INCLUDE_DIRECTORIES( ${EIGEN3_INCLUDE_DIR} )
ADD_DEFINITIONS( -DWITH_EIGEN )
ELSE()
MESSAGE( "ERROR: You asked for Eigen3 but it has not been found." )
SET(IS_FATAL 1)
ENDIF()
ELSE()
else()
# FIXME ideally, we would have a minimal implementation with STL vectors…
MESSAGE( "You must set EDO_USE_LIB to either 'uBLAS' or 'Eigen3'." )
SET(IS_FATAL 1)
ENDIF()
message(FATAL_ERROR "\n\nYou must set EDO_USE_LIB to either 'uBLAS' or 'Eigen3'.\n" )
endif()
######################################################################################
@ -37,14 +29,14 @@ ENDIF()
add_subdirectory(doc)
add_subdirectory(src)
if(ENABLE_CMAKE_TESTING)
if(ENABLE_CMAKE_TESTING AND EIGEN3_FOUND) # see edoNormalAdaptive
add_subdirectory(test)
endif(ENABLE_CMAKE_TESTING)
endif()
if(ENABLE_CMAKE_EXAMPLE)
if(${CMAKE_VERBOSE_MAKEFILE})
message("EDO examples:")
endif(${CMAKE_VERBOSE_MAKEFILE})
add_subdirectory(application)
endif(ENABLE_CMAKE_EXAMPLE)
endif()