Update to eliminate management of 3rd-party DLL dependency

projectchrono · Feb 13, 2025 · 9dcf3de · 9dcf3de
1 parent ee91652
commit 9dcf3de
Show file tree

Hide file tree

Showing 26 changed files with 58 additions and 104 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,7 +90,6 @@ endif()
 
 # Keep track of all DLLs. Each submodule should append to this list.
 list(APPEND ALL_DLL_NAMES "")
-list(APPEND ALL_DEPENDENCY_DLLS "")
 
 # Propagate configuration to submodules.
 option(ENABLE_CONFIG_TESTS "Build the programs for checking Chrono configuration" OFF)
@@ -126,4 +125,4 @@ endif()
 
 # Add custom command for copying DLLs to the appropriate binary output folder
 # (no-op if not Windows)
-add_DLL_copy_command("${ALL_DLL_NAMES}" "${ALL_DEPENDENCY_DLLS}")
+add_DLL_copy_command("${ALL_DLL_NAMES}")
diff --git a/configuration_tests/CMakeLists.txt b/configuration_tests/CMakeLists.txt
@@ -21,5 +21,4 @@ add_subdirectory(vehicle)
 add_subdirectory(vsg)
 
 set(ALL_DLL_NAMES             "${ALL_DLL_NAMES}"           PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS       "${ALL_DEPENDENCY_DLLS}"     PARENT_SCOPE)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)
diff --git a/configuration_tests/cascade/CMakeLists.txt b/configuration_tests/cascade/CMakeLists.txt
@@ -20,7 +20,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Cascade Irrlicht
              CONFIG
 )
@@ -35,10 +35,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/fea/CMakeLists.txt b/configuration_tests/fea/CMakeLists.txt
@@ -24,7 +24,7 @@ set(DEMOS_IRR
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS
              OPTIONAL_COMPONENTS Irrlicht
              CONFIG
@@ -51,10 +51,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/fsi/CMakeLists.txt b/configuration_tests/fsi/CMakeLists.txt
@@ -19,7 +19,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
 #             COMPONENTS FSI Multicore
              COMPONENTS FSI 
              OPTIONAL_COMPONENTS OpenGL VSG
@@ -36,10 +36,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/gpu/CMakeLists.txt b/configuration_tests/gpu/CMakeLists.txt
@@ -19,7 +19,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Gpu OpenGL
              CONFIG
 )
@@ -34,10 +34,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/mbs/CMakeLists.txt b/configuration_tests/mbs/CMakeLists.txt
@@ -21,7 +21,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Irrlicht Multicore
              CONFIG
 )
@@ -36,10 +36,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/multicore/CMakeLists.txt b/configuration_tests/multicore/CMakeLists.txt
@@ -19,7 +19,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode.
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Multicore
              OPTIONAL_COMPONENTS OpenGL
              CONFIG
@@ -35,10 +35,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/parsers/CMakeLists.txt b/configuration_tests/parsers/CMakeLists.txt
@@ -11,7 +11,7 @@ message(STATUS "\n---- PARSERS configuration test\n")
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Parsers Irrlicht
              CONFIG
 )
@@ -43,10 +43,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/synchrono/CMakeLists.txt b/configuration_tests/synchrono/CMakeLists.txt
@@ -20,7 +20,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Vehicle Synchrono
              OPTIONAL_COMPONENTS Irrlicht Sensor
              CONFIG
@@ -36,10 +36,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/urdf/CMakeLists.txt b/configuration_tests/urdf/CMakeLists.txt
@@ -19,7 +19,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Parsers VSG
              CONFIG
 )
@@ -40,10 +40,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/vehicle/CMakeLists.txt b/configuration_tests/vehicle/CMakeLists.txt
@@ -20,7 +20,7 @@ set(DEMOS
 #--------------------------------------------------------------
 
 # Invoke find_package in CONFIG mode
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS Vehicle Irrlicht
              CONFIG
 )
@@ -35,10 +35,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/configuration_tests/vsg/CMakeLists.txt b/configuration_tests/vsg/CMakeLists.txt
@@ -20,7 +20,7 @@ set(DEMOS
 
 # Invoke find_package in CONFIG mode
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}/../Chrono/lib")
-find_package(Chrono QUIET
+find_package(Chrono
              COMPONENTS VSG
              CONFIG
 )
@@ -35,10 +35,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
@@ -87,5 +87,4 @@ if (ENABLE_PRJ_SYN_HIGHWAY)
 endif()
 
 set(ALL_DLL_NAMES             "${ALL_DLL_NAMES}"           PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS       "${ALL_DEPENDENCY_DLLS}"     PARENT_SCOPE)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)
diff --git a/projects/constraint_fluids/CMakeLists.txt b/projects/constraint_fluids/CMakeLists.txt
@@ -46,10 +46,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/core_tests/CMakeLists.txt b/projects/core_tests/CMakeLists.txt
@@ -36,10 +36,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/cosimulation/CMakeLists.txt b/projects/cosimulation/CMakeLists.txt
@@ -35,10 +35,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/dem_validation/CMakeLists.txt b/projects/dem_validation/CMakeLists.txt
@@ -42,10 +42,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/fea_tests/CMakeLists.txt b/projects/fea_tests/CMakeLists.txt
@@ -35,7 +35,7 @@ set(TESTS_MATLAB_IRR
 # Invoke find_package in CONFIG mode
 find_package(Chrono QUIET
              COMPONENTS
-             OPTIONAL_COMPONENTS Irrlicht Postprocess MUMPS PardisoMKL Matlab
+             OPTIONAL_COMPONENTS Irrlicht Postprocess PardisoMKL Matlab
              CONFIG
 )
 
@@ -58,10 +58,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/fea_tests/test_FEA_shellANCF.cpp b/projects/fea_tests/test_FEA_shellANCF.cpp
@@ -31,6 +31,7 @@
 #include "chrono_pardisomkl/ChSolverPardisoMKL.h"
 #endif
 
+#undef CHRONO_MUMPS
 #ifdef CHRONO_MUMPS
 #include "chrono_mumps/ChSolverMumps.h"
 #endif

diff --git a/projects/gpu_tests/CMakeLists.txt b/projects/gpu_tests/CMakeLists.txt
@@ -50,10 +50,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/mbs/CMakeLists.txt b/projects/mbs/CMakeLists.txt
@@ -35,10 +35,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)

diff --git a/projects/multicore_tests/CMakeLists.txt b/projects/multicore_tests/CMakeLists.txt
@@ -48,10 +48,8 @@ endif()
 # Append to the parent's lists of DLLs (and make them visible)
 #--------------------------------------------------------------
 
-list(APPEND ALL_DLL_NAMES       "${CHRONO_DLL_NAMES}")
-list(APPEND ALL_DEPENDENCY_DLLS "${CHRONO_DEPENDENCY_DLLS}")
-set(ALL_DLL_NAMES       "${ALL_DLL_NAMES}"       PARENT_SCOPE)
-set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
+list(APPEND ALL_DLL_NAMES "${CHRONO_DLL_NAMES}")
+set(ALL_DLL_NAMES ${ALL_DLL_NAMES} PARENT_SCOPE)
 
 # Make CHRONO_PACKAGE_PREFIX_DIR visible above (needed for add_DLL_copy_command)
 set(CHRONO_PACKAGE_PREFIX_DIR ${CHRONO_PACKAGE_PREFIX_DIR} PARENT_SCOPE)