Blob Blame History Raw
diff -Naur giada-0.17.1-src-original/CMakeLists.txt giada-0.17.1-src/CMakeLists.txt
--- giada-0.17.1-src-original/CMakeLists.txt	2021-02-01 12:41:42.000000000 -0500
+++ giada-0.17.1-src/CMakeLists.txt	2021-02-22 11:19:35.817894245 -0500
@@ -250,12 +250,25 @@
 find_package(Threads REQUIRED)
 list(APPEND LIBRARIES ${Threads_LIBRARY})
 
+# pkg-config/pkgconf, required to find some external dependencies on some
+# platforms
+find_package(PkgConfig)
+
 # RtMidi
 
 find_package(RtMidi CONFIG)
 if (RtMidi_FOUND)
 	list(APPEND LIBRARIES RtMidi::rtmidi)
-else()
+	message("RtMidi library found in " ${RtMidi_DIR})
+elseif (PkgConfig_FOUND)
+	pkg_check_modules(RtMidi IMPORTED_TARGET rtmidi)
+	if (RtMidi_FOUND)
+		list(APPEND LIBRARIES PkgConfig::RtMidi)
+		message("RtMidi library found")
+	endif()
+endif()
+
+if (NOT RtMidi_FOUND)
 	# Fallback to find_library mode (in case rtmidi is too old). 
 	find_library(LIBRARY_RTMIDI NAMES rtmidi)
 	list(APPEND LIBRARIES ${LIBRARY_RTMIDI})
@@ -269,10 +282,9 @@
 
 	find_path(LIBRARY_RTMIDI_INCLUDE_DIR RtMidi.h PATH_SUFFIXES rtmidi)
 	list(APPEND INCLUDE_DIRS ${LIBRARY_RTMIDI_INCLUDE_DIR})
+	message("RtMidi library found in " ${RtMidi_DIR})
 endif()
 
-message("RtMidi library found in " ${RtMidi_DIR})
-
 # FLTK 
 
 set(FLTK_SKIP_FLUID TRUE)  # Don't search for FLTK's fluid
@@ -287,7 +299,15 @@
 if (SndFile_FOUND)
 	list(APPEND LIBRARIES SndFile::sndfile)
 	message("Libsndfile library found in " ${SndFile_DIR})
-else()
+elseif(PkgConfig_FOUND)
+	pkg_check_modules(SndFile IMPORTED_TARGET sndfile)
+	if (SndFile_FOUND)
+		list(APPEND LIBRARIES PkgConfig::SndFile)
+		message("Libsndfile library found")
+	endif()	
+endif()
+
+if (NOT SndFile_FOUND)
 	# Fallback to find_library mode (in case libsndfile is too old). 
 	find_library(LIBRARY_SNDFILE NAMES sndfile libsndfile libsndfile-1)