Commit 5fd91a5d authored by Markus Mirz's avatar Markus Mirz
Browse files

updating docker and cmake

parent 5a2d3565
build/
build_linux/
build_osx/
build_win/
build*
Dependencies/libcps/build*
.git/
Dependencies/libcps/build/
Dependencies/libcps/build_osx/
Dependencies/libcps/build_linux/
Packaging/
option(CIMPP_DIR "CIM++ installation directory" ../CIMpp)
option(WITH_CIM_SUBMODULE "Build with CIMpp as submodule" OFF)
set(CIM_VERSION "16v29a")
set(USE_CIM_VERSION "IEC61970_16v29a")
include(FindPackageHandleStandardArgs)
if (WITH_CIM_SUBMODULE OR WIN32)
# When adding CIMpp via a subdirectory, all the neccessary
# details about include directories, library name and path
# are associated with the CIMpp target 'libcimpp'
# We therefore do not need to keep track of CIMPP_INCLUDE_DIR
# seperately
add_subdirectory(Dependencies/libcimpp)
set(CIMPP_LIBRARY libcimpp)
find_package_handle_standard_args(CIMpp DEFAULT_MSG CIMPP_LIBRARY)
else()
find_path(CIMPP_INCLUDE_DIR
NAMES CIMModel.hpp
PATH_SUFFIXES
cimpp/${CIM_VERSION}
${CIM_VERSION}
include/src
PATHS
${CIMPP_DIR}
../CIMpp
)
find_library(CIMPP_LIBRARY
NAMES cimpp${CIM_VERSION}
PATH_SUFFIXES
lib/static
Debug
Release
PATHS
${CIMPP_DIR}
../CIMpp
)
# handle the QUIETLY and REQUIRED arguments and set CIMPP_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(CIMpp DEFAULT_MSG CIMPP_LIBRARY CIMPP_INCLUDE_DIR)
mark_as_advanced(CIMPP_INCLUDE_DIR)
endif()
mark_as_advanced(CIMPP_LIBRARY)
set(CIMPP_LIBRARIES ${CIMPP_LIBRARY} ${ARABICA_LIBRARY})
set(CIMPP_INCLUDE_DIRS ${CIMPP_INCLUDE_DIR} ${ARABICA_INCLUDE_DIR})
\ No newline at end of file
Subproject commit 9af3c3410d57f527d49bfe55f09a475e3cc641eb
Subproject commit 4475fefff9f7b1cbc83a819b80ee69272b75666c
......@@ -40,7 +40,9 @@ RUN dnf -y install \
villas-node-devel \
expat-devel \
graphviz-devel \
libcimpp16v29a
libcimpp16v29a \
spdlog \
sundials
ENV LD_LIBRARY_PATH /usr/local/lib64
......
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