From e5e2a37bb7e769d340c51f0ab32a004e312eb2ec Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 Nov 2020 20:56:53 +0100
Subject: [PATCH] ctd
---
.../Python/PyExamples/CMakeLists.txt | 6 ++--
cmake/BornAgain/PythonAPI.cmake | 28 +++++++++----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Tests/Functional/Python/PyExamples/CMakeLists.txt b/Tests/Functional/Python/PyExamples/CMakeLists.txt
index 12014add4e6..615f00ac082 100644
--- a/Tests/Functional/Python/PyExamples/CMakeLists.txt
+++ b/Tests/Functional/Python/PyExamples/CMakeLists.txt
@@ -8,9 +8,9 @@
set(output_dir ${TEST_OUTPUT_DIR_PY_EXAMPLES})
file(MAKE_DIRECTORY ${output_dir})
-file(GLOB sim_examples "${PY_EXAMPLES_DIR}/sim*/*.py")
+file(GLOB sim_examples ${PY_EXAMPLES_DIR}/sim*/*.py)
file(GLOB fit_examples
- "${PY_EXAMPLES_DIR}/fit55_Specular/FitSpecularBasics.py")
+ ${PY_EXAMPLES_DIR}/fit55_Specular/FitSpecularBasics.py)
set(examples ${sim_examples} ${fit_examples})
set(test_script ${output_dir}/check_functionality.py)
@@ -21,5 +21,5 @@ foreach(example_path ${examples})
set(test_name PyExamples.${example_name})
add_test(${test_name} ${Python3_EXECUTABLE} ${test_script} ${example_path})
- set_tests_properties(${test_name} PROPERTIES LABELS "Fullcheck")
+ set_tests_properties(${test_name} PROPERTIES LABELS Fullcheck)
endforeach()
diff --git a/cmake/BornAgain/PythonAPI.cmake b/cmake/BornAgain/PythonAPI.cmake
index 1d73ad5299c..fd9c0bb2590 100644
--- a/cmake/BornAgain/PythonAPI.cmake
+++ b/cmake/BornAgain/PythonAPI.cmake
@@ -1,23 +1,23 @@
# Configure and install the Swig runtime, the BornAgain Python module, and more
if(NOT BORNAGAIN_PYTHON)
- message(FATAL_ERROR "PythonAPI included though BORNAGAIN_PYTHON=false")
+ message(FATAL_ERROR PythonAPI included though BORNAGAIN_PYTHON=false)
endif()
configure_file(${WRAP_DIR}/Python/plot_utils.py
${CMAKE_BINARY_DIR}/lib/bornagain/plot_utils.py COPYONLY)
if(WIN32)
- set(BA_MODULES_IMPORT_PATH "../../bin")
+ set(BA_MODULES_IMPORT_PATH ../../bin)
else()
- set(BA_MODULES_IMPORT_PATH "..")
+ set(BA_MODULES_IMPORT_PATH ..)
endif()
if(BORNAGAIN_APPLE_BUNDLE)
set(BA_MODULES_IMPORT_PATH
lib/BornAgain-${BornAgain_VERSION_MAJOR}.${BornAgain_VERSION_MINOR})
endif()
-configure_file("${WRAP_DIR}/Python/__init__.py.in"
- "${CMAKE_BINARY_DIR}/lib/bornagain/__init__.py" @ONLY)
+configure_file(${WRAP_DIR}/Python/__init__.py.in
+ ${CMAKE_BINARY_DIR}/lib/bornagain/__init__.py @ONLY)
if(CONFIGURE_BINDINGS)
add_custom_command(
@@ -30,21 +30,21 @@ endif()
add_custom_target(swig_runtime DEPENDS ${AUTO_DIR}/swig_runtime.h)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/
- DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN "*.py" )
+ DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.py )
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/
- DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN "README")
+ DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN README)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/
- DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN "*.gz")
+ DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.gz)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/
- DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN "*.png")
+ DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.png)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/cpp
DESTINATION ${destination_examples} COMPONENT Examples)
-install(FILES "${AUTO_DIR}/swig_runtime.h"
+install(FILES ${AUTO_DIR}/swig_runtime.h
DESTINATION ${destination_include}/Wrap COMPONENT Headers)
# Install bornagain/__init__.py and utilites
-install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/bornagain/"
- DESTINATION "${destination_libexec}/bornagain"
+install(DIRECTORY ${CMAKE_BINARY_DIR}/lib/bornagain/
+ DESTINATION ${destination_libexec}/bornagain
COMPONENT Libraries
- FILES_MATCHING PATTERN "*.py"
- PATTERN "__pycache__" EXCLUDE)
+ FILES_MATCHING PATTERN *.py
+ PATTERN __pycache__ EXCLUDE)
--
GitLab