update workflow

code4game · Oct 14, 2020 · caa180a · caa180a
1 parent f1e9d35
commit caa180a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/buildwithdraco.yml b/.github/workflows/buildwithdraco.yml
@@ -31,7 +31,7 @@ jobs:
         cd ..
     - name: 'ready artifact'
       run: |
-        cp -ar build/draco/ output/include/draco/
+        rsync -a --include='*.h' -f 'hide,! */' external/draco/src/draco/ output/include/draco/
         cp -a build/external/draco/dracodec.a output/lib/linux/dracodec.a
     - name: 'upload artifact'
       uses: actions/upload-artifact@v1.0.0
@@ -56,7 +56,7 @@ jobs:
         cd ..
     - name: 'ready artifact'
       run: |
-        cp -R build/draco/ output/include/draco/
+        rsync -a --include='*.h' -f 'hide,! */' external/draco/src/draco/ output/include/draco/
         cp build/external/draco/dracodec.a output/lib/macos/dracodec.a
     - name: 'upload artifact'
       uses: actions/upload-artifact@v1.0.0
@@ -84,8 +84,8 @@ jobs:
         cd ..
     - name: 'ready artifact'
       run: |
-        cp -ar build/iphoneos/draco/ output/include/draco/
-        cp -a build/external/draco/dracodec.a output/lib/ios_OS/dracodec.a
+        rsync -a --include='*.h' -f 'hide,! */' external/draco/src/draco/ output/include/draco/
+        cp build/external/draco/dracodec.a output/lib/ios_OS/dracodec.a
     - name: 'upload artifact'
       uses: actions/upload-artifact@v1.0.0
       with:
@@ -114,6 +114,7 @@ jobs:
         cd ../
     - name: 'ready artifact'
       run: |
+        xcopy external\draco\src\draco\*.h output\include\draco\ /E/H/C/I
         xcopy build\win64\draco\ output\include\draco\ /E/H/C/I
         xcopy build\win64\external\draco\RelWithDebInfo\ lib\win64\RelWithDebInfo\ /E/H/C/I
         xcopy build\win64\external\draco\Release\ lib\win64\Release\ /E/H/C/I

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -138,10 +138,6 @@ if(LIBGLTF_USE_GOOGLE_DRACO)
         set_target_properties(dracoenc PROPERTIES FOLDER externals/draco)
         set(GOOGLE_DRACO_PATH_INCLUDE ${EXTERNAL_PATH}/draco/src)
         set(GOOGLE_DRACO_PATH_BUILD ${CMAKE_BINARY_DIR})
-        set_target_properties(dracodec PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY ${OUT_BIN_PATH}
-            LIBRARY_OUTPUT_DIRECTORY ${OUT_LIB_PATH}
-            )
     else()
         find_package(GoogleDraco)
         if(GOOGLEDRACO_FOUND)