Skip to content

Commit

Permalink
Ensure CPACK_DEBIAN_PACKAGE_DEPENDS is correct on Ubuntu20+ and Debia…
Browse files Browse the repository at this point in the history
…n VMs
  • Loading branch information
adamkewley committed Dec 10, 2024
1 parent 9ba312b commit b2225ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion apps/osc/Debian/Packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ install(
# packaging: package installation as a DEB
set(CPACK_GENERATOR DEB)
set(CPACK_PACKAGING_INSTALL_PREFIX /opt/osc)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6, libblas3, liblapack3, libgl1, libopengl0, libglx0, libsm6, libice6, libgtk-3-0")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libblas3, liblapack3, libgl1, libopengl0, libgtk-3-0")
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

# CPack vars etc. now fully configured, so include it
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_emscripten.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ source ./emsdk/emsdk_env.sh
# - this is a custom build for now because I can't build all dependencies
# with emsdk yet

CXXFLAGS="-fexceptions" emcmake cmake -S third_party/ -B osc-deps-build -DOSCDEPS_GET_BENCHMARK=OFF -DOSCDEPS_GET_SDL=OFF -DOSCDEPS_GET_GLEW=OFF -DOSCDEPS_GET_NATIVEFILEDIALOG=OFF -DOSCDEPS_GET_OPENSIM=OFF -DCMAKE_INSTALL_PREFIX=${PWD}/osc-deps-install -DCMAKE_INSTALL_LIBDIR=${PWD}/osc-deps-install/lib
CXXFLAGS="-fexceptions" emcmake cmake -S third_party/ -B osc-deps-build -DOSCDEPS_GET_BENCHMARK=OFF -DOSCDEPS_GET_SDL=OFF -DOSCDEPS_GET_NATIVEFILEDIALOG=OFF -DOSCDEPS_GET_OPENSIM=OFF -DCMAKE_INSTALL_PREFIX=${PWD}/osc-deps-install -DCMAKE_INSTALL_LIBDIR=${PWD}/osc-deps-install/lib
emmake cmake --build osc-deps-build -j$(nproc) -v

LDFLAGS="-fexceptions -sNO_DISABLE_EXCEPTION_CATCHING=1 -sUSE_WEBGL2=1 -sMIN_WEBGL_VERSION=2 -sFULL_ES2=1 -sFULL_ES3=1 -sUSE_SDL=2" CXXFLAGS="-fexceptions --use-port=sdl2" emcmake cmake -S . -B osc-build -DOSC_BUILD_OPENSIMCREATOR=OFF -DOSC_DISCOVER_TESTS=OFF -DOSC_EMSCRIPTEN=ON -DCMAKE_PREFIX_PATH=${PWD}/osc-deps-install -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH -DCMAKE_BUILD_TYPE=-DCMAKE_BUILD_TYPE=${OSC_BUILD_TYPE}
Expand Down

0 comments on commit b2225ef

Please sign in to comment.