Structure restructuring repo

.github/workflows/msbuild.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   # Path to the solution file relative to the root of the project.
-  SOLUTION_FILE_PATH: .
+  SOLUTION_FILE_PATH: build\msw
 
   # Configuration type to build.
   # You can convert this to a build matrix if you need coverage of multiple configuration types.
@@ -25,8 +25,34 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
-    - name: Build
+    - name: Build backend as a static library
       working-directory: ${{env.GITHUB_WORKSPACE}}
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} /ignore:.vcxproj /t:VocalTractLabBackend
+
+    - name: Build backend tests
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} /ignore:.vcxproj /t:VtlBackendTests
+
+    - name: Run backend tests
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: .\lib\Release\VtlBackendTests.exe
+
+    - name: Build API as a DLL
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} /ignore:.vcxproj /t:VocalTractLabApi
+
+    - name: Build API tests
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} /ignore:.vcxproj /t:VtlApiTests
+
+    - name: Run API tests
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: .\lib\Release\VtlApiTests.exe

CMakeLists.txt

@@ -1,9 +1,66 @@
 # CMakeList.txt : CMake project for VocalTractLabApi, include source and define
 # project specific logic here.
 #
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.13)
+set(CMAKE_CXX_STANDARD 17)
 
-project ("VocalTractLabApi")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 
 add_definitions(-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS)
-add_library (VocalTractLabApi SHARED VocalTractLabApi.def AnatomyParams.cpp AnatomyParams.h AudioFile.h Constants.h Dsp.cpp Dsp.h F0EstimatorYin.cpp F0EstimatorYin.h GeometricGlottis.cpp GeometricGlottis.h Geometry.cpp Geometry.h GesturalScore.cpp GesturalScore.h Glottis.cpp Glottis.h IirFilter.cpp IirFilter.h ImpulseExcitation.cpp ImpulseExcitation.h LfPulse.cpp LfPulse.h Matrix2x2.cpp Matrix2x2.h PoleZeroPlan.cpp PoleZeroPlan.h Sampa.cpp Sampa.h SegmentSequence.cpp SegmentSequence.h Signal.cpp Signal.h   Splines.cpp Splines.h StaticPhone.cpp StaticPhone.h Surface.cpp Surface.h Synthesizer.cpp Synthesizer.h TdsModel.cpp TdsModel.h TimeFunction.cpp TimeFunction.h TlModel.cpp TlModel.h TriangularGlottis.cpp TriangularGlottis.h Tube.cpp Tube.h TubeSequence.h TwoMassModel.cpp TwoMassModel.h VocalTract.cpp VocalTract.h VocalTractLabApi.cpp VocalTractLabApi.h VoiceQualityEstimator.cpp VoiceQualityEstimator.h VowelLf.cpp VowelLf.h XmlHelper.cpp XmlHelper.h XmlNode.cpp XmlNode.h)
+
+project("VocalTractLabApi")
+add_library(VocalTractLabApi SHARED)
+set_target_properties(VocalTractLabApi PROPERTIES PUBLIC_HEADER include/VocalTractLabApi/VocalTractLabApi.h)
+target_include_directories (VocalTractLabApi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/VocalTractLabApi)
+target_include_directories (VocalTractLabApi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/Backend)
+target_sources(VocalTractLabApi PRIVATE src/VocalTractLabApi.def src/AnatomyParams.cpp src/Dsp.cpp src/F0EstimatorYin.cpp src/GeometricGlottis.cpp src/Geometry.cpp src/GesturalScore.cpp src/Glottis.cpp src/IirFilter.cpp src/ImpulseExcitation.cpp src/LfPulse.cpp src/Matrix2x2.cpp src/PoleZeroPlan.cpp src/Sampa.cpp src/SegmentSequence.cpp src/Signal.cpp src/Splines.cpp src/StaticPhone.cpp src/Surface.cpp src/Synthesizer.cpp src/TdsModel.cpp src/TimeFunction.cpp src/TlModel.cpp src/TriangularGlottis.cpp src/Tube.cpp src/TwoMassModel.cpp src/VocalTract.cpp src/VocalTractLabApi.cpp src/VoiceQualityEstimator.cpp src/VowelLf.cpp src/XmlHelper.cpp src/XmlNode.cpp)
+
+
+project("VocalTractLabBackend")
+add_library(VocalTractLabBackend STATIC)
+target_include_directories (VocalTractLabBackend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/Backend)
+target_sources(VocalTractLabBackend PUBLIC src/AnatomyParams.cpp src/Dsp.cpp src/F0EstimatorYin.cpp src/GeometricGlottis.cpp src/Geometry.cpp src/GesturalScore.cpp src/Glottis.cpp src/IirFilter.cpp src/ImpulseExcitation.cpp src/LfPulse.cpp src/Matrix2x2.cpp src/PoleZeroPlan.cpp src/Sampa.cpp src/SegmentSequence.cpp src/Signal.cpp src/Splines.cpp src/StaticPhone.cpp src/Surface.cpp src/Synthesizer.cpp src/TdsModel.cpp src/TimeFunction.cpp src/TlModel.cpp src/TriangularGlottis.cpp src/Tube.cpp src/TwoMassModel.cpp src/VocalTract.cpp src/VoiceQualityEstimator.cpp src/VowelLf.cpp src/XmlHelper.cpp src/XmlNode.cpp)
+
+
+include(FetchContent)
+FetchContent_Declare(
+  googletest
+  URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+)
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
+
+enable_testing()
+
+add_executable(
+  "VtlApiTests"
+  "test/VtlApiTests.cpp"
+ )
+
+target_include_directories (VtlApiTests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/VocalTractLabApi)
+
+target_link_libraries(
+  VtlApiTests
+  gtest_main
+  VocalTractLabApi
+)
+
+add_executable(
+  "VtlBackendTests"
+  "test/VtlBackendTests.cpp"
+ )
+
+target_include_directories (VtlBackendTests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+target_link_libraries(
+  VtlBackendTests
+  gtest_main
+  VocalTractLabBackend
+)
+
+include(GoogleTest)
+gtest_discover_tests(VtlApiTests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+gtest_discover_tests(VtlBackendTests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})

README.md

@@ -28,6 +28,6 @@ cmake --build . --config Release
 ```
 
 ### Build using Visual Studio 2019 (Windows)
-- Open ``VocalTractLabApi.sln``
+- Open ``VocalTractLabApi.sln`` in the folder `build/msw`
 - Build the project ``VocalTractLabApi``