Removes UniquePtr and uses std::unique_ptr everywhere

.github/workflows/cmake.yml

@@ -1,11 +1,9 @@
 name: CMake
 
-on: [push]
-#on:
-#  push:
-#    branches: [ master ]
-#  pull_request:
-#    branches: [ master ]
+on:
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -26,19 +24,20 @@ jobs:
         curl http://download.opensuse.org/repositories/science:/dlr/xUbuntu_18.04/Release.key | sudo apt-key add -
         echo "deb http://download.opensuse.org/repositories/science:/dlr/xUbuntu_18.04/ /" | sudo tee -a /etc/apt/sources.list       
         sudo apt-get update -qq
-        sudo apt-get install -y libboost-all-dev libtixi3-dev cmake cmake-data
+        sudo apt-get install -y libtixi3-dev cmake cmake-data
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
+      working-directory: ${{github.workspace}}/build
       # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: make VERBOSE=1
 
     - name: Test
       working-directory: ${{github.workspace}}/build
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ./tests
+      run: ./tests

CMakeLists.txt

@@ -1,15 +1,14 @@
 # CPACSGen cmake project
 # author: Bernhard Manfred Gruber
 
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.11.0)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 project(CPACSGen)
 
 # cache variables
-set(BOOST_ROOT "" CACHE PATH "Boost installation prefix")
 set(TIXI_PATH  "" CACHE PATH "Tixi installation prefix")
 set(TIGL_PATH  "" CACHE PATH "Tigl installation prefix")
 
@@ -22,12 +21,6 @@ if (SYSTEM_RHEL7)
     endif()
 endif()
 
-# find boost
-set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Find static or dynamic libs. Static libs require lib prefix.")
-find_package (Boost REQUIRED COMPONENTS system filesystem date_time regex unit_test_framework)
-mark_as_advanced(CLEAR BOOST_ROOT) # find module for boost marks these variables as advanced
-mark_as_advanced(CLEAR Boost_USE_STATIC_LIBS)
-
 # find tixi
 set(CMAKE_PREFIX_PATH "${TIXI_PATH};${CMAKE_PREFIX_PATH}")
 find_package(tixi3 3.0.3 REQUIRED)
@@ -42,9 +35,6 @@ target_compile_definitions(lib${PROJECT_NAME} PUBLIC
 	-DCPACS_GEN
 )
 
