Merge branch 'bugfix/private-config-header-with-wrong-module-info' into 'master'

Private config header file generated info with wrong module

See merge request !1384

cmake/modules/DuneProject.cmake

@@ -536,12 +536,12 @@ endif()")
 
   # configure private config file
   file(WRITE ${PROJECT_BINARY_DIR}/include_private/${ProjectName}-config-private.hh.cmake "${${ProjectName}_CONFIG_PRIVATE_HH}")
+  # parse again dune.module file of current module to set PACKAGE_* variables
+  dune_module_information(${PROJECT_SOURCE_DIR} QUIET)
   configure_file(${CMAKE_CURRENT_BINARY_DIR}/include_private/${ProjectName}-config-private.hh.cmake ${CMAKE_CURRENT_BINARY_DIR}/include_private/${ProjectName}-config-private.hh)
 
   # configure and install public config file
   file(WRITE ${PROJECT_BINARY_DIR}/include/${ProjectName}-config.hh.cmake "${${ProjectName}_CONFIG_HH}\n${${ProjectName}_CONFIG_BOTTOM_HH}")
-  # parse again dune.module file of current module to set PACKAGE_* variables
-  dune_module_information(${PROJECT_SOURCE_DIR} QUIET)
   configure_file(${CMAKE_CURRENT_BINARY_DIR}/include/${ProjectName}-config.hh.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/${ProjectName}-config.hh)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/${ProjectName}-config.hh DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})