Split off reference directory PyCore

Tests/Functional/Python/PyCore/CMakeLists.txt

@@ -5,8 +5,6 @@
 set(OUTPUT_DIR ${TEST_OUTPUT_DIR_PY_CORE})
 file(MAKE_DIRECTORY ${OUTPUT_DIR})
 
-set(PYCORE_REFERENCE_DIR ${TEST_REFERENCE_DIR}/Python)
-
 file(GLOB sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.py")
 if(NOT BORNAGAIN_TIFF_SUPPORT)
     list(REMOVE_ITEM sources "intensitydata_io_tiff.py")

Tests/Functional/Python/PyCore/polmagcylinders2.py

@@ -8,8 +8,7 @@ from utils import get_difference
 
 from bornagain import *
 
-REFERENCE_DIR = "@TEST_REFERENCE_DIR@/Python"
-
+REFERENCE_DIR = "@TEST_REFERENCE_DIR_PY_CORE@"
 
 # ----------------------------------
 # describe sample and run simulation

Tests/Functional/Python/PyCore/utils.py

@@ -8,7 +8,7 @@ sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 from bornagain import deg, angstrom
 
-REFERENCE_DIR = "@PYCORE_REFERENCE_DIR@"
+REFERENCE_DIR = "@TEST_REFERENCE_DIR_PY_CORE@"
 
 
 def get_difference(data, reference):

cmake/BornAgain/Directories.cmake

@@ -3,9 +3,11 @@
 # -----------------------------------------------------------------------------
 
 set(WRAP_DIR ${CMAKE_SOURCE_DIR}/Wrap)
-set(TEST_REFERENCE_DIR ${CMAKE_SOURCE_DIR}/Tests/ReferenceData)
 set(PY_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/Examples/Python)
 
+set(TEST_REFERENCE_DIR         ${CMAKE_SOURCE_DIR}/Tests/ReferenceData)
+set(TEST_REFERENCE_DIR_PY_CORE ${CMAKE_SOURCE_DIR}/Tests/ReferenceData/PyCore)
+
 # -----------------------------------------------------------------------------
 # auto directories (refreshed when CONFIGURE options are set)
 # -----------------------------------------------------------------------------
@@ -18,23 +20,23 @@ file(MAKE_DIRECTORY ${AUTO_DIR})
 # output directories
 # -----------------------------------------------------------------------------
 
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY         ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY         ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
 set(BUILD_VAR_DIR ${CMAKE_BINARY_DIR}/var)
 set(BUILD_INC_DIR ${CMAKE_BINARY_DIR}/inc)
 set(BUILD_SRC_DIR ${CMAKE_BINARY_DIR}/src)
 
-set(TEST_OUTPUT_DIR ${CMAKE_BINARY_DIR}/test_output)
-set(TEST_OUTPUT_DIR_CORE ${CMAKE_BINARY_DIR}/test_output/Core)
+set(TEST_OUTPUT_DIR             ${CMAKE_BINARY_DIR}/test_output)
+set(TEST_OUTPUT_DIR_CORE        ${CMAKE_BINARY_DIR}/test_output/Core)
 set(TEST_OUTPUT_DIR_PY_EXAMPLES ${CMAKE_BINARY_DIR}/test_output/PyExamples)
-set(TEST_OUTPUT_DIR_PY_CORE ${CMAKE_BINARY_DIR}/test_output/PyCore)
-set(TEST_OUTPUT_DIR_PY_FIT ${CMAKE_BINARY_DIR}/test_output/PyFit)
-set(TEST_OUTPUT_DIR_PY_PERSIST ${CMAKE_BINARY_DIR}/test_output/PyPersist)
-set(TEST_OUTPUT_DIR_PY_STD ${CMAKE_BINARY_DIR}/test_output/PyStd)
-set(TEST_OUTPUT_DIR_STD ${CMAKE_BINARY_DIR}/test_output/Std)
+set(TEST_OUTPUT_DIR_PY_CORE     ${CMAKE_BINARY_DIR}/test_output/PyCore)
+set(TEST_OUTPUT_DIR_PY_FIT      ${CMAKE_BINARY_DIR}/test_output/PyFit)
+set(TEST_OUTPUT_DIR_PY_PERSIST  ${CMAKE_BINARY_DIR}/test_output/PyPersist)
+set(TEST_OUTPUT_DIR_PY_STD      ${CMAKE_BINARY_DIR}/test_output/PyStd)
+set(TEST_OUTPUT_DIR_STD         ${CMAKE_BINARY_DIR}/test_output/Std)
 
 configure_file("${CONFIGURABLES_DIR}/auto_README.in" "${CMAKE_SOURCE_DIR}/auto/README" @ONLY)