Skip to content
Snippets Groups Projects
Commit 89d54dc0 authored by Martin Beseda's avatar Martin Beseda
Browse files

FIX: Trying to fix Exprtk compilation with MSCV

parent 1893b05e
No related branches found
No related tags found
No related merge requests found
...@@ -38,9 +38,11 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -38,9 +38,11 @@ if ("${BUILD_LIB}" STREQUAL "yes")
PUBLIC PUBLIC
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${ROOT_DIR}/include ${ROOT_DIR}/include
${EXPRTK_INCLUDE_DIR}
PRIVATE PRIVATE
${SRC_DIR} ${SRC_DIR}
# ${Boost_INCLUDE_DIRS} # ${Boost_INCLUDE_DIRS}
) )
...@@ -61,31 +63,16 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -61,31 +63,16 @@ if ("${BUILD_LIB}" STREQUAL "yes")
message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!") message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!")
elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static") elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
add_library(${PREFIX}boost_unit_test STATIC boost_test_lib_dummy.cpp) add_library(${PREFIX}boost_unit_test STATIC boost_test_lib_dummy.cpp)
add_library(${PREFIX}exprtk STATIC exprtk.cpp)
elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared") elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
add_library(${PREFIX}boost_unit_test SHARED boost_test_lib_dummy.cpp) add_library(${PREFIX}boost_unit_test SHARED boost_test_lib_dummy.cpp)
add_library(${PREFIX}exprtk SHARED exprtk.cpp)
endif() endif()
target_include_directories( target_include_directories(
${PREFIX}boost_unit_test ${PREFIX}boost_unit_test
PRIVATE
${Boost_INCLUDE_DIRS}
)
target_include_directories(
${PREFIX}exprtk
PRIVATE PRIVATE
${EXPRTK_INCLUDE_DIR} ${EXPRTK_INCLUDE_DIR}
) ${Boost_INCLUDE_DIRS}
target_compile_definitions(
${PREFIX}exprtk
PRIVATE
_ITERATOR_DEBUG_LEVEL=0
) )
endif () endif ()
......
############ ############
# EXAMPLES # # EXAMPLES #
############ ############
add_executable(test_cases main.cpp) add_executable(test_cases main.cpp)
target_link_libraries(test_cases PUBLIC lib4neuro) target_link_libraries(test_cases PUBLIC lib4neuro)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment