Relocated dll's to PROJECTM_BIN_DIR on Windows

projectM-visualizer · Feb 2, 2024 · d64bf28 · d64bf28
1 parent 72cd63d
commit d64bf28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,6 +48,12 @@ set(PROJECTM_BIN_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING "Executable installa
 set(PROJECTM_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Library installation directory, relative to the install prefix.")
 set(PROJECTM_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Header installation directory, relative to the install prefix.")
 
+if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+    set(PROJECTM_RUNTIME_DIR "${PROJECTM_BIN_DIR}")
+else()
+    set(PROJECTM_RUNTIME_DIR "${PROJECTM_LIB_DIR}")
+endif()
+
 # Dummy file for merged static libs.
 set(PROJECTM_DUMMY_SOURCE_FILE "${PROJECTM_BINARY_DIR}/dummy.cpp")
 file(TOUCH "${PROJECTM_DUMMY_SOURCE_FILE}")

diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
@@ -137,7 +137,7 @@ if(ENABLE_INSTALL)
     install(TARGETS projectM
             EXPORT libprojectMTargets
             LIBRARY DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
-            RUNTIME DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
+            RUNTIME DESTINATION "${PROJECTM_RUNTIME_DIR}" COMPONENT Runtime
             ARCHIVE DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Devel
             PUBLIC_HEADER DESTINATION "${PROJECTM_INCLUDE_DIR}/libprojectM" COMPONENT Devel
             )

diff --git a/src/playlist/CMakeLists.txt b/src/playlist/CMakeLists.txt
@@ -98,7 +98,7 @@ if(ENABLE_INSTALL)
     install(TARGETS projectM_playlist
             EXPORT libprojectMPlaylist
             LIBRARY DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
-            RUNTIME DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
+            RUNTIME DESTINATION "${PROJECTM_RUNTIME_DIR}" COMPONENT Runtime
             ARCHIVE DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Devel
             PUBLIC_HEADER DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4" COMPONENT Devel
             )