convert OpenAL to import targets

beyond-all-reason · Nov 24, 2024 · 7c39609 · 7c39609
1 parent cf64d67
commit 7c39609
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/rts/System/Sound/CMakeLists.txt b/rts/System/Sound/CMakeLists.txt
@@ -44,8 +44,7 @@ if    (NOT NO_SOUND)
 			OpenAL/VorbisShared.cpp
 		)
 
-	find_package_static(OpenAL REQUIRED)
-	include_directories(${OPENAL_INCLUDE_DIR})
+	find_package_static(OpenAL 1.18.2 REQUIRED)
 	find_package_static(OggVorbis 1.3.4 REQUIRED)
 
 	find_package(SDL2 MODULE REQUIRED)
@@ -56,6 +55,6 @@ if    (NOT NO_SOUND)
 	add_library(sound STATIC EXCLUDE_FROM_ALL ${soundSources})
 	target_link_libraries(sound SDL2::SDL2)
 	target_link_libraries(sound vorbis::vorbisfile vorbis::vorbis Ogg::ogg)
-	target_link_libraries(sound ${OPENAL_LIBRARY})
+	target_link_libraries(sound OpenAL::OpenAL)
 	target_link_libraries(sound Tracy::TracyClient)
 endif (NOT NO_SOUND)
diff --git a/rts/builds/headless/CMakeLists.txt b/rts/builds/headless/CMakeLists.txt
@@ -12,7 +12,6 @@ add_definitions(-DNO_SOUND)
 remove_definitions(-DAVI_CAPTURING)
 
 set(OpenGL_GL_PREFERENCE LEGACY)
-include_directories(${OPENAL_INCLUDE_DIR})
 
 find_package(OpenGL 3.0 REQUIRED)
 

diff --git a/rts/builds/legacy/CMakeLists.txt b/rts/builds/legacy/CMakeLists.txt
@@ -55,7 +55,6 @@ list(APPEND engineLibraries RmlUi::Debugger)
 list(APPEND engineLibraries lunasvg)
 
 ### Assemble external incude dirs
-list(APPEND engineIncludes ${OPENAL_INCLUDE_DIR})
 list(APPEND engineIncludes ${ENGINE_SRC_ROOT_DIR}/lib/asio/include)
 list(APPEND engineIncludes ${ENGINE_SRC_ROOT_DIR}/lib/slimsig/include)
 list(APPEND engineIncludes ${ENGINE_SRC_ROOT_DIR}/lib/cereal/include)

diff --git a/test/headercheck/CMakeLists.txt b/test/headercheck/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
 		${Spring_SOURCE_DIR}/include
 		${Spring_SOURCE_DIR}/rts/lib
 		${Spring_SOURCE_DIR}/rts/lib/lua/include
-		${OPENAL_INCLUDE_DIR}
 	)
 
 file(GLOB_RECURSE headers