CMake: unified config for Windows/Linux/macOS

Author: corporateshark

CMakeLists.txt

@@ -14,12 +14,7 @@ include_directories(
 	src
 	src/OpenAL
 	libs
-	libs/libogg/include
 	libs/libmodplug/src
-	libs/flac/include
-	libs/monkey-audio
-   libs/libopus/include
-   libs/libopusfile/include
 )
 
 set(SRC_FILES
@@ -89,58 +84,46 @@ set(INSTALL_PKGCONFIG_MODULES OFF CACHE BOOL "")
 set(WITH_OGG                  ON CACHE BOOL "")
 
 add_subdirectory(libs/monkey-audio EXCLUDE_FROM_ALL)
+add_subdirectory(libs/libogg EXCLUDE_FROM_ALL)
+add_subdirectory(libs/libvorbis EXCLUDE_FROM_ALL)
+add_subdirectory(libs/flac EXCLUDE_FROM_ALL) # Flac adds ligogg
+add_subdirectory(libs/libmodplug EXCLUDE_FROM_ALL)
+add_subdirectory(libs/libopus EXCLUDE_FROM_ALL)
+add_subdirectory(libs/libopusfile EXCLUDE_FROM_ALL)
 
 if(MSVC OR APPLE)
-	add_subdirectory(libs/libogg EXCLUDE_FROM_ALL)
-	add_subdirectory(libs/libvorbis EXCLUDE_FROM_ALL)
-	add_subdirectory(libs/flac EXCLUDE_FROM_ALL) # Flac adds ligogg
-	add_subdirectory(libs/libmodplug EXCLUDE_FROM_ALL)
-	add_subdirectory(libs/libopus EXCLUDE_FROM_ALL)
-	add_subdirectory(libs/libopusfile EXCLUDE_FROM_ALL)
 	target_compile_definitions(FLAC PRIVATE "PACKAGE_VERSION=\"1.5.0\"")
 	target_compile_definitions(FLAC PRIVATE "FLAC__HAS_OGG=1")
+	target_compile_definitions(FLAC PRIVATE "HAVE_LROUND=1")
+	target_compile_definitions(FLAC PRIVATE "HAVE_FSEEKO=1")
+	target_compile_definitions(FLAC PRIVATE "HAVE_STDINT_H=1")
+endif()
+
+if(UNIX)
+	find_package(OpenAL REQUIRED)
+	target_compile_options(FLAC PRIVATE -Wno-undef)
+	target_compile_options(modplug PRIVATE -Wno-deprecated-declarations -Wno-unused-result -Wno-address)
+	target_compile_options(monkeyaudio PRIVATE -Wno-deprecated-declarations)
+	target_compile_options(opus PRIVATE -Wno-unused-but-set-variable)
+	target_compile_options(opusfile PRIVATE -Wno-maybe-uninitialized)
 	target_link_libraries(portamp
-		Ogg::ogg
-		vorbis
-		vorbisfile
-		modplug
-		FLAC
-		monkeyaudio
-		Opus::opus
-		OpusFile::opusfile
-	)
-   if(APPLE)
-      target_compile_definitions(FLAC PRIVATE "HAVE_LROUND=1")
-      target_compile_definitions(FLAC PRIVATE "HAVE_FSEEKO=1")
-      target_compile_options(FLAC PRIVATE -Wno-undef)
-      target_compile_options(modplug PRIVATE -Wno-deprecated-declarations)
-      target_compile_options(monkeyaudio PRIVATE -Wno-deprecated-declarations)
-      target_compile_options(opus PRIVATE -Wno-unused-but-set-variable)
-      include_directories(/usr/local/include)
-      find_package(OpenAL REQUIRED)
-      target_link_libraries(portamp
-         dl
-         pthread
-         "${OPENAL_LIBRARY}"
-      )
-   endif()
-else()
-	target_link_libraries(portamp
-		ogg
-		vorbis
-		vorbisfile
-		modplug
-		FLAC
-		monkeyaudio
-		opus
-		opusfile
-		pthread
 		dl
-		openal
+		pthread
+		"${OPENAL_LIBRARY}"
 	)
-	include_directories(/usr/local/include)
 endif()
 
+target_link_libraries(portamp
+	Ogg::ogg
+	vorbis
+	vorbisfile
+	modplug
+	FLAC
+	monkeyaudio
+	Opus::opus
+	OpusFile::opusfile
+)
+
 if(MSVC)
 	set_property(TARGET ogg PROPERTY FOLDER ThirdParty)
 	set_property(TARGET vorbis PROPERTY FOLDER ThirdParty)

README.md

@@ -44,7 +44,7 @@ UNIX build instructions:
 ------------------------
 
 ```
-sudo apt-get install libopus-dev libopusfile-dev libflac-dev libopenal-dev libvorbis-dev libmodplug-dev
+sudo apt-get install libopenal-dev
 mkdir build
 cd build
 cmake .. -G "Unix Makefiles"

libs/monkey-audio/CMakeLists.txt

@@ -8,12 +8,6 @@ else()
 	ADD_DEFINITIONS(-O2)
 endif()
 
-include_directories(
-	.
-	Assembly
-	Shared
-)
-
 set(SRC_FILES
 	APECompress.cpp
 	APECompressCore.cpp
@@ -68,3 +62,6 @@ set(HEADER_FILES
 )
 
 add_library(monkeyaudio ${SRC_FILES} ${HEADER_FILES})
+
+target_include_directories(monkeyaudio PUBLIC .)
+target_include_directories(monkeyaudio PRIVATE Assembly Shared)