From 0c9d2675c3027ed92f57ef57f0d5f8086c19a4f2 Mon Sep 17 00:00:00 2001 From: Aidan Case Date: Thu, 22 Feb 2024 00:38:27 -0600 Subject: [PATCH] fix up rest of paths --- deps/CMakeLists.txt | 20 +++++++++----------- deps/GMP/GMP.cmake | 4 ++-- deps/MPFR/MPFR.cmake | 2 +- deps/OpenEXR/OpenEXR.cmake | 6 +++--- deps/OpenSSL/OpenSSL.cmake | 6 +++--- flatpak/io.github.softfever.OrcaSlicer.yml | 8 ++++---- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 2af53ac9a4..4bbefac573 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -43,10 +43,8 @@ endif () set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory") set(REMOVE_DESTDIR_POSTPEND FALSE CACHE BOOL "Used in flatpak to remove the '/usr/local' ending in destdir") set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../DL_CACHE CACHE PATH "Path for downloaded source packages.") -if (REMOVE_DESTDIR_POSTPEND) - set(_INTDESTDIR "${DESTDIR}" CACHE PATH "The true destdir") -else() - set(_INTDESTDIR "${DESTDIR}/usr/local/" CACHE PATH "The true destdir") +if (NOT REMOVE_DESTDIR_POSTPEND) + set(DESTDIR "${DESTDIR}/usr/local/" CACHE PATH "The true destdir") endif() get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) @@ -89,7 +87,7 @@ endif () # Slic3r compiles with a different version which will cause runtime errors. # option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF) -message(STATUS "OrcaSlicer deps DESTDIR: ${_INTDESTDIR}") +message(STATUS "OrcaSlicer deps DESTDIR: ${DESTDIR}") message(STATUS "OrcaSlicer dowload dir for source packages: ${DEP_DOWNLOAD_DIR}") message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}") @@ -127,13 +125,13 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE) ExternalProject_Add( dep_${projectname} EXCLUDE_FROM_ALL ON - INSTALL_DIR ${_INTDESTDIR} + INSTALL_DIR ${DESTDIR} DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/${projectname} ${_gen} CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX:STRING=${_INTDESTDIR} + -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR} -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules - -DCMAKE_PREFIX_PATH:STRING=${_INTDESTDIR} + -DCMAKE_PREFIX_PATH:STRING=${DESTDIR} -DCMAKE_DEBUG_POSTFIX:STRING=d -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER} @@ -151,12 +149,12 @@ else() ExternalProject_Add( dep_${projectname} EXCLUDE_FROM_ALL ON - INSTALL_DIR ${_INTDESTDIR} + INSTALL_DIR ${DESTDIR} DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/${projectname} ${_gen} CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX:STRING=${_INTDESTDIR} - -DCMAKE_PREFIX_PATH:STRING=${_INTDESTDIR} + -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR} + -DCMAKE_PREFIX_PATH:STRING=${DESTDIR} -DBUILD_SHARED_LIBS:BOOL=OFF ${_cmake_osx_arch} "${_configs_line}" diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake index 8629f834fa..c0851df163 100644 --- a/deps/GMP/GMP.cmake +++ b/deps/GMP/GMP.cmake @@ -61,8 +61,8 @@ else () URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP BUILD_IN_SOURCE ON - CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt} + CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}" ${_gmp_build_tgt} BUILD_COMMAND make -j INSTALL_COMMAND make install ) -endif () \ No newline at end of file +endif () diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake index 30ceca90b3..1371b93541 100644 --- a/deps/MPFR/MPFR.cmake +++ b/deps/MPFR/MPFR.cmake @@ -31,7 +31,7 @@ else () DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR BUILD_IN_SOURCE ON CONFIGURE_COMMAND autoreconf -f -i && - env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt} + env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR} --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR} ${_gmp_build_tgt} BUILD_COMMAND make -j INSTALL_COMMAND make install DEPENDS dep_GMP diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake index 6aea12b1f2..dd754d3a38 100644 --- a/deps/OpenEXR/OpenEXR.cmake +++ b/deps/OpenEXR/OpenEXR.cmake @@ -15,11 +15,11 @@ if (APPLE AND IS_CROSS_COMPILE) EXCLUDE_FROM_ALL ON URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de - INSTALL_DIR ${DESTDIR}/usr/local + INSTALL_DIR ${DESTDIR} DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/OpenEXR ${_openxr_list_sep} CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local + -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TESTING=OFF @@ -54,4 +54,4 @@ endif() if (MSVC) add_debug_dep(dep_OpenEXR) -endif () \ No newline at end of file +endif () diff --git a/deps/OpenSSL/OpenSSL.cmake b/deps/OpenSSL/OpenSSL.cmake index 0adbaab43e..45f82ec589 100644 --- a/deps/OpenSSL/OpenSSL.cmake +++ b/deps/OpenSSL/OpenSSL.cmake @@ -46,8 +46,8 @@ ExternalProject_Add(dep_OpenSSL # URL_HASH SHA256=8c776993154652d0bb393f506d850b811517c8bd8d24b1008aef57fbe55d3f31 DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/OpenSSL CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch} - "--openssldir=${DESTDIR}/usr/local" - "--prefix=${DESTDIR}/usr/local" + "--openssldir=${DESTDIR}" + "--prefix=${DESTDIR}" ${_cross_comp_prefix_line} no-shared no-asm @@ -61,6 +61,6 @@ ExternalProject_Add(dep_OpenSSL ExternalProject_Add_Step(dep_OpenSSL install_cmake_files DEPENDEES install - COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/openssl" + COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}${CMAKE_INSTALL_LIBDIR}/cmake/openssl" WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" ) diff --git a/flatpak/io.github.softfever.OrcaSlicer.yml b/flatpak/io.github.softfever.OrcaSlicer.yml index 561b818058..dd6807b7db 100755 --- a/flatpak/io.github.softfever.OrcaSlicer.yml +++ b/flatpak/io.github.softfever.OrcaSlicer.yml @@ -203,6 +203,7 @@ modules: - /app/include - "*.a" - "*.la" + - /app/lib/cmake sources: # - @@ -321,10 +322,9 @@ modules: - | mkdir -p build && cd build CXXFLAGS=-std=gnu++20 cmake ../ \ - -GNinja \ -DCMAKE_INSTALL_PREFIX=/app \ -DCMAKE_INSTALL_LIBDIR=/app/lib \ - -DCMAKE_PREFIX_PATH=/run/build/OrcaSlicer/deps/build/destdir/usr/local \ + -DCMAKE_PREFIX_PATH=/app \ -DSLIC3R_PCH=OFF \ -DSLIC3R_FHS=ON \ -DSLIC3R_GTK=3 \ @@ -367,8 +367,8 @@ modules: # Use system deps instead of building them within BambuStudio # https://github.com/hadess/BambuStudio/tree/wip/hadess/use-sysdeps , modified - - type: patch - path: patches/use-sysdeps.patch + #- type: patch + # path: patches/use-sysdeps.patch ## other patches to contrib #- type: patch