Skip to content
Snippets Groups Projects
Commit 22fd6156 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

mv Examples -> rawEx, to prevent confusion with auto/Examples

parent 2097fa5e
No related branches found
No related tags found
1 merge request!1739rename Examples/ -> rawEx/; correct links in webdoc
Showing
with 9 additions and 11 deletions
...@@ -244,7 +244,7 @@ endforeach() ...@@ -244,7 +244,7 @@ endforeach()
if(BORNAGAIN_PYTHON) if(BORNAGAIN_PYTHON)
add_dependencies(BornAgainFit swig_runtime) add_dependencies(BornAgainFit swig_runtime)
if (CONFIGURE_EXAMPLES) if (CONFIGURE_EXAMPLES)
add_subdirectory(Examples) add_subdirectory(rawEx)
endif() endif()
endif() endif()
......
...@@ -118,7 +118,6 @@ file(APPEND "${log}" ...@@ -118,7 +118,6 @@ file(APPEND "${log}"
" [build]\n" " [build]\n"
" RPATH (CMAKE_BUILD_RPATH) = ${CMAKE_BUILD_RPATH}\n" " RPATH (CMAKE_BUILD_RPATH) = ${CMAKE_BUILD_RPATH}\n"
" build (BornAgain_BINARY_DIR) = ${BornAgain_BINARY_DIR}\n" " build (BornAgain_BINARY_DIR) = ${BornAgain_BINARY_DIR}\n"
" examples (EXAMPLES_DIR) = ${EXAMPLES_DIR}\n"
" libraries (CMAKE_LIBRARY_OUTPUT_DIRECTORY) = ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\n" " libraries (CMAKE_LIBRARY_OUTPUT_DIRECTORY) = ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\n"
" runtime (CMAKE_RUNTIME_OUTPUT_DIRECTORY) = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\n" " runtime (CMAKE_RUNTIME_OUTPUT_DIRECTORY) = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\n"
" source (BUILD_SRC_DIR) = ${BUILD_SRC_DIR}\n" " source (BUILD_SRC_DIR) = ${BUILD_SRC_DIR}\n"
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
set(TOOL_DIR ${CMAKE_SOURCE_DIR}/devtools) set(TOOL_DIR ${CMAKE_SOURCE_DIR}/devtools)
set(WRAP_DIR ${CMAKE_SOURCE_DIR}/Wrap) set(WRAP_DIR ${CMAKE_SOURCE_DIR}/Wrap)
set(SWIG_DIR ${WRAP_DIR}/Swig) set(SWIG_DIR ${WRAP_DIR}/Swig)
set(EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/Examples)
set(REFERENCE_DIR ${CMAKE_SOURCE_DIR}/Tests/ReferenceData) set(REFERENCE_DIR ${CMAKE_SOURCE_DIR}/Tests/ReferenceData)
set(REFERENCE_DIR_CORESPECIAL ${REFERENCE_DIR}/CoreSpecial) set(REFERENCE_DIR_CORESPECIAL ${REFERENCE_DIR}/CoreSpecial)
...@@ -18,8 +17,8 @@ set(REFERENCE_DIR_SUITE ${REFERENCE_DIR}/Suite) ...@@ -18,8 +17,8 @@ set(REFERENCE_DIR_SUITE ${REFERENCE_DIR}/Suite)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
set(AUTO_WRAP_DIR ${CMAKE_SOURCE_DIR}/auto/Wrap) set(AUTO_WRAP_DIR ${CMAKE_SOURCE_DIR}/auto/Wrap)
set(EXAMPLES_SRC_DIR ${CMAKE_SOURCE_DIR}/Examples) set(EXAMPLES_SRC_DIR ${CMAKE_SOURCE_DIR}/rawEx)
set(EXAMPLES_DATA_DIR ${CMAKE_SOURCE_DIR}/Examples/data) set(EXAMPLES_DATA_DIR ${EXAMPLES_SRC_DIR}/data)
set(EXAMPLES_PUBL_DIR ${CMAKE_SOURCE_DIR}/auto/Examples) set(EXAMPLES_PUBL_DIR ${CMAKE_SOURCE_DIR}/auto/Examples)
set(EXAMPLES_TEST_DIR ${CMAKE_SOURCE_DIR}/auto/MiniExamples) set(EXAMPLES_TEST_DIR ${CMAKE_SOURCE_DIR}/auto/MiniExamples)
......
...@@ -12,7 +12,7 @@ if(NOT MSVC) ...@@ -12,7 +12,7 @@ if(NOT MSVC)
COMMAND ${LINECOUNT} ${SRC_LEN_LIM} ${src1}) COMMAND ${LINECOUNT} ${SRC_LEN_LIM} ${src1})
endforeach() endforeach()
file(GLOB_RECURSE sources ${EXAMPLES_DIR}/*.py) file(GLOB_RECURSE sources ${EXAMPLES_PUBL_DIR}/*.py)
add_test(NAME LineLength.PyExamples add_test(NAME LineLength.PyExamples
COMMAND ${LINECOUNT} ${WEB_LEN_LIM} ${sources}) COMMAND ${LINECOUNT} ${WEB_LEN_LIM} ${sources})
......
...@@ -33,13 +33,13 @@ endif() ...@@ -33,13 +33,13 @@ endif()
add_custom_target(swig_runtime DEPENDS ${AUTO_WRAP_DIR}/swig_runtime.h) add_custom_target(swig_runtime DEPENDS ${AUTO_WRAP_DIR}/swig_runtime.h)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ install(DIRECTORY ${EXAMPLES_SRC_DIR}
DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.py ) DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.py )
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ install(DIRECTORY ${EXAMPLES_SRC_DIR}
DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN README) DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN README)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ install(DIRECTORY ${EXAMPLES_SRC_DIR}
DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.gz) DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.gz)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ install(DIRECTORY ${EXAMPLES_SRC_DIR}
DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.png) DESTINATION ${destination_examples} COMPONENT Examples FILES_MATCHING PATTERN *.png)
if(BA_CPP_API) if(BA_CPP_API)
......
if(NOT CONFIGURE_EXAMPLES) if(NOT CONFIGURE_EXAMPLES)
message(FATAL_ERROR "Invalid use of Examples/CMakeLists") message(FATAL_ERROR "Invalid call w/o CONFIGURE_EXAMPLES")
endif() endif()
file(GLOB_RECURSE examples *.py) file(GLOB_RECURSE examples *.py)
......
File moved
File moved
File moved
File moved
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