refactor: Changes in CMake

Author: dariusz-f

CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required (VERSION 3.12)
 
+########################################
+# Project versioning
+########################################
+
 # Set project version from git tag or version.txt file
 function(get_versions versionstring VERSION_MAJOR VERSION_MINOR VERSION_PATCH)
     string(REGEX REPLACE "^([vV])([0-9]*)([.][0-9]*[.][0-9]*-?.*)$" "\\2" numbers ${versionstring} )
@@ -52,21 +56,33 @@ if(VERSION_MAJOR STREQUAL ${VERSION_STRING})
 endif()
 message("OAPV VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
+project (OAPV VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} LANGUAGES C)
+
+########################################
+# Input arguments.
+########################################
+
 # Check input arguments.
 option(OAPV_APP_STATIC_BUILD "oapv_app will be statically linked against static oapv library" ON)
 if(OAPV_APP_STATIC_BUILD)
     add_definitions(-DOAPV_STATIC_DEFINE)
 endif(OAPV_APP_STATIC_BUILD)
 
-cmake_policy(SET CMP0048 NEW)
-set(CMAKE_C_STANDARD 99)
+# To build for arm provide in command line: -DARM=TRUE
+if(NOT ARM)
+  set(ARM "FALSE")
+else()
+  add_definitions(-DARM=1)
+  set(ARM "TRUE")
+endif()
 
-# Maps to a solution file (OAPV.sln).
-project (OAPV VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+########################################
+# Compilation flags
+########################################
 
 # Set compiler flags and options.
 if( MSVC )
+  message("Not supported yet!")
 elseif( UNIX OR MINGW )
     if(NOT CMAKE_BUILD_TYPE)
         set(CMAKE_BUILD_TYPE "Release")
@@ -81,20 +97,33 @@ elseif( UNIX OR MINGW )
         set(OPT_DBG "-DNDEBUG") # disable assert
     endif()
 
-    #set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPT_DBG} -${OPT_LV} -fomit-frame-pointer -Wall -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-attributes -Werror -Wno-strict-overflow -Wno-unknown-pragmas -Wno-stringop-overflow -std=c99")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPT_DBG} -${OPT_LV} -fomit-frame-pointer -Wall -Wno-unused-function -std=c99")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pointer-sign -pthread -Wno-pointer-to-int-cast")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPT_DBG} -${OPT_LV} -fomit-frame-pointer -pthread -std=c99")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-function -Wno-pointer-sign -Wno-pointer-to-int-cast")
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lm")
+else()
+    message("Unknown compiler")
 endif()
 
 # Command to output information to the console
 message ("c Flags: " ${CMAKE_C_FLAGS})
 message ("linker Flags: " ${CMAKE_EXE_LINKER_FLAGS})
 
+########################################
+# Configuration
+########################################
+
+set(CMAKE_C_STANDARD 99)
+cmake_policy(SET CMP0048 NEW)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 # Sub-directories where more CMakeLists.txt exist
 add_subdirectory(src)
 add_subdirectory(app)
 
+########################################
+# Targets
+########################################
+
 # uninstall target
 if(NOT TARGET uninstall)
   configure_file(
@@ -106,14 +135,20 @@ if(NOT TARGET uninstall)
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 endif()
 
+########################################
+# CPack project packaging
+########################################
+
 # Packaging
 include(InstallRequiredSystemLibraries)
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 
 set(CPACK_PACKAGE_NAME "OpenAPV")
 set(CPACK_PACKAGE_VENDOR "OpenAPV")
-set(CPACK_PACKAGE_CONTACT "https://github.com/openapv/oapv")
+set(CPACK_PACKAGE_CONTACT "https://github.com/openapv")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/openapv/oapv/releases")
+set(CMAKE_PROJECT_HOMEPAGE_URL "https://github.com/openapv/oapv")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open Advanced Professional Video Codec")
 set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
@@ -127,7 +162,10 @@ set(CPACK_GENERATOR "DEB")
 
 include(CPack)
 
-# Testing 
+########################################
+# Testing
+########################################
+
 option(ENABLE_TESTS "Enable tests" ON)
 if (${ENABLE_TESTS})
     enable_testing()
@@ -141,11 +179,19 @@ add_test(NAME Decoder_runs COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/oapv_app_dec)
 
 # Test - encode
 add_test(NAME encode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/oapv_app_enc -i ${CMAKE_CURRENT_SOURCE_DIR}/test/sequence/pattern1_yuv422p10le_320x240_25fps.y4m -w 320 -h 240 -z 25 -o out.oapv)
-set_tests_properties(encode PROPERTIES FAIL_REGULAR_EXPRESSION "Encoded frame count               = 0")
-set_tests_properties(encode PROPERTIES PASS_REGULAR_EXPRESSION "Encoded frame count               = 125")
+set_tests_properties(encode PROPERTIES
+    TIMEOUT 20
+    FAIL_REGULAR_EXPRESSION "Encoded frame count               = 0"
+    PASS_REGULAR_EXPRESSION "Encoded frame count               = 125"
+    RUN_SERIAL TRUE
+)
 
 # Test - decode
 add_test(NAME decode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/oapv_app_dec -i out.oapv)
-set_tests_properties(decode PROPERTIES FAIL_REGULAR_EXPRESSION "Decoded frame count               = 0")
-set_tests_properties(decode PROPERTIES PASS_REGULAR_EXPRESSION "Decoded frame count               = 125")
-
+set_tests_properties(decode PROPERTIES
+    TIMEOUT 10
+    DEPENDS encode
+    FAIL_REGULAR_EXPRESSION "Decoded frame count               = 0"
+    PASS_REGULAR_EXPRESSION "Decoded frame count               = 125"
+    RUN_SERIAL TRUE
+)