Merge pull request #2803 from jasp00/opt-dll

Make some libraries optional in Windows installation

CMakeLists.txt

@@ -362,6 +362,10 @@ ENDIF(WANT_JACK)
 PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
 
 
+# check for FLTK
+FIND_PACKAGE(FLTK)
+
+
 # check for Fluidsynth
 IF(WANT_SF2)
 	PKG_CHECK_MODULES(FLUIDSYNTH fluidsynth>=1.0.7)

plugins/zynaddsubfx/CMakeLists.txt

@@ -37,8 +37,6 @@ IF(MINGW_PREFIX)
 	SET(FLTK_SKIP_FLUID TRUE)
 ENDIF()
 
-FIND_PACKAGE(FLTK)
-
 IF(NOT FLTK_FOUND)
 	RETURN()
 ENDIF()

src/CMakeLists.txt

@@ -184,13 +184,8 @@ IF(LMMS_BUILD_WIN32)
 					"${MINGW_PREFIX}/bin/libvorbisfile-3.dll"
 					"${MINGW_PREFIX}/bin/libjpeg-9.dll"
 					"${MINGW_PREFIX}/bin/libogg-0.dll"
-					"${MINGW_PREFIX}/bin/libfltk.dll"
-					"${MINGW_PREFIX}/bin/libfluidsynth.dll"
 					"${MINGW_PREFIX}/bin/libfftw3f-3.dll"
 					"${MINGW_PREFIX}/bin/libFLAC-8.dll"
-					"${MINGW_PREFIX}/bin/libgig-6.dll"
-					"${MINGW_PREFIX}/bin/libportaudio-2.dll"
-					"${MINGW_PREFIX}/lib/libsoundio.dll"
 					"${MINGW_PREFIX}/bin/libpng16-16.dll"
 					"${MINGW_PREFIX}/bin/SDL.dll"
 					"${MINGW_PREFIX}/bin/libglib-2.0-0.dll"
@@ -204,6 +199,31 @@ IF(LMMS_BUILD_WIN32)
 					"${MINGW_PREFIX}/bin/libstdc++-6.dll"
 				DESTINATION .)
 	ENDIF()
+	IF(FLTK_FOUND)
+		INSTALL(FILES
+					"${MINGW_PREFIX}/bin/libfltk.dll"
+				DESTINATION .)
+	ENDIF()
+	IF(FLUIDSYNTH_FOUND)
+		INSTALL(FILES
+					"${MINGW_PREFIX}/bin/libfluidsynth.dll"
+				DESTINATION .)
+	ENDIF()
+	IF(GIG_FOUND)
+		INSTALL(FILES
+					"${MINGW_PREFIX}/bin/libgig-6.dll"
+				DESTINATION .)
+	ENDIF()
+	IF(PORTAUDIO_FOUND)
+		INSTALL(FILES
+					"${MINGW_PREFIX}/bin/libportaudio-2.dll"
+				DESTINATION .)
+	ENDIF()
+	IF(SOUNDIO_FOUND)
+		INSTALL(FILES
+					"${MINGW_PREFIX}/lib/libsoundio.dll"
+				DESTINATION .)
+	ENDIF()
 
 ELSE(LMMS_BUILD_WIN32)
 	IF(NOT LMMS_BUILD_APPLE)