Replace conan with vcpkg (#139)

Author: markaren

.github/workflows/config.yml

@@ -3,84 +3,94 @@ name: FMI4cpp CI
 on: [ push, workflow_dispatch ]
 
 jobs:
-  conan-on-linux:
+
+  cmake-on-linux:
 
     runs-on: ${{ matrix.os }}
-    env:
-      CC: gcc-${{ matrix.compiler_version }}
-      CXX: g++-${{ matrix.compiler_version }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04]
-        compiler_version: [9]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install prerequisites
         run: |
-          sudo pip3 install --upgrade setuptools pip
-          sudo pip3 install conan
+          sudo apt-get update && sudo apt-get install -y --no-install-recommends \
+          gcc g++ cmake libzip-dev libpugixml-dev
 
       - name: Configure and build
         run: |
-          cmake . -B build -DFMI4CPP_USING_CONAN=TRUE -DFMI4CPP_BUILD_TESTS=ON -DFMI4CPP_BUILD_EXAMPLES=ON
+          cmake . -B build -DFMI4CPP_BUILD_TESTS=ON -DFMI4CPP_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build build
 
       - name: Test
         run: |
           cd build/tests && ctest
 
 
-  conan-on-windows:
+  vcpkg-on-linux:
 
     runs-on: ${{ matrix.os }}
+    env:
+      CC: gcc-${{ matrix.compiler_version }}
+      CXX: g++-${{ matrix.compiler_version }}
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019]
+        os: [ubuntu-20.04]
+        compiler_version: [9]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Install prerequisites
-        run: |
-          pip3 install conan
-        shell: bash
+      - name: Restore artifacts, or run vcpkg, build (and cache artifacts as post step)
+        uses: lukka/run-vcpkg@v10
+        id: runvcpkg
+        with:
+          vcpkgDirectory: '${{ github.workspace }}/vcpkg'
+          vcpkgGitCommitId: '12c2a93b4007612b5ffa980c9d2235eb0bcac10f'
+          vcpkgJsonGlob: 'vcpkg.json'
+          appendedCacheKey: vcpkginstall
 
       - name: Configure and build
         run: |
-          cmake . -B build -A x64 -DFMI4CPP_USING_CONAN=TRUE -DFMI4CPP_BUILD_TESTS=ON -DFMI4CPP_BUILD_EXAMPLES=ON
-          cmake --build build --config Release
-        shell: bash
+          cmake . -B build -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DFMI4CPP_BUILD_TESTS=ON -DFMI4CPP_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release
+          cmake --build build
 
       - name: Test
         run: |
-          cd build/tests && ctest -C Release
-        shell: bash
+          cd build/tests && ctest
 
-  cmake-on-linux:
+
+  vcpkg-on-windows:
 
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [windows-2019, windows-2022]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Install prerequisites
-        run: |
-          sudo apt-get install -y --no-install-recommends \
-          gcc g++ cmake libzip-dev libpugixml-dev
+      - name: Restore artifacts, or run vcpkg, build (and cache artifacts as post step)
+        uses: lukka/run-vcpkg@v10
+        id: runvcpkg
+        with:
+          vcpkgDirectory: '${{ github.workspace }}/vcpkg'
+          vcpkgGitCommitId: '12c2a93b4007612b5ffa980c9d2235eb0bcac10f'
+          vcpkgJsonGlob: 'vcpkg.json'
+          appendedCacheKey: vcpkginstall
 
       - name: Configure and build
         run: |
-          cmake . -B build -DFMI4CPP_BUILD_TESTS=ON -DFMI4CPP_BUILD_EXAMPLES=ON
-          cmake --build build
+          cmake . -B build -A x64 -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DFMI4CPP_BUILD_TESTS=ON -DFMI4CPP_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release
+          cmake --build build --config Release
+        shell: bash
 
       - name: Test
         run: |
-          cd build/tests && ctest
+          cd build/tests && ctest -C Release
+        shell: bash

.github/workflows/upload.yml

@@ -1,10 +1,10 @@
 ### BUILDING
 
-For building FMI4cpp, you can use either `conan` or `apt-get` for getting the required dependencies.
+For building FMI4cpp, you can use either `vcpkg` or `apt-get` for getting the required dependencies.
 
-##### conan
+##### vcpkg
 
