fix build system : make eo/edo tests work
This commit is contained in:
Johann Dreo
parent
0829afceb9
commit
06ff0b682b
17 changed files with 328 additions and 326 deletions
|
|
@ -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}")
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
|
|
@ -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}")
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
|
|
@ -2,34 +2,34 @@
|
|||
### 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 eompi target
|
||||
######################################################################################
|
||||
|
||||
SET(EOMPI_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
|
||||
SET(LIBRARY_OUTPUT_PATH ${EOMPI_LIB_OUTPUT_PATH})
|
||||
set(EOMPI_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
|
||||
set(LIBRARY_OUTPUT_PATH ${EOMPI_LIB_OUTPUT_PATH})
|
||||
|
||||
SET(EOMPI_SOURCES
|
||||
set(EOMPI_SOURCES
|
||||
eoMpi.cpp
|
||||
eoMpiAssignmentAlgorithm.cpp
|
||||
eoMpiNode.cpp
|
||||
implMpi.cpp
|
||||
)
|
||||
|
||||
ADD_LIBRARY(eompi STATIC ${EOMPI_SOURCES})
|
||||
INSTALL(TARGETS eompi ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
|
||||
add_library(eompi STATIC ${EOMPI_SOURCES})
|
||||
install(TARGETS eompi ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
|
||||
|
||||
FILE(GLOB HDRS *.h)
|
||||
INSTALL(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/eo/mpi COMPONENT headers)
|
||||
file(GLOB HDRS *.h)
|
||||
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/eo/mpi COMPONENT headers)
|
||||
|
||||
######################################################################################
|
||||
### 3) Optionnal
|
||||
######################################################################################
|
||||
|
||||
SET(EOMPI_VERSION ${GLOBAL_VERSION})
|
||||
SET_TARGET_PROPERTIES(eompi PROPERTIES VERSION "${EOMPI_VERSION}")
|
||||
set(EOMPI_VERSION ${GLOBAL_VERSION})
|
||||
set_target_properties(eompi PROPERTIES VERSION "${EOMPI_VERSION}")
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
|
|
@ -15,49 +15,49 @@
|
|||
#
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
|
||||
cmake_minimum_required(VERSION 2.8)
|
||||
|
||||
PROJECT(PyEO)
|
||||
project(PyEO)
|
||||
|
||||
FIND_PACKAGE(Boost 1.42 COMPONENTS python)
|
||||
FIND_PACKAGE(PythonLibs)
|
||||
find_package(Boost 1.42 COMPONENTS python)
|
||||
find_package(PythonLibs)
|
||||
|
||||
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
|
||||
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
include_directories(${PYTHON_INCLUDE_PATH})
|
||||
|
||||
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
|
||||
link_directories(${Boost_LIBRARY_DIRS})
|
||||
|
||||
IF(APPLE)
|
||||
if(APPLE)
|
||||
# osx internal
|
||||
FIND_LIBRARY(APPLE_CARBON Carbon)
|
||||
ENDIF(APPLE)
|
||||
find_library(APPLE_CARBON Carbon)
|
||||
endif(APPLE)
|
||||
|
||||
# includes
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
#INCLUDE_DIRECTORIES(../)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
#include_directories(../)
|
||||
|
||||
# source
|
||||
FILE(GLOB SOURCES *.cpp)
|
||||
file(GLOB SOURCES *.cpp)
|
||||
|
||||
# EO dependencies
|
||||
SET(EO_SOURCES
|
||||
${EO_SOURCE_DIR}/src/eoFunctorStore.cpp
|
||||
${EO_SOURCE_DIR}/src/utils/eoLogger.cpp
|
||||
${EO_SOURCE_DIR}/src/utils/eoParallel.cpp
|
||||
set(EO_SOURCES
|
||||
${EO_SRC_DIR}/src/eoFunctorStore.cpp
|
||||
${EO_SRC_DIR}/src/utils/eoLogger.cpp
|
||||
${EO_SRC_DIR}/src/utils/eoParallel.cpp
|
||||
)
|
||||
|
||||
# shared library
|
||||
ADD_LIBRARY(PyEO MODULE ${SOURCES} ${EO_SOURCES})
|
||||
INSTALL(TARGETS PyEO LIBRARY DESTINATION local/${LIB} COMPONENT libraries)
|
||||
add_library(PyEO MODULE ${SOURCES} ${EO_SOURCES})
|
||||
install(TARGETS PyEO LIBRARY DESTINATION local/${LIB} COMPONENT libraries)
|
||||
|
||||
# python 2.5 must have pyd
|
||||
IF(WIN32 AND NOT CYGWIN)
|
||||
SET_TARGET_PROPERTIES(PyEO PROPERTIES SUFFIX ".pyd")
|
||||
ENDIF(WIN32 AND NOT CYGWIN)
|
||||
if(WIN32 AND NOT CYGWIN)
|
||||
set_target_properties(PyEO PROPERTIES SUFFIX ".pyd")
|
||||
endif(WIN32 AND NOT CYGWIN)
|
||||
|
||||
# add the libs
|
||||
IF(APPLE)
|
||||
TARGET_LINK_LIBRARIES(PyEO ${APPLE_CARBON} ${PYTHON_LIBRARY} ${Boost_LIBRARIES})
|
||||
ELSE(APPLE)
|
||||
TARGET_LINK_LIBRARIES(PyEO ${PYTHON_LIBRARY} ${Boost_LIBRARIES})
|
||||
ENDIF(APPLE)
|
||||
if(APPLE)
|
||||
target_link_libraries(PyEO ${APPLE_CARBON} ${PYTHON_LIBRARY} ${Boost_LIBRARIES})
|
||||
else(APPLE)
|
||||
target_link_libraries(PyEO ${PYTHON_LIBRARY} ${Boost_LIBRARIES})
|
||||
endif(APPLE)
|
||||
|
|
|
|||
|
|
@ -2,34 +2,34 @@
|
|||
### 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 eoserial target
|
||||
######################################################################################
|
||||
|
||||
SET(EOSERIAL_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
|
||||
SET(LIBRARY_OUTPUT_PATH ${EOSERIAL_LIB_OUTPUT_PATH})
|
||||
set(EOSERIAL_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
|
||||
set(LIBRARY_OUTPUT_PATH ${EOSERIAL_LIB_OUTPUT_PATH})
|
||||
|
||||
SET(EOSERIAL_SOURCES
|
||||
set(EOSERIAL_SOURCES
|
||||
Array.cpp
|
||||
Object.cpp
|
||||
Parser.cpp
|
||||
String.cpp
|
||||
)
|
||||
|
||||
ADD_LIBRARY(eoserial STATIC ${EOSERIAL_SOURCES})
|
||||
INSTALL(TARGETS eoserial ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
add_library(eoserial STATIC ${EOSERIAL_SOURCES})
|
||||
install(TARGETS eoserial ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
|
||||
FILE(GLOB HDRS *.h)
|
||||
INSTALL(FILES ${HDRS} DESTINATION include/eo/serial COMPONENT headers)
|
||||
file(GLOB HDRS *.h)
|
||||
install(FILES ${HDRS} DESTINATION include/eo/serial COMPONENT headers)
|
||||
|
||||
######################################################################################
|
||||
### 3) Optionnal
|
||||
######################################################################################
|
||||
|
||||
SET(EOSERIAL_VERSION ${GLOBAL_VERSION})
|
||||
SET_TARGET_PROPERTIES(eoserial PROPERTIES VERSION "${EOSERIAL_VERSION}")
|
||||
set(EOSERIAL_VERSION ${GLOBAL_VERSION})
|
||||
set_target_properties(eoserial PROPERTIES VERSION "${EOSERIAL_VERSION}")
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
|
|
@ -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(EOUTILS_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
|
||||
SET(LIBRARY_OUTPUT_PATH ${EOUTILS_LIB_OUTPUT_PATH})
|
||||
set(EOUTILS_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
|
||||
set(LIBRARY_OUTPUT_PATH ${EOUTILS_LIB_OUTPUT_PATH})
|
||||
|
||||
SET(EOUTILS_SOURCES
|
||||
set(EOUTILS_SOURCES
|
||||
eoData.cpp
|
||||
eoFileMonitor.cpp
|
||||
eoGnuplot.cpp
|
||||
|
|
@ -32,15 +32,15 @@ SET(EOUTILS_SOURCES
|
|||
eoSignal.cpp
|
||||
)
|
||||
|
||||
ADD_LIBRARY(eoutils STATIC ${EOUTILS_SOURCES})
|
||||
INSTALL(TARGETS eoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
|
||||
add_library(eoutils STATIC ${EOUTILS_SOURCES})
|
||||
install(TARGETS eoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
|
||||
|
||||
|
||||
######################################################################################
|
||||
### 3) Optionnal
|
||||
######################################################################################
|
||||
|
||||
SET(EOUTILS_VERSION ${GLOBAL_VERSION})
|
||||
SET_TARGET_PROPERTIES(eoutils PROPERTIES VERSION "${EOUTILS_VERSION}")
|
||||
set(EOUTILS_VERSION ${GLOBAL_VERSION})
|
||||
set_target_properties(eoutils PROPERTIES VERSION "${EOUTILS_VERSION}")
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue