fix build system : make eo/edo tests work

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

View file

@ -2,17 +2,17 @@
### 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 ga target
######################################################################################
SET(GA_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
SET(LIBRARY_OUTPUT_PATH ${GA_LIB_OUTPUT_PATH})
set(GA_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
set(LIBRARY_OUTPUT_PATH ${GA_LIB_OUTPUT_PATH})
SET(GA_SOURCES
set(GA_SOURCES
make_algo_scalar_ga.cpp
make_checkpoint_ga.cpp
make_continue_ga.cpp
@ -22,17 +22,17 @@ SET(GA_SOURCES
make_run_ga.cpp
)
ADD_LIBRARY(ga STATIC ${GA_SOURCES})
INSTALL(TARGETS ga ARCHIVE DESTINATION lib COMPONENT libraries)
add_library(ga STATIC ${GA_SOURCES})
install(TARGETS ga ARCHIVE DESTINATION lib COMPONENT libraries)
FILE(GLOB HDRS *.h)
INSTALL(FILES ${HDRS} DESTINATION include/eo/ga COMPONENT headers)
file(GLOB HDRS *.h)
install(FILES ${HDRS} DESTINATION include/eo/ga COMPONENT headers)
######################################################################################
### 3) Optionnal
######################################################################################
SET(GA_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(ga PROPERTIES VERSION "${GA_VERSION}")
set(GA_VERSION ${GLOBAL_VERSION})
set_target_properties(ga PROPERTIES VERSION "${GA_VERSION}")
######################################################################################