fix the output path

code4game · Oct 12, 2020 · 74ad1b7 · 74ad1b7
1 parent 65291b4
commit 74ad1b7
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,22 +30,22 @@ script:
 - cd ./../
 
 after_success:
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/nothing.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/Monster/glTF/Monster.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/Monster/glTF-Binary/Monster.glb; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/Monster/glTF-Draco/Monster.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/Monster/glTF-Embedded/Monster.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/Avocado/glTF-pbrSpecularGlossiness/Avocado.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/Cameras/glTF/Cameras.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/EnvironmentTest/glTF-IBL/EnvironmentTest.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/Triangle/glTF/Triangle.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/TwoSidedPlane/glTF/TwoSidedPlane.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/UnlitTest/glTF/UnlitTest.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/runtest --coveralls ./resource/2.0/VertexColorTest/glTF/VertexColorTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/nothing.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF/Monster.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF-Binary/Monster.glb; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF-Draco/Monster.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF-Embedded/Monster.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Avocado/glTF-pbrSpecularGlossiness/Avocado.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Cameras/glTF/Cameras.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/EnvironmentTest/glTF-IBL/EnvironmentTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Triangle/glTF/Triangle.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/TwoSidedPlane/glTF/TwoSidedPlane.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/UnlitTest/glTF/UnlitTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/VertexColorTest/glTF/VertexColorTest.gltf; fi
 - if [ $RUN_COVERALLS == true ]; then coveralls --exclude ./external/ --exclude ./build/CMakeFiles/ --exclude ./output/include/ --gcov-options '\-lp'; fi
 
 before_deploy:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,27 +1,14 @@
 cmake_minimum_required(VERSION 2.8.11)
 
+project(libgltf)
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 enable_testing()
 set(CMAKE_INSTALL_PREFIX "install" CACHE STRING "prefix")
 
-project(libgltf)
-
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 set(CMAKE_DEBUG_POSTFIX "d")
 
-set(ROOT_PATH "${PROJECT_SOURCE_DIR}")
-set(HEADER_PATH "${ROOT_PATH}/include")
-set(SOURCE_PATH "${ROOT_PATH}/source")
-set(TOOLS_PATH "${ROOT_PATH}/tools")
-set(EXTERNAL_PATH "${ROOT_PATH}/external")
-if(NOT CUSTOM_OUT_PATH)
-    set(OUT_PATH "${ROOT_PATH}/output")
-else()
-    set(OUT_PATH ${CUSTOM_OUT_PATH})
-endif()
-set(OUT_BIN_PATH "${OUT_PATH}/bin/${PLATFORM_NAME}")
-set(OUT_LIB_PATH "${OUT_PATH}/lib/${PLATFORM_NAME}")
-
 # define the platform
 set(LIBGLTF_PLATFORM_WINDOWS    FALSE)
 set(LIBGLTF_PLATFORM_LINUX      FALSE)
@@ -93,6 +80,19 @@ if((NOT ${LIBGLTF_PLATFORM_WINDOWS}) AND (NOT ${LIBGLTF_PLATFORM_LINUX}) AND (NO
     message(FATAL_ERROR "Sorry, don't support your system ${CMAKE_SYSTEM_NAME}!")
 endif()
 
+set(ROOT_PATH "${PROJECT_SOURCE_DIR}")
+set(HEADER_PATH "${ROOT_PATH}/include")
+set(SOURCE_PATH "${ROOT_PATH}/source")
+set(TOOLS_PATH "${ROOT_PATH}/tools")
+set(EXTERNAL_PATH "${ROOT_PATH}/external")
+if(NOT CUSTOM_OUT_PATH)
+    set(OUT_PATH "${ROOT_PATH}/output")
+else()
+    set(OUT_PATH ${CUSTOM_OUT_PATH})
+endif()
+set(OUT_BIN_PATH "${OUT_PATH}/bin/${PLATFORM_NAME}")
+set(OUT_LIB_PATH "${OUT_PATH}/lib/${PLATFORM_NAME}")
+
 # supports more charactor encodings
 set(LIBGLTF_CHARACTOR_ENCODING UTF8 CACHE STRING "String code")
 set_property(CACHE LIBGLTF_CHARACTOR_ENCODING PROPERTY STRINGS UTF8 UTF16 UTF32 UNICODE)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,22 +19,22 @@ jobs:
       cd build
       cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DLIBGLTF_CHARACTOR_ENCODING=UTF8 -DLIBGLTF_BUILD_GCOV=TRUE ../
       make
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/nothing.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/Monster/glTF/Monster.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/Monster/glTF-Binary/Monster.glb
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/Monster/glTF-Draco/Monster.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/Monster/glTF-Embedded/Monster.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/Avocado/glTF-pbrSpecularGlossiness/Avocado.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/Cameras/glTF/Cameras.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/EnvironmentTest/glTF-IBL/EnvironmentTest.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/Triangle/glTF/Triangle.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/TwoSidedPlane/glTF/TwoSidedPlane.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/UnlitTest/glTF/UnlitTest.gltf
-      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/runtest --coveralls ../resource/2.0/VertexColorTest/glTF/VertexColorTest.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/nothing.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF/Monster.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF-Binary/Monster.glb
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF-Draco/Monster.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF-Embedded/Monster.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Avocado/glTF-pbrSpecularGlossiness/Avocado.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Cameras/glTF/Cameras.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/EnvironmentTest/glTF-IBL/EnvironmentTest.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Triangle/glTF/Triangle.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/TwoSidedPlane/glTF/TwoSidedPlane.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/UnlitTest/glTF/UnlitTest.gltf
+      valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/VertexColorTest/glTF/VertexColorTest.gltf
       gcov source/runtest/CMakeFiles/runtest.dir/runtest.cpp.gcda
       gcovr --root=../source/ .
       cd ../