Fixed bugs in CI for building python module

Author: michaelrossherron

PyLib/CMakeLists.txt

@@ -109,11 +109,9 @@ endforeach(name)
 add_subdirectory(${PYBIND11_DIR} ./pybind11)
 
 find_package(ZLIB)
-find_package(GLEW REQUIRED)
 
 target_compile_definitions(XPLTLib PRIVATE HAVE_ZLIB)
 target_link_libraries(XPLTLib PRIVATE ${ZLIB_LIBRARY_RELEASE})
-target_link_libraries(PostLib PRIVATE ${GLEW_LIBRARIES} GLEW::glew)
 
 pybind11_add_module(fbs PyFBS.cpp PyFBSCore.cpp PyFBSPost.cpp PyFBSMesh.cpp PyFBSGeom.cpp)
 

ci/Linux/scp-to-repo.sh

@@ -7,4 +7,4 @@ fi
 
 chmod +x cmbuild/bin/*
 scp cmbuild/bin/* repo:~/$REMOTE_PATH/bin
-scp pythonModule/* repo:~/download
+find pythonModule/ | grep .so | xargs -I file scp file repo:~/download

ci/Windows/build.bat

@@ -30,11 +30,14 @@ cd ..
 :: Standalone Python module
 cd PyLib
 git clone --depth 1 https://github.com/febiosoftware/FEBio.git
+:: TODO: Cmake requires 6 runs to generate correctly
+for /l %%a in (1, 1, 6) do (
 cmake -L . -B cmbuild ^
   -DFEBioDir=FEBio ^
   -DPython3_INCLUDE_DIR="C:\Program Files\Python313\include" ^
   -DPython3_LIBRARY="C:\Program Files\Python313\libs\python313.lib" ^
   -DPython3_EXECUTABLE="C:\Program Files\Python313\python.exe"
+)
 cd cmbuild
 msbuild /v:m /P:Configuration=Release  /clp:ErrorsOnly /m:%NUMBER_OF_PROCESSORS% ALL_BUILD.vcxproj
 cd ..\..

ci/Windows/scp-to-repo.sh

@@ -6,4 +6,4 @@ if [ $# == 1 ] && [ "$1" != "develop" ]; then
 fi
 
 scp cmbuild/bin/Release/* repo:~/$REMOTE_PATH/bin
-scp pythonModule/* repo:~/download
+find pythonModule/ | grep .pyd | xargs -I file scp file repo:~/download

ci/macOS/build.sh

@@ -23,8 +23,7 @@ main() {
     git clone --depth 1 https://github.com/febiosoftware/FEBio.git
     cmake -L . -B cmbuild \
         -DFEBioDir=FEBio \
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-		-DCMAKE_OSX_ARCHITECTURES=x86_64 
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 
     pushd cmbuild
     make -j $(sysctl -n hw.ncpu)
     popd

ci/macOS/scp-to-repo.sh

@@ -7,4 +7,4 @@ fi
 
 chmod +x cmbuild/bin/FEBioStudio.app/Contents/MacOS/*
 scp -r cmbuild/bin/FEBioStudio.app/Contents/MacOS/* repo:~/$REMOTE_PATH/FEBioStudio.app/Contents/MacOS
-scp pythonModule/* repo:~/download
+find pythonModule/ | grep .dylib | xargs -I file scp file repo:~/download