add Common lib (#80)

* add Common lib
 - moved Shapes.h from Rendering to common
 - fixed a bug, where closing the AVCodecContext crashes on MacOS

* add googletest to install scripts

* fix ubuntu install script

* add test step

* disable test step on ios-simulator

* add missing include directives in Vector*

Author: Fabian Seidl

.github/workflows/sourcehold.yml

@@ -40,7 +40,8 @@ jobs:
           - target-platform: "ios-simulator"
             os: macos-latest
             install-dependencies: "sh ./apple/install-dependencies-ios.sh -s -d 11.0 ./thirdparty/ios"
-            cmake-configure-options: '-GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_OSX_ARCHITECTURES="x86_64"'
+            #TODO: add gtest install script for ios
+            cmake-configure-options: '-GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_OSX_ARCHITECTURES="x86_64" -DSOURCEHOLD_BUILD_TESTS=OFF'
             cmake-build-options: "-- -sdk iphonesimulator"
             uploaded-artifact-name: "sourcehold-ios"
           - os: windows-latest
@@ -141,6 +142,15 @@ jobs:
           zip -r ${{ github.workspace }}/${{ matrix.uploaded-artifact-name }}.zip "$BUILD_ARTIFACT_NAME"
         fi
 
+    - name: Run tests
+      shell: bash
+      run: |
+        if [[ ${{ matrix.target-platform }} != 'ios-simulator' ]]; then
+          pushd build/test
+          ctest
+          popd
+        fi
+
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:

CMakeLists.txt

@@ -9,6 +9,10 @@ include(cmake/Preamble.cmake)
 add_subdirectory(apple)
 add_subdirectory(src)
 
+if(SOURCEHOLD_BUILD_TESTS MATCHES ON)
+  add_subdirectory(test)
+endif()
+
 # TODO(seidl):
 # still some modules hidden here..
 set(SOURCE_FILES 

apple/install-dependencies-macos.sh

@@ -26,3 +26,10 @@ if ! is_brew_formula_installed sdl2 ; then
 else
     echo "SDL2 for macOS is already installed..."
 fi
+
+if ! is_brew_formula_installed googletest ; then
+    echo "Installing Google Test for macOS..."
+    brew install googletest
+else
+    echo "Google Test for macOS is already installed..."
+fi

cmake/Dependencies.cmake

@@ -98,3 +98,10 @@ AddImportedTarget(SWRESAMPLE::SWRESAMPLE
 )
 
 endif() # TARGET_OS_IOS
+
+# GTest
+if(SOURCEHOLD_BUILD_TESTS MATCHES ON)
+  find_package(GTest REQUIRED)
+endif()
+
+

cmake/Preamble.cmake

@@ -2,6 +2,8 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR})
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+option(SOURCEHOLD_BUILD_TESTS "Build Sourcehold tests" ON)
+
 if(MSVC)
   foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
     string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )

cmake/ProjectOptions.cmake

@@ -6,4 +6,4 @@ add_library(ProjectOptions INTERFACE)
 target_compile_features(ProjectOptions INTERFACE cxx_std_17)
 
 set_project_warnings(ProjectOptions)
-enable_sanitizers(ProjectOptions)
+enable_sanitizers(ProjectOptions)

src/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_subdirectory(System)
+add_subdirectory(Common)
 add_subdirectory(FFMPEG)
 add_subdirectory(Audio)
 add_subdirectory(Events)

src/Common/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(COMMON_SOURCE_FILES
+  Shapes.h
+  Rect.h
+  Line.h
+  Vector2.h
+  Vector3.h
+)
+
+add_library(Common INTERFACE ${COMMON_SOURCE_FILES})
+source_group("Source Files" FILES ${COMMON_SOURCE_FILES})
+
+target_include_directories(Common 
+  INTERFACE ${CMAKE_CURRENT_LIST_DIR}
+)
+

src/Common/Line.h

@@ -0,0 +1,9 @@
+#pragma once
+
+template <typename T>
+struct Line {
+  T x1;
+  T y1;
+  T x2;
+  T y2;
+};

src/Common/Rect.h

@@ -0,0 +1,8 @@
+#pragma once
+template <typename T>
+struct Rect {
+  T x;
+  T y;
+  T w;
+  T h;
+};