Evaluate module paths correctly

CMakeLists.txt

@@ -3,14 +3,16 @@ project(dune-copasi CXX)
 
 cmake_policy(SET CMP0074 NEW)
 
-#find dune-common and set the module path
+# find dune-common
 find_package(dune-common REQUIRED)
+
+# make sure to find cmake modules
 list(APPEND CMAKE_MODULE_PATH
   "${PROJECT_SOURCE_DIR}/cmake/modules"
   "${dune-common_MODULE_PATH}"
 )
 
-#include the dune macros
+# include macros for dune projects
 include(DuneMacros)
 
 option(USE_FALLBACK_FILESYSTEM

cmake/pkg/dune-copasi-config.cmake.in

@@ -28,7 +28,8 @@ if(NOT dune-copasi_FOUND)
   # setup basic dune dependecy
   find_dependency(dune-common REQUIRED)
 
-  list(APPEND CMAKE_MODULE_PATH "@dune-common_MODULE_PATH@" "@dune-copasi_MODULE_PATH@")
+  # make sure to find cmake modules for dune-common
+  list(APPEND CMAKE_MODULE_PATH "${dune-common_MODULE_PATH}")
   include(DuneMacros)
 
   # setup other dune dependecies
@@ -37,7 +38,10 @@ if(NOT dune-copasi_FOUND)
   dune_process_dependency_macros()
   swap_args(ProjectName _ProjectName)
 
-  # setup other dependencies
+  # make sure to find cmake modules for dune-copasi
+  list(APPEND CMAKE_MODULE_PATH "${dune-copasi_MODULE_PATH}")
+
+  # setup dependencies
   find_dependency(muparser)
   find_dependency(TIFF)
   find_dependency(Filesystem)