Fixed issues with unit tests build scripts

Author: Duncan Crutchley

UnitTests/GoogleTests/CMakeLists.txt

@@ -165,6 +165,7 @@ target_compile_definitions(CoreLibraryUnitTests PUBLIC
 target_include_directories(CoreLibraryUnitTests PUBLIC
   "${CORELIB_BOOST_ROOT}"
   ../../Include
+  ../../Include/msgpack
 )
 
 if(MSVC)
@@ -220,4 +221,4 @@ target_link_libraries(CoreLibraryUnitTests PRIVATE
 )
 
 include(GoogleTest)
-gtest_discover_tests(CoreLibraryUnitTests)
+gtest_discover_tests(CoreLibraryUnitTests)

UnitTests/GoogleTests/build_linux_64bit_debug.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 bash test.proto_gen.sh
+bash test.flatbuffer_gen.sh
 
 # Make sure you go to /Projvects/ThirdParty/libbacktrace and build and install libbacktrace.
 
 set -e
 
 export CORELIB_ROOT=/home/$USER/Projects/cpp/CoreLibrary
 export CORELIB_BOOST_ROOT=${CORELIB_ROOT}/../../../ThirdParty/boost_1_90_0
-export CORELIB_BOOST_LIB=${CORELIB_ROOT}/../../../ThirdParty/boost_1_90_0/lib64-msvc-14.3
+export CORELIB_BOOST_LIB=${CORELIB_ROOT}/../../../ThirdParty/boost_1_90_0/lib
 # Not nmeeded fo Linux build
 export CORELIB_BOOST_LIB_NAME_STUB=
 export CORELIB_BOOST_LIB_NAME_STUB_D=
@@ -17,7 +18,6 @@ export CORELIB_VCPKG_CMAKE_PATH=${CORELIB_ROOT}/../../../ThirdParty/vcpkg/script
 # Tidy previous installation/build folders.
 rm -rf build
 
-# Create build files
 # E.g. CORELIB_DISABLE_ASIO_TESTS=ON, disables ASIO tests, CORELIB_DISABLE_ASIO_TESTS=OFF enables ASIO tests
 cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE="${CORELIB_VCPKG_CMAKE_PATH}" -DCORELIB_USE_STD_FILESYSTEM=ON -DCORELIB_DISABLE_ASIO_TESTS=OFF -DCORELIB_DISABLE_CSVGRID_TESTS=OFF -DCORELIB_DISABLE_DEBUGLOG_TESTS=OFF -DCORELIB_DISABLE_FILEUTILS_TESTS=OFF -DCORELIB_DISABLE_FLOAT_COMPARE_TESTS=OFF -DCORELIB_DISABLE_SORTING_TESTS=OFF -DCORELIB_DISABLE_GPROTOBUF_TESTS=OFF -DCORELIB_DISABLE_INIFILE_TESTS=OFF -DCORELIB_DISABLE_SERIALIZATIOFF_TESTS=OFF -DCORELIB_DISABLE_STRINGUTILS_TESTS=OFF -DCORELIB_DISABLE_THREADS_TESTS=OFF -DCORELIB_DISABLE_FLATBUFFER_TESTS=OFF
 
@@ -28,4 +28,4 @@ cd build
 
 ctest -C Debug
 
-ctest
+ctest

UnitTests/GoogleTests/build_linux_64bit_release.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 bash test.proto_gen.sh
+bash test.flatbuffer_gen.sh
 
 # Make sure you go to /Projvects/ThirdParty/libbacktrace and build and install libbacktrace.
 
 set -e
 
 export CORELIB_ROOT=/home/$USER/Projects/cpp/CoreLibrary
 export CORELIB_BOOST_ROOT=${CORELIB_ROOT}/../../../ThirdParty/boost_1_90_0
-export CORELIB_BOOST_LIB=${CORELIB_ROOT}/../../../ThirdParty/boost_1_90_0/lib64-msvc-14.3
+export CORELIB_BOOST_LIB=${CORELIB_ROOT}/../../../ThirdParty/boost_1_90_0/lib
 # Not nmeeded fo Linux build
 export CORELIB_BOOST_LIB_NAME_STUB=
 export CORELIB_BOOST_LIB_NAME_STUB_D=
@@ -25,4 +26,4 @@ cmake --build build --config Release
 
 cd build
 
-ctest -C Release
+ctest -C Release

UnitTests/GoogleTests/build_msvc2022_64bit_debug.bat

@@ -1,6 +1,7 @@
 @echo off
 
 call test.proto_gen.bat
+call test.flatbuffer_gen.bat
 
 setlocal enabledelayedexpansion
 

UnitTests/GoogleTests/build_msvc2022_64bit_release.bat

@@ -1,6 +1,7 @@
 @echo off
 
 call test.proto_gen.bat
+call test.flatbuffer_gen.bat
 
 setlocal enabledelayedexpansion
 

build_linux_64bit_release.sh

@@ -18,8 +18,8 @@ rm -rf build
 rm -rf RelWithDebInfo
 mkdir -p RelWithDebInfo
 
-mkdir -p RelWithDebInfo/static/bin
-mkdir -p RelWithDebInfo/dynamic/bin
+mkdir -p RelWithDebInfo/static
+mkdir -p RelWithDebInfo/dynamic
 
 # Create build files
 cmake -Bbuild  -DCMAKE_INSTALL_PREFIX="./RelWithDebInfo/dynamic" -DCMAKE_TOOLCHAIN_FILE="${CORELIB_VCPKG_CMAKE_PATH}" -DBUILD_SHARED_LIBS=ON -DCORELIB_USE_FLATBUFFERS=ON -DCORELIB_USE_STD_FILESYSTEM=ON  -DCMAKE_BUILD_TYPE=RelWithDebInfo
@@ -28,9 +28,8 @@ cmake -Bbuild  -DCMAKE_INSTALL_PREFIX="./RelWithDebInfo/dynamic" -DCMAKE_TOOLCHA
 cmake --build build -- -j$(nproc)
 
 # Install
-cmake --install build --prefix "./RelWithDebInfo/dynamic"
+cp ./build/libCoreLibrary.so ./RelWithDebInfo/dynamic
 
-# Static build
 rm -rf build
 
 # Create build files
@@ -40,4 +39,6 @@ cmake -Bbuild  -DCMAKE_INSTALL_PREFIX="./RelWithDebInfo/static"  -DBUILD_SHARED_
 cmake --build build -- -j$(nproc)
 
 # Install
-cmake --install build --prefix "./RelWithDebInfo/static"
+cp ./build/libCoreLibrary.a ./RelWithDebInfo/static
+
+rm -rf build