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

restore build with -DBORNAGAIN_PYTHON=OFF -DBA_GUI=OFF

parent 85b372a0
No related branches found
No related tags found
1 merge request!1636PyCore: Re-implementation of embedded Python as a separate module (Major change)
Pipeline #99715 passed
......@@ -262,7 +262,9 @@ if(BA_TESTS)
endif()
# documentation
add_subdirectory(hugo)
if(BORNAGAIN_PYTHON) # required for examples
add_subdirectory(hugo)
endif()
add_subdirectory(Doc/man)
if(CONFIGURE_DOXY)
add_subdirectory(Doc/Doxygen)
......
......@@ -27,14 +27,17 @@ MakeLib(${lib})
target_link_libraries(${lib}
PUBLIC
BornAgainBase
BornAgainPyCore
BornAgainFit
BornAgainParam
BornAgainSample
BornAgainResample
${CMAKE_THREAD_LIBS_INIT}
${tspectrum_LIBRARY}
)
)
if(BORNAGAIN_PYTHON)
target_link_libraries(${lib} PUBLIC BornAgainPyCore)
endif()
target_include_directories(${lib}
PUBLIC
${CMAKE_SOURCE_DIR}
......
......@@ -18,7 +18,9 @@
#include <memory>
#include <vector>
#ifdef BORNAGAIN_PYTHON
#include "PyCore/Embed/PyObjectDecl.h"
#endif
using std::size_t;
......
......@@ -51,7 +51,6 @@ endif()
target_link_libraries(${lib}
PUBLIC
BornAgainPyCore
BornAgainSim
BornAgainImg3D
Qt6::Widgets
......@@ -62,6 +61,9 @@ target_link_libraries(${lib}
Qt6::PrintSupport
qcustomplot
)
if(BORNAGAIN_PYTHON)
target_link_libraries(${lib} PUBLIC BornAgainPyCore)
endif()
target_include_directories(${lib} PUBLIC
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/3rdparty/GUI/qcustomplot
......
......@@ -64,31 +64,32 @@ function(MakeLib lib)
if(BORNAGAIN_PYTHON)
target_compile_definitions(${lib} PRIVATE -DBORNAGAIN_PYTHON)
endif()
# SWIG-produced interface
if(swigtmpdir)
SwigLib(${name} ${lib} ${swigtmpdir})
endif()
# SWIG-produced interface
if(swigtmpdir)
SwigLib(${name} ${lib} ${swigtmpdir})
endif()
# Python package
if(BA_PY_PACKAGE)
# add the BornAgain library to the Python wheel
add_library_to_wheel(${lib})
endif()
# Python package
if(BA_PY_PACKAGE)
# add the BornAgain library to the Python wheel
add_library_to_wheel(${lib})
endif()
if(WIN32 AND BORNAGAIN_PYTHON)
# python in windows required .pyd extension for the library name
install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${libprefix}${lib}.pyd
DESTINATION ${destination_python} COMPONENT Libraries)
add_custom_command(
TARGET ${lib}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_BINARY_DIR}/bin/${libprefix}${lib}${libsuffix}
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${libprefix}${lib}${libsuffix}
)
endif()
if(WIN32)
# python in windows required .pyd extension for the library name
install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${libprefix}${lib}.pyd
DESTINATION ${destination_python} COMPONENT Libraries)
add_custom_command(
TARGET ${lib}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_BINARY_DIR}/bin/${libprefix}${lib}${libsuffix}
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${libprefix}${lib}${libsuffix}
)
endif()
endif() # BORNAGAIN_PYTHON
# installation
install(TARGETS ${lib}
......
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