Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Simox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
Simox
Commits
47f716ee
Commit
47f716ee
authored
4 years ago
by
Raphael Grimm
Browse files
Options
Downloads
Patches
Plain Diff
Fix bug where boost includes SimoxUtility/math.h
parent
066a9e2b
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
SimoxUtility/CMakeLists.txt
+2
-2
2 additions, 2 deletions
SimoxUtility/CMakeLists.txt
SimoxUtility/tests/CMakeLists.txt
+0
-1
0 additions, 1 deletion
SimoxUtility/tests/CMakeLists.txt
with
2 additions
and
3 deletions
SimoxUtility/CMakeLists.txt
+
2
−
2
View file @
47f716ee
PROJECT
(
SimoxUtility
)
set
(
CMAKE_INCLUDE_CURRENT_DIR OFF
)
add_library
(
SimoxUtility SHARED
)
# SimoxUtility.h) # sources will be added later
target_include_directories
(
SimoxUtility PUBLIC
...
...
@@ -24,8 +25,7 @@ target_link_libraries(SimoxUtility PUBLIC
Boost::regex
)
target_compile_options
(
SimoxUtility PRIVATE -include eigen/AssertAsException.h
)
target_compile_options
(
SimoxUtility INTERFACE -include SimoxUtility/eigen/AssertAsException.h
)
target_compile_options
(
SimoxUtility PUBLIC -include SimoxUtility/eigen/AssertAsException.h
)
# disable boost auto linking
if
(
Boost_USE_STATIC_LIBS
)
...
...
This diff is collapsed.
Click to expand it.
SimoxUtility/tests/CMakeLists.txt
+
0
−
1
View file @
47f716ee
...
...
@@ -19,7 +19,6 @@ MACRO(ADD_SU_TEST TEST_NAME)
ADD_EXECUTABLE
(
${
TRG_NAME
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
TEST_NAME
}
.cpp
)
TARGET_LINK_LIBRARIES
(
${
TRG_NAME
}
PRIVATE SimoxUtility Boost::unit_test_framework
)
target_include_directories
(
${
TRG_NAME
}
PRIVATE
${
PROJECT_SOURCE_DIR
}
${
PROJECT_SOURCE_DIR
}
/..
)
if
(
NOT Boost_USE_STATIC_LIBS
)
target_compile_definitions
(
${
TRG_NAME
}
PRIVATE -DBOOST_TEST_DYN_LINK
)
endif
()
...
...
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