[v1.0.3] CMake tweaks and compiler warning fixes (#2)

* Update OpenAL CMake min version

* CI: use default GCC and Clang

* Fix warnings

Author: karnkaul

.github/workflows/ci.yml

@@ -6,11 +6,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: init
-        run: sudo apt update -yqq && sudo apt install -yqq ninja-build g++-11 clang-15
+        run: sudo apt update -yqq && sudo apt install -yqq ninja-build
       - name: configure gcc
-        run: cmake -S . --preset=default -B build -DCAPO_USE_OPENAL=OFF -DCAPO_BUILD_EXAMPLES=OFF -DCMAKE_CXX_COMPILER=g++-11
+        run: cmake -S . --preset=default -B build -DCAPO_USE_OPENAL=OFF -DCAPO_BUILD_EXAMPLES=OFF
       - name: configure clang
-        run: cmake -S . --preset=ninja-clang -B clang -DCAPO_USE_OPENAL=OFF -DCAPO_BUILD_EXAMPLES=OFF -DCMAKE_CXX_COMPILER=clang++-15
+        run: cmake -S . --preset=ninja-clang -B clang -DCAPO_USE_OPENAL=OFF -DCAPO_BUILD_EXAMPLES=OFF
       - name: build gcc
         run: cmake --build build --config=Release
       - name: build clang

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_DEBUG_POSTFIX "-d")
 
-project(capo-lite VERSION "1.0.2")
+project(capo-lite VERSION "1.0.3")
 
 set(is_root_project OFF)
 

capo/src/detail/unique.hpp

@@ -2,6 +2,12 @@
 #include <concepts>
 #include <utility>
 
+#if defined(_MSC_VER)
+#define CAPO_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
+#else
+#define CAPO_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#endif
+
 namespace capo {
 ///
 /// \brief Default deleter for a Unique<Type>.
@@ -72,6 +78,6 @@ class Unique {
 
   private:
 	Type m_t{};
-	[[no_unique_address]] Deleter m_deleter{};
+	CAPO_NO_UNIQUE_ADDRESS Deleter m_deleter{};
 };
 } // namespace capo

ext/CMakeLists.txt

@@ -4,6 +4,7 @@ find_package(Threads)
 
 file(ARCHIVE_EXTRACT INPUT "${CMAKE_CURRENT_SOURCE_DIR}/src.zip" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}")
 
+message(STATUS "[dr-libs]")
 add_subdirectory(src/dr-libs)
 
 if(CAPO_USE_OPENAL)
@@ -21,8 +22,15 @@ if(CAPO_USE_OPENAL)
   set(ALSOFT_INSTALL_UTILS OFF)
   set(ALSOFT_UPDATE_BUILD_VERSION OFF)
   set(LIBTYPE STATIC)
+  message(STATUS "[openal-soft]")
   add_subdirectory(src/openal-soft)
   add_library(${PROJECT_NAME}::OpenAL ALIAS OpenAL)
+
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    target_compile_options(OpenAL PRIVATE -w)
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    target_compile_options(OpenAL PRIVATE /wd4244 /wd4267)
+  endif()
 endif()
 
 add_library(${PROJECT_NAME} INTERFACE)