detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-05 09:30:40 +02:00
Code Issues Actions Packages Releases Activity

better cmake for python and pybind11 2.6.1

Browse Source
This commit is contained in:
Erik Frojdh 2020-11-23 08:57:00 +01:00
parent 2eea1882d2
commit 90a9cea670
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -192,7 +192,7 @@ if (SLS_USE_INTEGRATION_TESTS)
endif (SLS_USE_INTEGRATION_TESTS) endif (SLS_USE_INTEGRATION_TESTS)
if (SLS_USE_PYTHON) if (SLS_USE_PYTHON)
set(PYBIND11_CPP_STANDARD -std=c++11) find_package (Python 3.6 COMPONENTS Interpreter Development)
add_subdirectory(libs/pybind11) add_subdirectory(libs/pybind11)
add_subdirectory(python) add_subdirectory(python)
endif(SLS_USE_PYTHON) endif(SLS_USE_PYTHON)

2
libs/pybind11

@ -1 +1 @@
Subproject commit 4f72ef846fe8453596230ac285eeaa0ce3278bb4 Subproject commit f1abf5d9159b805674197f6bc443592e631c9130

9
python/CMakeLists.txt
View File

@ -1,6 +1,4 @@
# find_package (Python COMPONENTS Interpreter Development)
pybind11_add_module(_slsdet pybind11_add_module(_slsdet
src/main.cpp src/main.cpp
src/enums.cpp src/enums.cpp
@ -9,11 +7,8 @@ pybind11_add_module(_slsdet
) )
target_link_libraries(_slsdet PUBLIC target_link_libraries(_slsdet PUBLIC
slsDetectorShared slsDetectorStatic
slsReceiverShared )
slsSupportShared
${ZeroMQ_LIBRARIES}
)