cleanup and use new environment variable CMAKE_POLICY_VERSION_MINIMUM
This commit is contained in:
parent
a7958b7866
commit
d0ebca1174
5 changed files with 11 additions and 104 deletions
6
.SRCINFO
6
.SRCINFO
|
@ -46,12 +46,8 @@ pkgbase = orca-slicer
|
|||
source = orca-slicer::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v2.3.0
|
||||
source = orca-slicer-wrapper.sh
|
||||
source = https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch
|
||||
source = cmake-min-version.patch
|
||||
source = wxWidgets-cmake-min-version.patch
|
||||
b2sums = 543653c5769e2f022877608c14bad64ea05dbc30d41a58dc1a82eaca6615c0183f7573ced790a263b8509f6a4abdfa6b259ae0701a2468e10c15eb40d1926555
|
||||
b2sums = 5475dc53f1364a7228e339da503bc8dc8b0a3d4f06bdd88734d59b8d02de84ccc35388ff27d13558b044d02326fded4a36df29056d555f1ae25033fd366353c1
|
||||
b2sums = ea635f7745795d535ddf8cf317b27986ae28c177ea3fd7764c3314f9ca152672d17af22541cd9f6efc08a04fd02b2bda502f867fd2dd6888c58cf9b5d7c6c2a4
|
||||
b2sums = cc7791841533e07787a4921b688fdd885782a67320936d445ad04102a68e8e044b5bf52a58d987d158ae522ae4f02a56a3525ccfd1831ef6a3b6459be14bd408
|
||||
b2sums = 562dcd07530faef0d9fdddf1e009075f67105c8239e4b1402cd890f7a89be8b11671dd6ecc7b55a155f2d05247070bb0b8ff84f2170ce2454ab818018be80e48
|
||||
b2sums = 1459ce126dd80a891006d2c40a001e75dc146ac9eb6ad8e975a3e4672ebb914baabecd8a4048742fab03e2820242f614449dd23a8e721bd5c945c8765e986a5a
|
||||
|
||||
pkgname = orca-slicer
|
||||
|
|
25
PKGBUILD
25
PKGBUILD
|
@ -17,14 +17,10 @@ options=('!debug' '!emptydirs')
|
|||
provides=("orca-slicer")
|
||||
source=($pkgname::git+https://github.com/SoftFever/OrcaSlicer.git#tag=v$pkgver
|
||||
orca-slicer-wrapper.sh
|
||||
https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch
|
||||
cmake-min-version.patch
|
||||
wxWidgets-cmake-min-version.patch)
|
||||
https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch)
|
||||
b2sums=('543653c5769e2f022877608c14bad64ea05dbc30d41a58dc1a82eaca6615c0183f7573ced790a263b8509f6a4abdfa6b259ae0701a2468e10c15eb40d1926555'
|
||||
'5475dc53f1364a7228e339da503bc8dc8b0a3d4f06bdd88734d59b8d02de84ccc35388ff27d13558b044d02326fded4a36df29056d555f1ae25033fd366353c1'
|
||||
'cc7791841533e07787a4921b688fdd885782a67320936d445ad04102a68e8e044b5bf52a58d987d158ae522ae4f02a56a3525ccfd1831ef6a3b6459be14bd408'
|
||||
'562dcd07530faef0d9fdddf1e009075f67105c8239e4b1402cd890f7a89be8b11671dd6ecc7b55a155f2d05247070bb0b8ff84f2170ce2454ab818018be80e48'
|
||||
'1459ce126dd80a891006d2c40a001e75dc146ac9eb6ad8e975a3e4672ebb914baabecd8a4048742fab03e2820242f614449dd23a8e721bd5c945c8765e986a5a')
|
||||
'ea635f7745795d535ddf8cf317b27986ae28c177ea3fd7764c3314f9ca152672d17af22541cd9f6efc08a04fd02b2bda502f867fd2dd6888c58cf9b5d7c6c2a4'
|
||||
'cc7791841533e07787a4921b688fdd885782a67320936d445ad04102a68e8e044b5bf52a58d987d158ae522ae4f02a56a3525ccfd1831ef6a3b6459be14bd408')
|
||||
|
||||
prepare() {
|
||||
# C++20 disallows the use of the Point<T> syntax in the constructor
|
||||
|
@ -37,21 +33,19 @@ prepare() {
|
|||
sed -i 's|src/slic3r/GUI/AMSMappingPopup.cpp|src/slic3r/GUI/AmsMappingPopup.cpp|g' $pkgname/localization/i18n/list.txt
|
||||
sed -i 's|https://www.mpfr.org/mpfr-current/mpfr-4.2.1.tar.bz2|https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1.tar.bz2|' $pkgname/deps/MPFR/MPFR.cmake
|
||||
# Set cmake_minimum_required to 3.5 for all dependencies
|
||||
cp wxWidgets-cmake-min-version.patch $pkgname/deps/wxWidgets/wxWidgets-cmake-min-version.patch
|
||||
cd $pkgname
|
||||
git apply ../cmake-min-version.patch
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname
|
||||
export CXXFLAGS="${CXXFLAGS} -flto"
|
||||
export CMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
|
||||
cmake \
|
||||
-G Ninja \
|
||||
-S deps \
|
||||
-B deps/build \
|
||||
-DDEP_WX_GTK3=ON \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
-DDEP_WX_GTK3=ON
|
||||
ninja -C deps/build
|
||||
|
||||
cmake \
|
||||
|
@ -64,8 +58,7 @@ build() {
|
|||
-DSLIC3R_STATIC=1 \
|
||||
-DORCA_TOOLS=1 \
|
||||
-DSLIC3R_FHS=1 \
|
||||
-DSLIC3R_GTK=3 \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
-DSLIC3R_GTK=3
|
||||
ninja -C build
|
||||
|
||||
# add localizations
|
||||
|
@ -75,8 +68,8 @@ build() {
|
|||
package() {
|
||||
cd $pkgname
|
||||
DESTDIR="$pkgdir" ninja -C build install
|
||||
install -d "$pkgdir/usr/lib/orca-slicer/"
|
||||
mv "$pkgdir/usr/bin/orca-slicer" "$pkgdir/usr/lib/orca-slicer/"
|
||||
install -d "$pkgdir/usr/lib/OrcaSlicer/"
|
||||
mv "$pkgdir/usr/bin/orca-slicer" "$pkgdir/usr/lib/OrcaSlicer/"
|
||||
install -Dm755 "$srcdir/orca-slicer-wrapper.sh" "$pkgdir/usr/bin/orca-slicer"
|
||||
install -Dm644 doc/*.md -t "$pkgdir/usr/share/doc/OrcaSlicer/"
|
||||
install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/OrcaSlicer/LICENSE"
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
|
||||
index b24ee20e2..e59edc7b6 100644
|
||||
--- a/deps/CMakeLists.txt
|
||||
+++ b/deps/CMakeLists.txt
|
||||
@@ -128,6 +128,7 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
|
||||
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/${projectname}
|
||||
${_gen}
|
||||
CMAKE_ARGS
|
||||
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
-DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
|
||||
-DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
|
||||
-DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
|
||||
@@ -157,6 +158,7 @@ elseif(FLATPAK)
|
||||
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/${projectname}
|
||||
${_gen}
|
||||
CMAKE_ARGS
|
||||
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
-DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
|
||||
-DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
|
||||
-DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
|
||||
@@ -185,6 +187,7 @@ else()
|
||||
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/${projectname}
|
||||
${_gen}
|
||||
CMAKE_ARGS
|
||||
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
-DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
|
||||
-DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
|
||||
-DBUILD_SHARED_LIBS:BOOL=OFF
|
||||
diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake
|
||||
index 1097e6cfc..9cf27a790 100644
|
||||
--- a/deps/wxWidgets/wxWidgets.cmake
|
||||
+++ b/deps/wxWidgets/wxWidgets.cmake
|
||||
@@ -25,9 +25,11 @@ endif ()
|
||||
orcaslicer_add_cmake_project(
|
||||
wxWidgets
|
||||
GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
|
||||
+ PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/wxWidgets-cmake-min-version.patch
|
||||
GIT_SHALLOW ON
|
||||
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${TIFF_PKG} ${JPEG_PKG}
|
||||
CMAKE_ARGS
|
||||
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
-DwxBUILD_PRECOMP=ON
|
||||
${_wx_toolkit}
|
||||
"-DCMAKE_DEBUG_POSTFIX:STRING="
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
DIR="/usr/lib/orca-slicer"
|
||||
DIR="/usr/lib/OrcaSlicer"
|
||||
export LD_LIBRARY_PATH="$DIR/bin:$LD_LIBRARY_PATH"
|
||||
|
||||
# OrcaSlicer will segfault on systems where locale info is not as expected
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4063020..d498b78 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,7 +7,7 @@
|
||||
# Licence: wxWindows licence
|
||||
#############################################################################
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
if(NOT CMAKE_CONFIGURATION_TYPES)
|
||||
get_property(HAVE_MULTI_CONFIG_GENERATOR GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
|
||||
diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake
|
||||
index bb69643..e91f7e4 100644
|
||||
--- a/build/cmake/modules/cotire.cmake
|
||||
+++ b/build/cmake/modules/cotire.cmake
|
||||
@@ -37,7 +37,7 @@ set(__COTIRE_INCLUDED TRUE)
|
||||
if (NOT CMAKE_SCRIPT_MODE_FILE)
|
||||
cmake_policy(PUSH)
|
||||
endif()
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
if (NOT CMAKE_SCRIPT_MODE_FILE)
|
||||
cmake_policy(POP)
|
||||
endif()
|
||||
diff --git a/build/cmake/modules/cotire_test/CMakeLists.txt b/build/cmake/modules/cotire_test/CMakeLists.txt
|
||||
index dd14262..6d865bc 100644
|
||||
--- a/build/cmake/modules/cotire_test/CMakeLists.txt
|
||||
+++ b/build/cmake/modules/cotire_test/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
# cotire example project
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
if (POLICY CMP0058)
|
||||
# Ninja requires custom command byproducts to be explicit
|
Loading…
Add table
Reference in a new issue