Commit 1c35e1a4 authored by gsell's avatar gsell

merge conflicts resolved

parents 4692927b 7d426def
......@@ -11,3 +11,11 @@ SET (_EXPR_SRCS
)
add_sources(${_EXPR_SRCS})
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -133,3 +133,11 @@ if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/resources)
OUTPUT_VARIABLE LN_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -19,3 +19,11 @@ SET (_UTIL_SRCS
)
add_sources(${_UTIL_SRCS})
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
add_subdirectory( wfgHypervolume )
add_subdirectory (wfgHypervolume)
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
add_library(wfgHypervolume hypervolume.cpp avl.cpp read.cpp)
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
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