From 9fdbd02fac312653c25e864f23826912df6cb30d Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Wed, 21 Feb 2018 10:54:40 +0100
Subject: [PATCH] [CMake] Handle compatiblity with mac
---
plugins/CMakeLists.txt | 5 ++++-
plugins/pyqcustomplot/CMakeLists.txt | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ac58e20..d8ced0d 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -28,5 +28,8 @@ ENDIF(PYTHONQT_FOUND)
IF(PYTHONQT_FOUND AND BUILD_PY_QGV)
ADD_SUBDIRECTORY(pyqgv)
- ADD_SUBDIRECTORY(pyqcustomplot)
ENDIF(PYTHONQT_FOUND AND BUILD_PY_QGV)
+
+IF(PYTHONQT_FOUND AND BUILD_PY_QCUSTOM_PLOT)
+ ADD_SUBDIRECTORY(pyqcustomplot)
+ENDIF(PYTHONQT_FOUND AND BUILD_PY_QCUSTOM_PLOT)
diff --git a/plugins/pyqcustomplot/CMakeLists.txt b/plugins/pyqcustomplot/CMakeLists.txt
index ffe1b3e..eabdaab 100644
--- a/plugins/pyqcustomplot/CMakeLists.txt
+++ b/plugins/pyqcustomplot/CMakeLists.txt
@@ -64,7 +64,8 @@ ADD_LIBRARY(${PLUGIN_NAME} SHARED ${${PLUGIN_NAME}_SOURCES}
${${PLUGIN_NAME}_RESOURCES_RCC}
)
-TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${QT_LIBRARIES} ${PYTHONQT_LIBRARIES})
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${QT_LIBRARIES} ${PYTHONQT_LIBRARIES} ${PROJECT_NAME})
+PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} omniORB4)
# Uncomment to install
INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION lib/gepetto-gui-plugins)
--
GitLab