update for github action - allow to don't build runtest

code4game · Oct 14, 2020 · 102c50b · 102c50b
1 parent 25ebae7
commit 102c50b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,12 +101,12 @@ jobs:
       run: |
         mkdir build && cd build/
         mkdir win32 && cd win32/
-        cmake -G "Visual Studio 16 2019" -A "Win32" ../../
+        cmake -G "Visual Studio 16 2019" -A "Win32" -DLIBGLTF_BUILD_RUNTEST=FALSE ../../
         msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="Win32"
         msbuild libgltf.sln /t:Build /p:Configuration="Release" /p:Platform="Win32"
         cd ../
         mkdir win64 && cd win64/
-        cmake -G "Visual Studio 16 2019" -A "x64" ../../
+        cmake -G "Visual Studio 16 2019" -A "x64" -DLIBGLTF_BUILD_RUNTEST=FALSE ../../
         msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="x64"
         msbuild libgltf.sln /t:Build /p:Configuration="Release" /p:Platform="x64"
         cd ../

diff --git a/.github/workflows/buildwithdraco.yml b/.github/workflows/buildwithdraco.yml
@@ -111,12 +111,12 @@ jobs:
       run: |
         mkdir build && cd build/
         mkdir win32 && cd win32/
-        cmake -G "Visual Studio 16 2019" -A "Win32" -DLIBGLTF_USE_GOOGLE_DRACO=TRUE -DLIBGLTF_USE_GOOGLE_DRACO_SUBMODULE=TRUE ../../
+        cmake -G "Visual Studio 16 2019" -A "Win32" -DLIBGLTF_BUILD_RUNTEST=FALSE -DLIBGLTF_USE_GOOGLE_DRACO=TRUE -DLIBGLTF_USE_GOOGLE_DRACO_SUBMODULE=TRUE ../../
         msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="Win32"
         msbuild libgltf.sln /t:Build /p:Configuration="Release" /p:Platform="Win32"
         cd ../
         mkdir win64 && cd win64/
-        cmake -G "Visual Studio 16 2019" -A "x64" -DLIBGLTF_USE_GOOGLE_DRACO=TRUE -DLIBGLTF_USE_GOOGLE_DRACO_SUBMODULE=TRUE ../../
+        cmake -G "Visual Studio 16 2019" -A "x64" -DLIBGLTF_BUILD_RUNTEST=FALSE -DLIBGLTF_USE_GOOGLE_DRACO=TRUE -DLIBGLTF_USE_GOOGLE_DRACO_SUBMODULE=TRUE ../../
         msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="x64"
         msbuild libgltf.sln /t:Build /p:Configuration="Release" /p:Platform="x64"
         cd ../
@@ -126,5 +126,4 @@ jobs:
       with:
         name: libgltf.windows
         path: |
-          output/include/
-          output/lib/
+          output/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -180,6 +180,8 @@ if(${LIBGLTF_BUILD_GCOV})
     endif()
 endif()
 
+set(LIBGLTF_BUILD_RUNTEST TRUE CACHE BOOL "Build runtest?")
+
 add_subdirectory(docs)
 add_subdirectory(source)
 add_subdirectory(tools)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(libgltf)
 
-if (${LIBGLTF_PLATFORM_WINDOWS} OR ${LIBGLTF_PLATFORM_LINUX} OR ${LIBGLTF_PLATFORM_MACOS})
+if (${LIBGLTF_BUILD_RUNTEST})
     add_subdirectory(runtest)
 endif()