Skip to content
Snippets Groups Projects
Commit ff43bf63 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

adapt TestCoreStd and TestPyStd to the now removed Core-ParticleDistribution

parent 2a60307d
No related branches found
No related tags found
1 merge request!65Refactor Distribution Handling
...@@ -25,6 +25,7 @@ set(test TestCoreStd) ...@@ -25,6 +25,7 @@ set(test TestCoreStd)
set(source_files Check.cpp ../../Std/Run.cpp ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp) set(source_files Check.cpp ../../Std/Run.cpp ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files}) add_executable(${test} ${source_files})
target_compile_definitions(${test} PUBLIC DISABLE_DISTRIBUTION_TESTS)
target_include_directories(${test} PUBLIC target_include_directories(${test} PUBLIC
${BornAgainCore_INCLUDE_DIRS} ${BornAgainCore_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include) ${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include)
......
...@@ -27,6 +27,7 @@ set(source_files Check.cpp ../Std/Run.cpp ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper ...@@ -27,6 +27,7 @@ set(source_files Check.cpp ../Std/Run.cpp ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper
add_executable(${test} ${source_files}) add_executable(${test} ${source_files})
target_compile_options(${test} PUBLIC -DPYTHON_STD_TEST) target_compile_options(${test} PUBLIC -DPYTHON_STD_TEST)
target_compile_definitions(${test} PUBLIC DISABLE_DISTRIBUTION_TESTS)
target_include_directories(${test} PUBLIC target_include_directories(${test} PUBLIC
${BornAgainCore_INCLUDE_DIRS} ${BornAgainCore_INCLUDE_DIRS}
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "Sample/Multilayer/Layer.h" #include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h" #include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h" #include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleDistribution.h"
#include "Sample/StandardSamples/CylindersBuilder.h" #include "Sample/StandardSamples/CylindersBuilder.h"
namespace { namespace {
......
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