Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review 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
mantidproject
mantid
Commits
cbb81692
Commit
cbb81692
authored
7 years ago
by
Lamar Moore
Browse files
Options
Downloads
Patches
Plain Diff
fix cmake issues #20436
parent
4040afb9
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Kernel/CMakeLists.txt
+0
-2
0 additions, 2 deletions
Framework/Kernel/CMakeLists.txt
Framework/Types/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Framework/Types/CMakeLists.txt
with
1 addition
and
3 deletions
Framework/Kernel/CMakeLists.txt
+
0
−
2
View file @
cbb81692
...
...
@@ -109,7 +109,6 @@ set ( SRC_FILES
src/ThreadPool.cpp
src/ThreadPoolRunnable.cpp
src/ThreadSafeLogStream.cpp
src/TimeInterval.cpp
src/TimeSeriesProperty.cpp
src/TimeSplitter.cpp
src/Timer.cpp
...
...
@@ -287,7 +286,6 @@ set ( INC_FILES
inc/MantidKernel/ThreadSafeLogStream.h
inc/MantidKernel/ThreadScheduler.h
inc/MantidKernel/ThreadSchedulerMutexes.h
inc/MantidKernel/TimeInterval.h
inc/MantidKernel/TimeSeriesProperty.h
inc/MantidKernel/TimeSplitter.h
inc/MantidKernel/Timer.h
...
...
This diff is collapsed.
Click to expand it.
Framework/Types/CMakeLists.txt
+
1
−
1
View file @
cbb81692
...
...
@@ -31,7 +31,7 @@ set_target_properties ( Types PROPERTIES OUTPUT_NAME MantidTypes
set_property
(
TARGET Types PROPERTY FOLDER
"MantidFramework"
)
target_link_libraries
(
Types LINK_PUBLIC
${
Boost_LIBRARIES
}
)
target_include_directories
(
Types PUBLIC
$<BUILD_INTERFACE:
${
CMAKE_BINARY_DIR
}
/Framework/Types
>
)
target_include_directories
(
Types PUBLIC
${
CMAKE_BINARY_DIR
}
/Framework/Types
)
#Auto-generate exports header
generate_mantid_export_header
(
Types
)
# Add the unit tests directory
...
...
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