FIX PYBIND11_SOFA_VERSION (#249)

* remove patch version to handle any pybind11 revision

* FIX patch by parsing version with CMake

* FIX patch by parsing version with CMake (2)

* Update CMakeLists.txt

* FIX config.h not found

Co-authored-by: Guillaume Paran <guillaume.paran@sofa-framework.org>

Author: marques-bruno

Plugin/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(Plugin VERSION 1.0)
 
 set(HEADER_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/config.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/config.h.in
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/initModule.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonEnvironment.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/SceneLoaderPY3.h
@@ -81,6 +81,8 @@ set_target_properties(
         CUDA_VISIBILITY_PRESET "hidden"
 )
 
+target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")
+
 sofa_create_component_in_package_with_targets(
     COMPONENT_NAME ${PROJECT_NAME}
     COMPONENT_VERSION ${SofaPython3_VERSION}

Plugin/src/SofaPython3/DataCache.h

@@ -21,7 +21,7 @@
 #pragma once
 
 #include <pybind11/numpy.h>
-#include "config.h"
+#include <SofaPython3/config.h>
 
 ////////////////////////// FORWARD DECLARATION ///////////////////////////
 namespace sofa {

Plugin/src/SofaPython3/PythonEnvironment.h

@@ -44,7 +44,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/eval.h>
 
-#include "config.h"
+#include <SofaPython3/config.h>
 
 namespace sofapython3
 {

Plugin/src/SofaPython3/PythonFactory.h

@@ -25,7 +25,7 @@
 #include <sofa/core/objectmodel/Base.h>
 #include <sofa/core/objectmodel/Event.h>
 #include <pybind11/pybind11.h>
-#include "config.h"
+#include <SofaPython3/config.h>
 
 /////////////////////////////// DECLARATION //////////////////////////////
 namespace sofapython3

Plugin/src/SofaPython3/SceneLoaderPY3.h

@@ -27,7 +27,7 @@
 #include <sofa/simulation/Visitor.h>
 #include <sofa/simulation/Node.h>
 
-#include "config.h"
+#include <SofaPython3/config.h>
 
 namespace sofapython3
 {

Plugin/src/SofaPython3/config.h Plugin/src/SofaPython3/config.h.inPlugin/src/SofaPython3/config.h renamed to Plugin/src/SofaPython3/config.h.in

@@ -40,9 +40,14 @@
 #endif
 
 // define own pybind version macro, much easier to test/read
-#define PYBIND11_SOFA_VERSION (PYBIND11_VERSION_MAJOR * 10000 \
-    + PYBIND11_VERSION_MINOR * 100 \
-    + PYBIND11_VERSION_PATCH)
+#define PYBIND11_SOFA_VERSION_MAJOR @pybind11_VERSION_MAJOR@
+#define PYBIND11_SOFA_VERSION_MINOR @pybind11_VERSION_MINOR@
+#define PYBIND11_SOFA_VERSION_PATCH @pybind11_VERSION_PATCH@
+#define PYBIND11_SOFA_VERSION ( \
+      PYBIND11_SOFA_VERSION_MAJOR * 10000 \
+    + PYBIND11_SOFA_VERSION_MINOR * 100 \
+    + PYBIND11_SOFA_VERSION_PATCH )
+
 // pybind11 already bind the attributeError starting from 2.8.1 version.
 // so if the version is >= 2.8.1, macro does nothing, otherwise bind attribute_error
 #if PYBIND11_SOFA_VERSION >= 20801

Plugin/src/SofaPython3/initModule.cpp

@@ -18,7 +18,7 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 
-#include "config.h"
+#include <SofaPython3/config.h>
 
 #include "PythonEnvironment.h"
 using sofapython3::PythonEnvironment;