2018-07-30 08:54:34 +00:00
committed by Git OBS Bridge
parent 4c25d09c1c
commit 3403294c15
2 changed files with 27 additions and 0 deletions

View File

@@ -25,6 +25,8 @@ Group: Hardware/Printing
Url: http://github.com/Ultimaker/CuraEngine
Source0: CuraEngine-%{version}.tar.xz
Source1: CuraEngine.1
# PATCH-FIX-UPSTREAM
Patch1: fix-build.patch
# On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise
%if 0%{?suse_version} >= 1500
BuildRequires: gcc-c++ >= 5
@@ -42,6 +44,7 @@ It is part of the larger project called "Cura".
%prep
%setup -q -n CuraEngine-%version
%patch1 -p1
%build
%if 0%{?suse_version} < 1500

24
fix-build.patch Normal file
View File

@@ -0,0 +1,24 @@
commit 5aad55bf67e52ce5bdb27a3925af8a4cab441b38
Author: Ghostkeeper <rubend@tutanota.com>
Date: Mon Jun 18 15:39:01 2018 +0200
Remove outdated copy of command_line_settings.json
This entire directory doesn't exist.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c579388..4c55e6f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,11 +251,6 @@ if (BUILD_TESTS)
endforeach()
endif()
-
-add_custom_command(TARGET CuraEngine POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_SOURCE_DIR}/resources $<TARGET_FILE_DIR:CuraEngine>)
-
# Installing CuraEngine.
include(GNUInstallDirs)
install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR})