Export the PYTHON_WHEELHOUS into the config file and cleanup MODULE_DEP_PYTHON_PATH

cmake/modules/DuneProject.cmake

@@ -212,6 +212,7 @@ set(${ProjectName}_CXX_FLAGS_RELWITHDEBINFO \"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}\
 set(${ProjectName}_DEPENDS \"@${ProjectName}_DEPENDS@\")
 set(${ProjectName}_SUGGESTS \"@${ProjectName}_SUGGESTS@\")
 set(${ProjectName}_MODULE_PATH \"@PACKAGE_DUNE_INSTALL_MODULEDIR@\")
+set(${ProjectName}_PYTHON_WHEELHOUSE \"@PACKAGE_DUNE_PYTHON_WHEELHOUSE@\")
 set(${ProjectName}_LIBRARIES \"@${ProjectName}_INTERFACE_LIBRARIES@\")
 set(${ProjectName}_HASPYTHON @DUNE_MODULE_HASPYTHON@)
 set(${ProjectName}_PYTHONREQUIRES \"@DUNE_MODULE_PYTHONREQUIRES@\")
@@ -258,7 +259,7 @@ endif()")
   configure_package_config_file(${CONFIG_SOURCE_FILE}
     ${PROJECT_BINARY_DIR}/cmake/pkg/${ProjectName}-config.cmake
     INSTALL_DESTINATION  ${DUNE_INSTALL_LIBDIR}/cmake/${ProjectName}
-    PATH_VARS CMAKE_INSTALL_DATAROOTDIR DUNE_INSTALL_MODULEDIR CMAKE_INSTALL_INCLUDEDIR
+    PATH_VARS CMAKE_INSTALL_DATAROOTDIR DUNE_INSTALL_MODULEDIR CMAKE_INSTALL_INCLUDEDIR DUNE_PYTHON_WHEELHOUSE
     DOXYSTYLE_DIR SCRIPT_DIR)
 
 
@@ -268,6 +269,7 @@ endif()")
   set(PACKAGE_DOXYSTYLE_DIR ${PROJECT_SOURCE_DIR}/doc/doxygen)
   set(PACKAGE_SCRIPT_DIR ${PROJECT_SOURCE_DIR}/cmake/scripts)
   set(PACKAGE_DUNE_INSTALL_MODULEDIR ${PROJECT_SOURCE_DIR}/cmake/modules)
+  set(PACKAGE_DUNE_PYTHON_WHEELHOUSE ${PROJECT_BINARY_DIR}/python)
   set(PACKAGE_PREFIX_DIR ${PROJECT_BINARY_DIR})
   set(PACKAGE_INIT "# Set prefix to source dir
 set(PACKAGE_PREFIX_DIR ${PROJECT_SOURCE_DIR})

cmake/modules/DunePythonVirtualenv.cmake

@@ -325,10 +325,9 @@ else()
   if(UNIX)
 
     # create list with python module paths
-    set(BUILDDIR_PYTHON "$ENV{BUILDDIR}/python")
     foreach( mod ${ALL_DEPENDENCIES} )
-      if( NOT ${${mod}_INCLUDE_DIRS} STREQUAL "")
-        set(MODULE_DEP_PYTHON_PATH "${MODULE_DEP_PYTHON_PATH}\n ${${mod}_INCLUDE_DIRS}/${BUILDDIR_PYTHON}")
+      if( NOT "_${${mod}_PYTHON_WHEELHOUSE}_" STREQUAL "__")
+        set(MODULE_DEP_PYTHON_PATH "${MODULE_DEP_PYTHON_PATH}\n ${${mod}_PYTHON_WHEELHOUSE}")
       endif()
     endforeach()