From cbb816928b5578540c882c5e5cab60722dca0bd6 Mon Sep 17 00:00:00 2001 From: Lamar Moore <lamar.moore@stfc.ac.uk> Date: Thu, 28 Sep 2017 12:57:01 +0100 Subject: [PATCH] fix cmake issues #20436 --- Framework/Kernel/CMakeLists.txt | 2 -- Framework/Types/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Framework/Kernel/CMakeLists.txt b/Framework/Kernel/CMakeLists.txt index 518825309a2..49409f47069 100644 --- a/Framework/Kernel/CMakeLists.txt +++ b/Framework/Kernel/CMakeLists.txt @@ -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 diff --git a/Framework/Types/CMakeLists.txt b/Framework/Types/CMakeLists.txt index ecc2512f5ef..1fad5074f4b 100644 --- a/Framework/Types/CMakeLists.txt +++ b/Framework/Types/CMakeLists.txt @@ -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 -- GitLab