Browse Source

Fix missing include files for assimp package (#190)

* Fix assimp package building script to include the missing header files
* Turn on 'ASSIMP_BUILD_ZLIB' option to match whats currently in production

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 2 năm trước cách đây
mục cha
commit
52e16f4c57

+ 6 - 2
package-system/assimp/docker_build_assimp_linux.sh

@@ -31,7 +31,7 @@ echo "Working with Assimp commit hash ${GIT_HASH}"
 echo "Using custom zlib (shared) library at /data/workspace/${ZLIB_LIB_PATH}"
 echo "Using custom zlib (shared) library at /data/workspace/${ZLIB_LIB_PATH}"
 
 
 
 
-cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=OFF -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_ASSIMP_TOOLS=ON ${AARCH64_FLAGS} 
+cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_ASSIMP_TOOLS=ON ${AARCH64_FLAGS} 
 if [ $? -ne 0 ]
 if [ $? -ne 0 ]
 then
 then
     echo "Failed generating cmake project for assimp/shared."
     echo "Failed generating cmake project for assimp/shared."
@@ -49,7 +49,7 @@ fi
 
 
 echo "Using custom zlib (static) library at /data/workspace/${ZLIB_LIB_PATH}"
 echo "Using custom zlib (static) library at /data/workspace/${ZLIB_LIB_PATH}"
 
 
-cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=OFF -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=ON ${AARCH64_FLAGS}
+cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=ON ${AARCH64_FLAGS}
 if [ $? -ne 0 ]
 if [ $? -ne 0 ]
 then
 then
     echo "Failed generating cmake project for assimp/static."
     echo "Failed generating cmake project for assimp/static."
@@ -68,6 +68,10 @@ fi
 mkdir -p /data/workspace/build/port/
 mkdir -p /data/workspace/build/port/
 cp -R /data/workspace/src/port/PyAssimp /data/workspace/build/port/
 cp -R /data/workspace/src/port/PyAssimp /data/workspace/build/port/
 
 
+mkdir -p /data/workspace/build/include/assimp/
+cp -v -r /data/workspace/src/include/assimp/* /data/workspace/build/include/assimp/
+rm /data/workspace/build/include/assimp/config.h.in
+
 echo "Running unit test"
 echo "Running unit test"
 
 
 cd ..
 cd ..