Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lib4neuro
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MolDyn
lib4neuro
Commits
89d54dc0
Commit
89d54dc0
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Trying to fix Exprtk compilation with MSCV
parent
1893b05e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/CMakeLists.txt
+3
-16
3 additions, 16 deletions
src/CMakeLists.txt
src/examples/CMakeLists.txt
+0
-1
0 additions, 1 deletion
src/examples/CMakeLists.txt
with
3 additions
and
17 deletions
src/CMakeLists.txt
+
3
−
16
View file @
89d54dc0
...
...
@@ -38,9 +38,11 @@ if ("${BUILD_LIB}" STREQUAL "yes")
PUBLIC
${
Boost_INCLUDE_DIRS
}
${
ROOT_DIR
}
/include
${
EXPRTK_INCLUDE_DIR
}
PRIVATE
${
SRC_DIR
}
# ${Boost_INCLUDE_DIRS}
)
...
...
@@ -61,31 +63,16 @@ if ("${BUILD_LIB}" STREQUAL "yes")
message
(
FATAL_ERROR
"Only static linking of external dependencies is supported for Windows systems now!"
)
elseif
(
"
${
DEPENDENCIES_LINK_TYPE
}
"
STREQUAL
"static"
)
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"
)
add_library
(
${
PREFIX
}
boost_unit_test SHARED boost_test_lib_dummy.cpp
)
add_library
(
${
PREFIX
}
exprtk SHARED exprtk.cpp
)
endif
()
target_include_directories
(
${
PREFIX
}
boost_unit_test
PRIVATE
${
Boost_INCLUDE_DIRS
}
)
target_include_directories
(
${
PREFIX
}
exprtk
PRIVATE
${
EXPRTK_INCLUDE_DIR
}
)
target_compile_definitions
(
${
PREFIX
}
exprtk
PRIVATE
_ITERATOR_DEBUG_LEVEL=0
${
Boost_INCLUDE_DIRS
}
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
src/examples/CMakeLists.txt
+
0
−
1
View file @
89d54dc0
############
# EXAMPLES #
############
add_executable
(
test_cases main.cpp
)
target_link_libraries
(
test_cases PUBLIC lib4neuro
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment