rpm/cura-engine-lulzbot
SHA256
1
0
Fork 0
forked from pool/cura-engine-lulzbot
Code Pull Requests Activity

fix

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=30
This commit is contained in:
Adrian Schröter
2018-07-30 12:00:59 +00:00
committed by Git OBS Bridge
parent 1e12bbdd7a
commit f1f4df3675
1 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
fix-build.patch
View File

@@ -1,3 +1,68 @@
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})
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})
diff --git a/src/settings/SettingRegistry.cpp b/src/settings/SettingRegistry.cpp
index 7c4be40d..cff696a6 100644
--- a/src/settings/SettingRegistry.cpp
+++ b/src/settings/SettingRegistry.cpp
@@ -35,12 +35,6 @@ std::string SettingRegistry::toString(rapidjson::Type type)
}
-SettingConfig::SettingConfig(std::string key, std::string label)
-: SettingContainer(key, label)
-{
-// std::cerr << key << std::endl; // debug output to show all frontend registered settings...
-}
-
bool SettingRegistry::settingExists(std::string key) const
{
return setting_key_to_config.find(key) != setting_key_to_config.end();
diff --git a/src/settings/SettingRegistry.cpp b/src/settings/SettingRegistry.cpp
index 7c4be40d..cff696a6 100644
--- a/src/settings/SettingRegistry.cpp