Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Christoph Roick
kdevelop
Commits
068e7e92
Commit
068e7e92
authored
Oct 24, 2018
by
Kevin Funk
☕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
appimage: Patch grantlee to avoid recompilation
parent
0e1cacb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
1 deletion
+43
-1
appimage/grantlee_avoid_recompilation.patch
appimage/grantlee_avoid_recompilation.patch
+42
-0
appimage/kdevelop-recipe-centos6.sh
appimage/kdevelop-recipe-centos6.sh
+1
-1
No files found.
appimage/grantlee_avoid_recompilation.patch
0 → 100644
View file @
068e7e92
diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
index dad2ef8..685d4d6 100644
--- a/templates/lib/CMakeLists.txt
+++ b/templates/lib/CMakeLists.txt
@@ -118,10 +118,6 @@
endif()
configure_file(grantlee_test_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/grantlee_test_export.h")
-file(READ "${CMAKE_CURRENT_BINARY_DIR}/grantlee_test_export.h" _content)
-
-file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/grantlee_templates_export.h" "${_content}")
-
target_link_libraries(Grantlee_Templates
LINK_PUBLIC Qt5::Core
)
diff --git a/templates/lib/grantlee_test_export.h.in b/templates/lib/grantlee_test_export.h.in
index 681574c..bc07d2b 100644
--- a/templates/lib/grantlee_test_export.h.in
+++ b/templates/lib/grantlee_test_export.h.in
@@ -1,2 +1,8 @@
+#ifndef GRANTLEE_TEST_EXPORT_H
+#define GRANTLEE_TEST_EXPORT_H
+
+#include "grantlee_templates_export.h"
#define GRANTLEE_TESTS_EXPORT @GRANTLEE_TESTS_EXPORT@
+
+#endif
diff --git a/templates/lib/nulllocalizer_p.h b/templates/lib/nulllocalizer_p.h
index a584f79..ab57b79 100644
--- a/templates/lib/nulllocalizer_p.h
+++ b/templates/lib/nulllocalizer_p.h
@@ -21,6 +21,8 @@
#ifndef GRANTLEE_NULLLOCALIZER_P_H
#define GRANTLEE_NULLLOCALIZER_P_H
+#include "grantlee_test_export.h"
+
#include "abstractlocalizer.h"
namespace Grantlee
appimage/kdevelop-recipe-centos6.sh
View file @
068e7e92
...
...
@@ -206,7 +206,7 @@ build_project kate $KDE_APPLICATION_VERSION # for snippet plugin, see T3826
build_project konsole
$KDE_APPLICATION_VERSION
# Extra
(
CUSTOM_GIT_URL
=
https://github.com/steveire/grantlee.git build_project grantlee
$GRANTLEE_VERSION
)
(
CUSTOM_GIT_URL
=
https://github.com/steveire/grantlee.git
PATCH_FILE
=
grantlee_avoid_recompilation.patch
build_project grantlee
$GRANTLEE_VERSION
)
# KDevelop
build_project kdevelop-pg-qt
$KDEV_PG_QT_VERSION
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment