Expose targets and versions for more dependencies (#6842)

src/CMakeLists.txt

@@ -58,8 +58,6 @@ FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}")
 ADD_DEFINITIONS(-DLIB_DIR="${LIB_DIR_RELATIVE}" -DPLUGIN_DIR="${PLUGIN_DIR_RELATIVE}" ${PULSEAUDIO_DEFINITIONS})
 INCLUDE_DIRECTORIES(
 	${JACK_INCLUDE_DIRS}
-	${SAMPLERATE_INCLUDE_DIRS}
-	${SNDFILE_INCLUDE_DIRS}
 	${SNDIO_INCLUDE_DIRS}
 	${FFTW3F_INCLUDE_DIRS}
 )
@@ -79,10 +77,6 @@ IF(NOT ("${PULSEAUDIO_INCLUDE_DIR}" STREQUAL ""))
 	INCLUDE_DIRECTORIES("${PULSEAUDIO_INCLUDE_DIR}")
 ENDIF()
 
-IF(NOT ("${OGGVORBIS_INCLUDE_DIR}" STREQUAL ""))
-	INCLUDE_DIRECTORIES("${OGGVORBIS_INCLUDE_DIR}")
-ENDIF()
-
 IF(NOT ("${LV2_INCLUDE_DIRS}" STREQUAL ""))
 	INCLUDE_DIRECTORIES(${LV2_INCLUDE_DIRS})
 ENDIF()
@@ -170,6 +164,10 @@ if(LMMS_HAVE_MP3LAME)
 	list(APPEND EXTRA_LIBRARIES mp3lame::mp3lame)
 endif()
 
+if(LMMS_HAVE_OGGVORBIS)
+	list(APPEND EXTRA_LIBRARIES Vorbis::vorbisenc Vorbis::vorbisfile)
+endif()
+
 if(LMMS_USE_MINGW_STD_THREADS)
 	list(APPEND EXTRA_LIBRARIES mingw_stdthreads)
 endif()
@@ -184,15 +182,14 @@ SET(LMMS_REQUIRED_LIBS ${LMMS_REQUIRED_LIBS}
 	${SNDIO_LIBRARIES}
 	${PULSEAUDIO_LIBRARIES}
 	${JACK_LIBRARIES}
-	${OGGVORBIS_LIBRARIES}
 	${LV2_LIBRARIES}
 	${SUIL_LIBRARIES}
 	${LILV_LIBRARIES}
-	${SAMPLERATE_LIBRARIES}
-	${SNDFILE_LIBRARIES}
 	${FFTW3F_LIBRARIES}
-	${EXTRA_LIBRARIES}
 	rpmalloc
+	SampleRate::samplerate
+	SndFile::sndfile
+	${EXTRA_LIBRARIES}
 )
 
 # Expose required libs for tests binary
@@ -211,10 +208,11 @@ FOREACH(LIB ${LMMS_REQUIRED_LIBS})
 	ENDIF()
 ENDFOREACH()
 
+set_target_properties(lmms PROPERTIES
+	ENABLE_EXPORTS ON
+)
+
 IF(LMMS_BUILD_WIN32)
-	SET_TARGET_PROPERTIES(lmms PROPERTIES
-		ENABLE_EXPORTS ON
-	)
 	IF(NOT MSVC)
 		SET_PROPERTY(TARGET lmms
 			APPEND_STRING PROPERTY LINK_FLAGS " -mwindows"
@@ -228,10 +226,6 @@ IF(LMMS_BUILD_WIN32)
 		)
 	ENDIF()
 ELSE()
-	IF(NOT LMMS_BUILD_APPLE)
-		SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Wl,-E")
-	ENDIF(NOT LMMS_BUILD_APPLE)
-
 	if(CMAKE_INSTALL_MANDIR)
 		SET(INSTALL_MANDIR ${CMAKE_INSTALL_MANDIR})
 	ELSE(CMAKE_INSTALL_MANDIR)