Commit b74ace82 authored by kraus's avatar kraus

Merge branch 'master' of gitlab.psi.ch:OPAL/src

parents b3100be4 2c1e1977
......@@ -130,7 +130,7 @@ available in \opalt. Similar icons are used for the other flavours.
\include{fieldemission} % ch 16
\include{multipact} % ch 17
\include{partmatter} % ch 18
\include{optimiser} % ch 19
%opal-map
\ifthenelse{\boolean{ShowMap}}{
\include{opal-flavours} % ch 4
......
\input{header}
\chapter{Multi Objective Optimisation}
\label{chp:moo}
\index{Multi Objective Optimisation|(}
\input{footer}
\ No newline at end of file
......@@ -82,7 +82,7 @@ set(Boost_USE_STATIC_LIBS ON)
set(BOOST_NO_SYSTEM_PATHS TRUE)
set(BOOST_INCLUDEDIR $ENV{BOOST_HOME})
set(BOOST_LIBRARYDIR $ENV{BOOST_HOME}}/lib)
find_package (Boost 1.55.0 REQUIRED chrono filesystem regex serialization system iostreams)
find_package (Boost 1.54.0 REQUIRED chrono filesystem regex serialization system iostreams)
if (Boost_INCLUDE_DIRS)
message (STATUS "Boost include dirs: ${Boost_INCLUDE_DIRS}")
include_directories (${Boost_INCLUDE_DIRS})
......@@ -197,9 +197,18 @@ find_package(Doxygen)
if (DOXYGEN_FOUND)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
IF (NOT OPTP_USED_FROM_OPAL)
add_custom_target(doc
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generating API documentation with Doxygen" VERBATIM
)
ELSE ()
add_custom_target(optpilot-doc
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generating API documentation with Doxygen" VERBATIM
)
ENDIF()
endif(DOXYGEN_FOUND)
\ No newline at end of file
......@@ -25,28 +25,33 @@ link_directories (
${PYTHON_LIBRARIES}
)
set (OPT_PILOT_SOURCE_DIR ${CMAKE_SOURCE_DIR})
IF (OPTP_USED_FROM_OPAL)
set (OPT_PILOT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/opt-pilot)
ENDIF()
set (ExpressionTest_SRC
${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
)
set (SumErrSqExpressionTest_SRC
${CMAKE_SOURCE_DIR}/Expression/SumErrSq.cpp
${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/SumErrSq.cpp
${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
)
set (FromFileExpressionTest_SRC
${CMAKE_SOURCE_DIR}/Expression/FromFile.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/FromFile.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
)
set (PythonExprTest_SRC
${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
)
......@@ -54,11 +59,11 @@ set (HashNameGeneratorTest_SRC
)
set (CmdArgumentsTest_SRC
${CMAKE_SOURCE_DIR}/Util/CmdArguments.cpp
${OPT_PILOT_SOURCE_DIR}/Util/CmdArguments.cpp
)
set (MPIHelperTest_SRC
${CMAKE_SOURCE_DIR}/Util/MPIHelper.cpp
${OPT_PILOT_SOURCE_DIR}/Util/MPIHelper.cpp
)
set (ManagedIDsTest_SRC
......@@ -71,16 +76,16 @@ set (PopulationTest_SRC
)
set (SDDSParserTest_SRC
${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
)
set (OpalInputFileParserTest_SRC
${CMAKE_SOURCE_DIR}/Expression/SumErrSq.cpp
${CMAKE_SOURCE_DIR}/Expression/FromFile.cpp
${CMAKE_SOURCE_DIR}/Util/SDDSReader.cpp
${CMAKE_SOURCE_DIR}/Util/CommentAnnotatedInputFileParser.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/expression.cpp
${CMAKE_SOURCE_DIR}/Expression/Parser/evaluator.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/SumErrSq.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/FromFile.cpp
${OPT_PILOT_SOURCE_DIR}/Util/SDDSReader.cpp
${OPT_PILOT_SOURCE_DIR}/Util/CommentAnnotatedInputFileParser.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/expression.cpp
${OPT_PILOT_SOURCE_DIR}/Expression/Parser/evaluator.cpp
)
set (PILOT_TESTS
......@@ -123,7 +128,7 @@ ENDFOREACH(test ${PILOT_TESTS})
#HACK: link resources dir to test dir
if (NOT EXISTS ${PROJECT_BINARY_DIR}/Tests/resources)
EXECUTE_PROCESS(
COMMAND ln -s ${CMAKE_SOURCE_DIR}/Tests/resources ${PROJECT_BINARY_DIR}/Tests/
COMMAND ln -s ${OPT_PILOT_SOURCE_DIR}/Tests/resources ${PROJECT_BINARY_DIR}/Tests/
OUTPUT_VARIABLE LN_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
endif()
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment