From 90a9cea670163102eb17ae63e39b83980863666a Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Mon, 23 Nov 2020 08:57:00 +0100 Subject: [PATCH] better cmake for python and pybind11 2.6.1 --- CMakeLists.txt | 2 +- libs/pybind11 | 2 +- python/CMakeLists.txt | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1338e84e1..482520f18 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,7 +192,7 @@ if (SLS_USE_INTEGRATION_TESTS) endif (SLS_USE_INTEGRATION_TESTS) 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(python) endif(SLS_USE_PYTHON) diff --git a/libs/pybind11 b/libs/pybind11 index 4f72ef846..f1abf5d91 160000 --- a/libs/pybind11 +++ b/libs/pybind11 @@ -1 +1 @@ -Subproject commit 4f72ef846fe8453596230ac285eeaa0ce3278bb4 +Subproject commit f1abf5d9159b805674197f6bc443592e631c9130 diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index b6017d79a..7120d0ca3 100755 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,6 +1,4 @@ -# find_package (Python COMPONENTS Interpreter Development) - pybind11_add_module(_slsdet src/main.cpp src/enums.cpp @@ -9,11 +7,8 @@ pybind11_add_module(_slsdet ) target_link_libraries(_slsdet PUBLIC - slsDetectorShared - slsReceiverShared - slsSupportShared - ${ZeroMQ_LIBRARIES} - ) + slsDetectorStatic +)