fix build system : make eo/edo tests work
This commit is contained in:
parent
0829afceb9
commit
06ff0b682b
17 changed files with 328 additions and 326 deletions
|
|
@ -9,22 +9,22 @@
|
|||
### 1) Include the sources
|
||||
######################################################################################
|
||||
|
||||
INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/src)
|
||||
INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/contrib)
|
||||
INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/contrib/MGE)
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
include_directories(${EO_SRC_DIR}/src)
|
||||
include_directories(${EO_SRC_DIR}/contrib)
|
||||
include_directories(${EO_SRC_DIR}/contrib/MGE)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
######################################################################################
|
||||
### 2) Specify where CMake can find the libraries
|
||||
######################################################################################
|
||||
|
||||
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
|
||||
link_directories(${EO_BIN_DIR}/lib)
|
||||
|
||||
######################################################################################
|
||||
### 3) Define your targets and link the librairies
|
||||
######################################################################################
|
||||
|
||||
SET (TEST_LIST
|
||||
set (TEST_LIST
|
||||
t-eofitness
|
||||
t-eoRandom
|
||||
t-eobin
|
||||
|
|
@ -72,45 +72,45 @@ SET (TEST_LIST
|
|||
)
|
||||
|
||||
|
||||
FOREACH (test ${TEST_LIST})
|
||||
SET ("T_${test}_SOURCES" "${test}.cpp")
|
||||
ENDFOREACH (test)
|
||||
foreach (test ${TEST_LIST})
|
||||
set ("T_${test}_SOURCES" "${test}.cpp")
|
||||
endforeach (test)
|
||||
|
||||
|
||||
IF(ENABLE_MINIMAL_CMAKE_TESTING)
|
||||
if(ENABLE_MINIMAL_CMAKE_TESTING)
|
||||
|
||||
SET (MIN_TEST_LIST t-eoEasyPSO)
|
||||
FOREACH (mintest ${MIN_TEST_LIST})
|
||||
SET ("T_${mintest}_SOURCES" "${mintest}.cpp")
|
||||
ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES})
|
||||
ADD_TEST(${mintest} ${mintest})
|
||||
TARGET_LINK_LIBRARIES(${mintest} ga es cma eoutils eo)
|
||||
ENDFOREACH (mintest)
|
||||
set (MIN_TEST_LIST t-eoEasyPSO)
|
||||
foreach (mintest ${MIN_TEST_LIST})
|
||||
set ("T_${mintest}_SOURCES" "${mintest}.cpp")
|
||||
add_executable(${mintest} ${T_${mintest}_SOURCES})
|
||||
add_test(${mintest} ${mintest})
|
||||
target_link_libraries(${mintest} ga es cma eoutils eo)
|
||||
endforeach (mintest)
|
||||
|
||||
ELSEIF(ENABLE_CMAKE_TESTING)
|
||||
elseif(ENABLE_CMAKE_TESTING)
|
||||
|
||||
FOREACH (test ${TEST_LIST})
|
||||
ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
|
||||
ADD_TEST(${test} ${test})
|
||||
TARGET_LINK_LIBRARIES(${test} ga es cma eoutils eo)
|
||||
INSTALL(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/test COMPONENT test)
|
||||
ENDFOREACH (test)
|
||||
foreach (test ${TEST_LIST})
|
||||
add_executable(${test} ${T_${test}_SOURCES})
|
||||
add_test(${test} ${test})
|
||||
target_link_libraries(${test} ga es cma eoutils eo)
|
||||
install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/test COMPONENT test)
|
||||
endforeach (test)
|
||||
|
||||
SET(RESOURCES
|
||||
set(RESOURCES
|
||||
boxplot.py
|
||||
boxplot_to_png.py
|
||||
boxplot_to_pdf.py
|
||||
t-openmp.py
|
||||
)
|
||||
|
||||
FOREACH(file ${RESOURCES})
|
||||
EXECUTE_PROCESS(
|
||||
foreach(file ${RESOURCES})
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/${file}
|
||||
${CMAKE_CURRENT_BINARY_DIR}/${file}
|
||||
)
|
||||
ENDFOREACH(file)
|
||||
endforeach(file)
|
||||
|
||||
ENDIF(ENABLE_MINIMAL_CMAKE_TESTING)
|
||||
endif(ENABLE_MINIMAL_CMAKE_TESTING)
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
|
|
@ -8,25 +8,25 @@
|
|||
### 1) Include the sources
|
||||
######################################################################################
|
||||
|
||||
MESSAGE("EO SOURCE DIR: ${EO_SOURCE_DIR}")
|
||||
MESSAGE("OMPI: ${MPI_DIR}")
|
||||
message("EO SOURCE DIR: ${EO_SRC_DIR}")
|
||||
message("OMPI: ${MPI_DIR}")
|
||||
|
||||
INCLUDE_DIRECTORIES(${MPI_DIR}/include)
|
||||
INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/src)
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
include_directories(${MPI_DIR}/include)
|
||||
include_directories(${EO_SRC_DIR}/src)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
######################################################################################
|
||||
### 2) Specify where CMake can find the libraries
|
||||
######################################################################################
|
||||
|
||||
LINK_DIRECTORIES(${EO_BIN_DIR}/lib)
|
||||
LINK_DIRECTORIES(${MPI_DIR}/lib)
|
||||
link_directories(${EO_BIN_DIR}/lib)
|
||||
link_directories(${MPI_DIR}/lib)
|
||||
|
||||
######################################################################################
|
||||
### 3) Define your targets and link the librairies
|
||||
######################################################################################
|
||||
|
||||
SET (TEST_LIST
|
||||
set (TEST_LIST
|
||||
t-mpi-parallelApply
|
||||
t-mpi-wrapper
|
||||
t-mpi-multipleRoles
|
||||
|
|
@ -35,20 +35,20 @@ SET (TEST_LIST
|
|||
t-mpi-distrib-exp
|
||||
)
|
||||
|
||||
FOREACH (test ${TEST_LIST})
|
||||
SET ("T_${test}_SOURCES" "${test}.cpp")
|
||||
ENDFOREACH (test)
|
||||
foreach (test ${TEST_LIST})
|
||||
set ("T_${test}_SOURCES" "${test}.cpp")
|
||||
endforeach (test)
|
||||
|
||||
SET(CMAKE_CXX_COMPILER "mpicxx")
|
||||
ADD_DEFINITIONS(-DWITH_MPI)
|
||||
set(CMAKE_CXX_COMPILER "mpicxx")
|
||||
add_definitions(-DWITH_MPI)
|
||||
|
||||
IF(ENABLE_CMAKE_TESTING)
|
||||
FOREACH (test ${TEST_LIST})
|
||||
ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
|
||||
ADD_TEST(${test} ${test})
|
||||
TARGET_LINK_LIBRARIES(${test} eoutils eompi eoserial eo)
|
||||
INSTALL(TARGETS ${test} RUNTIME DESTINATION share/eo/test COMPONENT test)
|
||||
ENDFOREACH (test)
|
||||
ENDIF()
|
||||
if(ENABLE_CMAKE_TESTING)
|
||||
foreach (test ${TEST_LIST})
|
||||
add_executable(${test} ${T_${test}_SOURCES})
|
||||
add_test(${test} ${test})
|
||||
target_link_libraries(${test} eoutils eompi eoserial eo)
|
||||
install(TARGETS ${test} RUNTIME DESTINATION share/eo/test COMPONENT test)
|
||||
endforeach (test)
|
||||
endif()
|
||||
|
||||
######################################################################################
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue