Fixed CMakeLists.txt and set build type in RPM scripts

bbc · Oct 1, 2023 · 1f98ac3 · 1f98ac3
1 parent 617de51
commit 1f98ac3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,6 @@
 #-------------------------------------------------------------------------------
 
 cmake_minimum_required(VERSION 2.8.7)
-cmake_policy(SET CMP0048 NEW)
 
 # Read version number from VERSION file and split into its component parts.
 
@@ -42,14 +41,18 @@ set(VERSION_PATCH ${CMAKE_MATCH_3})
 
 message(STATUS "Building version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
-project(audiowaveform VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+if(${CMAKE_VERSION} VERSION_GREATER "3.0.0")
+    cmake_policy(SET CMP0048 NEW)
+    project(audiowaveform VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+else()
+    project(audiowaveform)
+endif()
 
 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
    message(STATUS "Build type not specified: default is Release")
 endif()
 
-message(STATUS "CMAKE_VERSION=${CMAKE_VERSION}")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 
 # Prepend our CMake modules directory

diff --git a/rpm/Dockerfile-almalinux9 b/rpm/Dockerfile-almalinux9
@@ -26,7 +26,7 @@ RUN wget -qO- https://github.com/bbc/audiowaveform/archive/${AUDIOWAVEFORM_VERSI
     cd audiowaveform-${AUDIOWAVEFORM_VERSION} && \
     mkdir build && \
     cd build && \
-    cmake -D ENABLE_TESTS=0 .. && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D ENABLE_TESTS=0 .. && \
     make && \
     cpack -G RPM
 

diff --git a/rpm/Dockerfile-amazon-linux-2 b/rpm/Dockerfile-amazon-linux-2
@@ -30,7 +30,7 @@ RUN wget -qO- https://github.com/bbc/audiowaveform/archive/${AUDIOWAVEFORM_VERSI
     cd audiowaveform-${AUDIOWAVEFORM_VERSION} && \
     mkdir build && \
     cd build && \
-    cmake3 -D ENABLE_TESTS=0 .. && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D ENABLE_TESTS=0 .. && \
     make && \
     cpack3 -G RPM
 

diff --git a/rpm/Dockerfile-centos7 b/rpm/Dockerfile-centos7
@@ -29,7 +29,7 @@ RUN wget -qO- https://github.com/bbc/audiowaveform/archive/${AUDIOWAVEFORM_VERSI
     cd audiowaveform-${AUDIOWAVEFORM_VERSION} && \
     mkdir build && \
     cd build && \
-    cmake3 -D ENABLE_TESTS=0 .. && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D ENABLE_TESTS=0 .. && \
     make && \
     cpack3 -G RPM
 

diff --git a/rpm/Dockerfile-centos8 b/rpm/Dockerfile-centos8
@@ -38,7 +38,7 @@ RUN wget -qO- https://github.com/bbc/audiowaveform/archive/${AUDIOWAVEFORM_VERSI
     cd audiowaveform-${AUDIOWAVEFORM_VERSION} && \
     mkdir build && \
     cd build && \
-    cmake -D ENABLE_TESTS=0 .. && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D ENABLE_TESTS=0 .. && \
     make && \
     cpack -G RPM
 

diff --git a/rpm/Dockerfile-debian b/rpm/Dockerfile-debian
@@ -24,7 +24,7 @@ RUN wget -qO- https://github.com/bbc/audiowaveform/archive/${AUDIOWAVEFORM_VERSI
     cd audiowaveform-${AUDIOWAVEFORM_VERSION} && \
     mkdir build && \
     cd build && \
-    cmake -D ENABLE_TESTS=0 .. && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D ENABLE_TESTS=0 .. && \
     make && \
     cpack -G DEB