Cmake fetch assimp (#300)

Author: markaren

.github/workflows/config.yml

@@ -74,49 +74,6 @@ jobs:
           cd build/tests
           ctest --output-on-failure
 
-  vcpkg-on-linux:
-
-    runs-on: ${{ matrix.os }}
-    env:
-      CC: gcc-${{ matrix.compiler_version }}
-      CXX: g++-${{ matrix.compiler_version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-22.04]
-        compiler_version: [11]
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Install prerequisites
-      run: |
-        sudo apt-get update && sudo apt-get install -y \
-        libxinerama-dev \
-        libxcursor-dev \
-        xorg-dev \
-        libglu1-mesa-dev \
-        pkg-config
-
-    - 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: '4cac260c4b7331538d31886f57739fea0bffa27e'
-        vcpkgJsonGlob: 'vcpkg.json'
-        appendedCacheKey: vcpkginstall
-
-    - name: Configure and build
-      run: |
-        cmake . -B build -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_FEATURES="assimp" -DCMAKE_BUILD_TYPE="Release"
-        cmake --build build
-
-    - name: Test
-      run: |
-        cd build/tests
-        ctest --output-on-failure
-
 
   windows:
 
@@ -188,5 +145,5 @@ jobs:
 
       - name: Configure and build
         run: |
-          cmake . -B build -DCMAKE_TOOLCHAIN_FILE=${{env.EMSDK}}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DTHREEPP_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="Release"
+          cmake . -B build -DCMAKE_TOOLCHAIN_FILE=${{env.EMSDK}}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DTHREEPP_BUILD_TESTS=OFF -DTHREEPP_FETCH_ASSIMP=OFF -DCMAKE_BUILD_TYPE="Release"
           cmake --build build

CMakeLists.txt

@@ -10,13 +10,16 @@ option(THREEPP_BUILD_TESTS "Build test suite" ON)
 option(THREEPP_WITH_SVG "Build with SVGLoader" ON)
 option(THREEPP_WITH_AUDIO "Build with Audio" ON)
 option(THREEPP_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
-option(THREEPP_BUILD_EXAMPLE_PROJECTS "Build example projects" ON)
+
 
 # Force THREEPP_WITH_GLFW ON when targeting Emscripten
 cmake_dependent_option(THREEPP_WITH_GLFW "Build with GLFW frontend" ON "NOT DEFINED EMSCRIPTEN" ON)
 # Force THREEPP_USE_EXTERNAL_GLFW OFF if NOT THREEPP_WITH_GLFW
 cmake_dependent_option(THREEPP_USE_EXTERNAL_GLFW "Use externally supplied GLFW" OFF "THREEPP_WITH_GLFW" OFF)
 
+cmake_dependent_option(THREEPP_BUILD_EXAMPLE_PROJECTS "Build example projects" ON "THREEPP_BUILD_EXAMPLES" OFF)
+cmake_dependent_option(THREEPP_FETCH_ASSIMP "Make assimp available for examples" ON "THREEPP_BUILD_EXAMPLES" OFF)
+
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 
 
@@ -62,6 +65,21 @@ endif ()
 add_subdirectory(src)
 
 if (THREEPP_BUILD_EXAMPLES)
+
+    if (THREEPP_FETCH_ASSIMP)
+        message("Fetching assimp for examples..")
+
+        include(FetchContent)
+        set(ASSIMP_BUILD_TESTS OFF)
+        set(ASSIMP_INSTALL OFF)
+        FetchContent_Declare(
+            assimp
+            GIT_REPOSITORY https://github.com/assimp/assimp.git
+            GIT_TAG v6.0.2
+        )
+        FetchContent_MakeAvailable(assimp)
+    endif ()
+
     add_subdirectory(examples)
 endif ()
 

README.md

@@ -54,40 +54,20 @@ cmake . -B build -DCMAKE_BUILD_TYPE="Release"
 cmake --build build
 ```
 
-However, some of the examples (and headers) require additional dependencies. 
-To make use of all features and to enable/build all examples, the use of [vcpkg](https://vcpkg.io/en/index.html) is encouraged.
-
-#### Using vcpkg for getting optional dependecies (using manifest mode)
-
-Call CMake with `-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake`
-
-Add optional features by listing them with `-DVCPKG_MANIFEST_FEATURES=feature1;feature2`
-
-See [vcpkg.json](vcpkg.json) for available features.
-
-Note, however, that under MinGW you'll need to specify the vcpkg triplet:
-```shell
--DVCPKG_TARGET_TRIPLET=x64-mingw-[static|dynamic]  # choose either `static` or `dynamic`.
--DVCPKG_HOST_TRIPLET=x64-mingw-[static|dynamic]    # <-- needed only if MSVC cannot be found. 
-```
-
 ##### Building examples with Emscripten
 
 Pass to CMake:
 ```shell
 -DCMAKE_TOOLCHAIN_FILE="[path to emscripten]\emsdk\upstream\emscripten\cmake\Modules\Platform\Emscripten.cmake"
 ```
-When using vcpkg, however, do:
-```shell
--DVCPKG_CHAINLOAD_TOOLCHAIN_FILE="[path to emscripten]\emsdk\upstream\emscripten\cmake\Modules\Platform\Emscripten.cmake"
-```
+
 This will generate .html versions of a subset of the examples to be loaded in a browser.
 
 
 ##### Optional downstream dependencies
 
 When consuming `threepp` in your own application, 
-some headers will require additional dependencies in order to compile.
+some headers will require additional dependencies to compile.
 
 | **Header**   | **Dependency** | **Description**                               |
 |--------------|----------------|-----------------------------------------------|

examples/AddExample.cmake

@@ -1,7 +1,7 @@
 
 function(add_example)
 
-    set(flags LINK_IMGUI LINK_ASSIMP LINK_XML LINK_PHYSX WEB)
+    set(flags LINK_IMGUI LINK_ASSIMP LINK_XML WEB)
     set(oneValueArgs NAME)
     set(multiValueArgs SOURCES WEB_EMBED)
 
@@ -11,16 +11,11 @@ function(add_example)
         return()
     endif ()
 
-    if (arg_LINK_ASSIMP AND NOT assimp_FOUND)
+    if (arg_LINK_ASSIMP AND (TARGET(assimp::assimp)))
         message(AUTHOR_WARNING "assimp not found, skipping '${arg_NAME}' example..")
         return()
     endif ()
 
-    if (arg_LINK_PHYSX AND NOT unofficial-omniverse-physx-sdk_FOUND)
-        message(AUTHOR_WARNING "physx not found, skipping '${arg_NAME}' example..")
-        return()
-    endif ()
-
     if (NOT arg_SOURCES)
         add_executable("${arg_NAME}" "${arg_NAME}.cpp")
     else ()
@@ -33,14 +28,10 @@ function(add_example)
         target_link_libraries("${arg_NAME}" PRIVATE imgui::imgui)
     endif ()
 
-    if (arg_LINK_ASSIMP AND assimp_FOUND)
+    if (arg_LINK_ASSIMP)
         target_link_libraries("${arg_NAME}" PRIVATE assimp::assimp)
     endif ()
 
-    if (arg_LINK_PHYSX AND unofficial-omniverse-physx-sdk_FOUND)
-        target_link_libraries("${arg_NAME}" PRIVATE unofficial::omniverse-physx-sdk::sdk)
-    endif ()
-
     if (DEFINED EMSCRIPTEN)
 
         set(LINK_FLAGS " --bind -sUSE_GLFW=3 -sGL_DEBUG=1 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sFULL_ES3 -sASSERTIONS -sALLOW_MEMORY_GROWTH -sNO_DISABLE_EXCEPTION_CATCHING -sWASM=1")

examples/LibConfig.cmake

@@ -1,5 +1,4 @@
 
 find_package(assimp CONFIG QUIET)
-find_package(unofficial-omniverse-physx-sdk CONFIG QUIET)
 
 add_subdirectory(external)

examples/extras/CMakeLists.txt

@@ -1,4 +1,3 @@
 
 add_subdirectory(core)
 add_subdirectory(curves)
-add_subdirectory(physics)