-target_include_directories(lib${PROJECT_NAME} PUBLIC
-	${Boost_INCLUDE_DIRS}
-)
 
 # driver
 file(GLOB DRIVER_INPUTS src/driver/*.cpp *src/driver/*.h *.md)
@@ -53,32 +43,33 @@ source_group(" " FILES ${DRIVER_INPUTS})
 
 target_link_libraries(${PROJECT_NAME}
 	lib${PROJECT_NAME}
-	${Boost_LIBRARIES}
 )
 
 # tests
+message(STATUS "Build gtest Testsuite")
+
+enable_testing()
+option(gtest_force_shared_crt "" ON)
+mark_as_advanced(gtest_force_shared_crt gtest_build_tests gtest_build_samples gtest_disable_pthreads)
+
+set(BUILD_GMOCK OFF)
+set(INSTALL_GTEST OFF)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+message(STATUS "Download and configure the TIGL gtest Testsuite")
+include(AddGoogleTest)
+message(STATUS "Download and configure the TIGL gtest Testsuite - Success")
+
 set(DATA_DIR ${CMAKE_SOURCE_DIR}/test/data)
 configure_file(test/paths.h.in ${CMAKE_BINARY_DIR}/test/paths.h)
 
 file(GLOB TEST_INPUTS test/*.cpp test/*.h)
 list(APPEND TEST_INPUTS ${CMAKE_BINARY_DIR}/test/paths.h)
 add_executable(tests ${TEST_INPUTS})
-source_group(" " FILES ${TEST_INPUTS})
-
-if(NOT Boost_USE_STATIC_LIBS)
-	target_compile_definitions(tests PUBLIC
-		-DBOOST_TEST_DYN_LINK
-	)
-endif()
-
+target_link_libraries(tests PRIVATE gtest gtest_main libCPACSGen)
 target_include_directories(tests PUBLIC
 	${CMAKE_BINARY_DIR}/test
 )
-
-target_link_libraries(tests
-	lib${PROJECT_NAME}
-	${Boost_LIBRARIES}
-)
+add_test(NAME tests COMMAND tests)
 
 # generate target
 if(TIGL_PATH)

README.md

@@ -13,9 +13,8 @@ https://github.com/RISCSoftware/cpacs_tigl_gen
 The following components are required to build and run CPACSGen
 * A working copy of CPACSGen
 * CMake
-* C\++11/C++14 compliant compiler (VS2017 is currently used and tested)
+* C\++17 compliant compiler (VS2017 is currently used and tested)
 * TIXI library (https://github.com/DLR-SC/tixi)
-* Boost libraries (v1.55 or higher)
 * A working copy of TiGL with CPACSGen input files (https://github.com/DLR-SC/tigl)
 
 ## Input files
@@ -42,9 +41,8 @@ For each subdirectory, CPACSGen runs an additional pass, putting the generated f
 1. Clone the CPACSGen repository from Github
 2. Clone the TiGL repository Github
 3. Use CMake to configure CPACSGen
-    1. Set BOOST_ROOT
-    2. Set TIXI_PATH
-    3. Set TIGL_PATH to the directory of your TiGL clone
+    1. Set TIXI_PATH, if the TiXI package is not already installed in the current conda environment
+    2. Set TIGL_PATH to the directory of your TiGL clone
 4. Build CPACSGen
 5. Build target generate  
    executes CPACSGen.exe $\{TIGL_DIR}/cpacs_gen_input $\{CPACSGEN_DIR}/src $\{TIGL_DIR}/src/generated
@@ -107,7 +105,3 @@ The classes generated by CPACSGen depend upon the following helper files, which
   Wrappers over TIXI functions providing a C++ friendly interface (references, std::string, exceptions, ...).
   Is used by the ReadCPACS and WriteCPACS implementation.
 
-* UniquePtr.hpp  
-  Contains tigl\::unique_ptr\<T> which defaults to std\::unique_ptr\<T> if C++11 is available, otherwise provides a custom type based on std\::auto_ptr\<T>.
-  Furthermore, the generated classes may require boost::optional\<T>, which is part of TiGL, and some internal TiGL files.
-

cmake/AddGoogleTest.cmake

@@ -0,0 +1,69 @@
+# 
+#
+# Downloads GTest and provides a helper macro to add tests. Add make check, as well, which
+# gives output on failed tests without having to set an environment variable.
+#
+#
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+include(FetchContent)
+FetchContent_Declare(googletest
+    GIT_REPOSITORY      https://github.com/google/googletest.git
+    GIT_TAG             v1.17.0)
+FetchContent_GetProperties(googletest)
+if(NOT googletest_POPULATED)
+    FetchContent_Populate(googletest)
+    set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "")
+    add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
+    unset(CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
+endif()
+
+
+if(CMAKE_CONFIGURATION_TYPES)
+    add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} 
+        --force-new-ctest-process --output-on-failure 
+        --build-config "$<CONFIGURATION>")
+else()
+    add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} 
+        --force-new-ctest-process --output-on-failure)
+endif()
+set_target_properties(check PROPERTIES FOLDER "Scripts")
+
+#include_directories(${gtest_SOURCE_DIR}/include)
+
+# More modern way to do the last line, less messy but needs newish CMake:
+# target_include_directories(gtest INTERFACE ${gtest_SOURCE_DIR}/include)
+
+
+if(GOOGLE_TEST_INDIVIDUAL)
+    include(GoogleTest)
+endif()
+
+# Target must already exist
+macro(add_gtest TESTNAME)
+    target_link_libraries(${TESTNAME} PUBLIC gtest gtest_main)
+
+    if(GOOGLE_TEST_INDIVIDUAL)
+        gtest_discover_tests(${TESTNAME}
+            TEST_PREFIX "${TESTNAME}."
+            PROPERTIES FOLDER "Tests")
+    else()
+        add_test(${TESTNAME} ${TESTNAME})
+        set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests")
+    endif()
+
+endmacro()
+
+mark_as_advanced(
+gmock_build_tests
+gtest_build_samples
+gtest_build_tests
+gtest_disable_pthreads
+gtest_force_shared_crt
+gtest_hide_internal_symbols
+BUILD_GMOCK
+BUILD_GTEST
+)
+
+set_target_properties(gtest gtest_main
+    PROPERTIES FOLDER "Extern")

src/driver/main.cpp

@@ -1,4 +1,4 @@
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <iostream>
 #include <iomanip>
 
@@ -9,12 +9,11 @@
 #include "../lib/Filesystem.h"
 #include "../lib/NotImplementedException.h"
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 
 namespace tigl {
     const auto runtimeFiles = {
         "TixiHelper.h",
-        "UniquePtr.h",
     };
 
     void processDirectory(const std::string& inputDirectory, const std::string& runtimeDirectory, const std::string& outputDirectory, const std::string& typeSystemGraphVisFile, Filesystem& fs, const std::string& ns = "") {