-Install [conan](https://conan.io/) and run cmake with the option `-DFMI4CPP_USING_CONAN=ON`.
+Call CMake with `-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake`
 
 ##### apt-get
 

BUILDING.md

@@ -10,7 +10,6 @@ message("Current fmi4cpp version: ${projectVersion}\n")
 
 option(FMI4CPP_BUILD_TESTS "Build tests" OFF)
 option(FMI4CPP_BUILD_EXAMPLES "Build examples" OFF)
-option(FMI4CPP_USING_CONAN "Build using conan" OFF)
 option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
 
 set(FMI4CPP_LOG_LEVEL "DEFAULT" CACHE STRING "FMI4cpp logging level")
@@ -26,36 +25,12 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif ()
 
-if (FMI4CPP_USING_CONAN)
-    if (CONAN_EXPORTED) # in conan local cache
-        # standard conan installation, deps will be defined in conanfile.py
-        # and not necessary to call conan again, conan is already running
-        include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-        conan_basic_setup()
-    else ()
-
-        include(cmake/conan.cmake)
-        conan_cmake_autodetect(settings)
-
-        set(shared False)
-        if (BUILD_SHARED_LIBS)
-            set(shared True)
-        endif ()
-
-        conan_cmake_run(
-                CONANFILE conanfile.py
-                OPTIONS shared=${shared}
-                BUILD missing
-                SETTINGS ${settings}
-                BASIC_SETUP)
-
-    endif ()
-endif ()
-
 if (MSVC)
     set(CMAKE_DEBUG_POSTFIX "d")
     add_definitions("-D_CRT_SECURE_NO_WARNINGS")

CMakeLists.txt

@@ -13,15 +13,6 @@ an easy to install, easy to use, object-oriented and fast FMI implementation for
 
 FMI4cpp supports both **Co-simulation** and **Model Exchange**. <br/>
 
-### Why should I use this over other C/C++ FMI Libraries
-
-Because it provides a clean, easy to use API and is easy to install.
-It performs just as good as FMI Library, provides more features and is significantly easier to both build and use.
-
-
-## Install instructions
-
-Refer to [INSTALL.md](INSTALL.md)
 
 ## Build instructions
 

INSTALL.md

@@ -5,20 +5,26 @@
 # PUGIXML_INCLUDE_DIR - header location
 # PUGIXML_LIBRARIES - library to link against
 # PUGIXML_FOUND - true if pugixml was found.
-find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp PATHS ${PUGIXML_HOME}/include)
-find_library (PUGIXML_LIBRARY NAMES pugixml PATHS ${PUGIXML_HOME}/lib)
+find_path(PUGIXML_INCLUDE_DIR NAMES pugixml.hpp PATHS ${PUGIXML_HOME}/include)
+find_library(PUGIXML_LIBRARY NAMES pugixml PATHS ${PUGIXML_HOME}/lib)
 
 # Support the REQUIRED and QUIET arguments, and set PUGIXML_FOUND if found.
-include (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (PugiXML DEFAULT_MSG PUGIXML_LIBRARY
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PugiXML DEFAULT_MSG PUGIXML_LIBRARY
         PUGIXML_INCLUDE_DIR)
 
 if (PUGIXML_FOUND)
-    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARY})
-    message (STATUS "PugiXML include = ${PUGIXML_INCLUDE_DIR}")
-    message (STATUS "PugiXML library = ${PUGIXML_LIBRARY}")
-else (PUGIXML_FOUND)
-    message (STATUS "No PugiXML found")
-endif(PUGIXML_FOUND)
+    set(PUGIXML_LIBRARIES ${PUGIXML_LIBRARY})
+    message(STATUS "PugiXML include = ${PUGIXML_INCLUDE_DIR}")
+    message(STATUS "PugiXML library = ${PUGIXML_LIBRARY}")
+else ()
+    message(STATUS "No PugiXML found")
+endif ()
 
-mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
+if (PUGIXML_FOUND AND NOT TARGET pugixml::pugixml)
+    add_library(pugixml::pugixml INTERFACE IMPORTED)
+    target_include_directories(pugixml::pugixml INTERFACE "${PUGIXML_INCLUDE_DIR}")
+    target_link_libraries(pugixml::pugixml INTERFACE "${PUGIXML_LIBRARY}")
+endif ()
+
+mark_as_advanced(PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)