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

fix build system : make eo/edo tests work

Browse source
This commit is contained in:
Johann Dreo 2012-10-07 19:48:15 +02:00
commit 06ff0b682b
17 changed files with 328 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

30
eo/src/es/CMakeLists.txt
View file

@ -2,19 +2,19 @@
### 1) Include the sources
######################################################################################
INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/src)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${EO_SRC_DIR}/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
######################################################################################
### 2) Define the es and cma targets
######################################################################################
SET(ES_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
SET(CMA_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
set(ES_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
set(CMA_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
SET(LIBRARY_OUTPUT_PATH ${ES_LIB_OUTPUT_PATH}) # the same output for the two libs
set(LIBRARY_OUTPUT_PATH ${ES_LIB_OUTPUT_PATH}) # the same output for the two libs
SET(ES_SOURCES
set(ES_SOURCES
make_algo_scalar_es.cpp
make_algo_scalar_real.cpp
make_checkpoint_es.cpp
@ -31,26 +31,26 @@ SET(ES_SOURCES
make_run_real.cpp
)
SET(CMA_SOURCES
set(CMA_SOURCES
eig.cpp
CMAState.cpp
CMAParams.cpp
)
ADD_LIBRARY(es STATIC ${ES_SOURCES})
INSTALL(TARGETS es ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
add_library(es STATIC ${ES_SOURCES})
install(TARGETS es ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
ADD_LIBRARY(cma STATIC ${CMA_SOURCES})
INSTALL(TARGETS cma ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
add_library(cma STATIC ${CMA_SOURCES})
install(TARGETS cma ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
######################################################################################
### 3) Optionnal
######################################################################################
SET(ES_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(es PROPERTIES VERSION "${ES_VERSION}")
set(ES_VERSION ${GLOBAL_VERSION})
set_target_properties(es PROPERTIES VERSION "${ES_VERSION}")
SET(CMA_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(cma PROPERTIES VERSION "${CMA_VERSION}")
set(CMA_VERSION ${GLOBAL_VERSION})
set_target_properties(cma PROPERTIES VERSION "${CMA_VERSION}")
######################################################################################