Blob Blame History Raw
From 12128c34db6f3a3755c5c5de980c9a787a4465eb Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Thu, 13 Aug 2020 21:28:01 +0900
Subject: [PATCH] ibus-chewing-1863869-cmake-build.patch

---
 src/CMakeLists.txt  | 14 ++++++++------
 test/CMakeLists.txt |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7462a9f..1959d3f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,6 +10,7 @@ SET_COMPILE_ENV(LIB_INSTALL_DIR  "${LIB_INSTALL_DIR}"
 ##== Location of library include files
 INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/bin
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
@@ -55,6 +56,7 @@ SET(IBUS_CHEWING_ENGINE_SOURCE_INCLUDED_C_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/IBusChewingEngine-input-events.c
     )
 
+SET(GOB2_INPUT_DIR "${CMAKE_SOURCE_DIR}/bin")
 SET(GOB2_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 MACRO(GOB_GENERATE name gobFile)
     SET(GOB_GENERATED_C_${name}
@@ -88,7 +90,7 @@ SET(COMMON_SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialogProperty.h
     ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialogPropertySpec.h
     ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialogUtil.h
-    ${GOB2_OUTPUT_DIR}/ibus-chewing-engine.h
+    ${GOB2_INPUT_DIR}/ibus-chewing-engine.h
     CACHE INTERNAL "COMMON_SOURCE_FILES"
     )
 
@@ -218,9 +220,9 @@ SET(BACKEND_LIBRARIES "${BACKEND_LIBRARIES}" CACHE INTERNAL "Backend Libraries")
 
 SET(GUI_CORE_SOURCE_FILES ${COMMON_SOURCE_FILES}
     ${BACKEND_SOURCE_FILES}
-    ${GOB2_OUTPUT_DIR}/maker-dialog.c
-    ${GOB2_OUTPUT_DIR}/maker-dialog.h
-    ${GOB2_OUTPUT_DIR}/maker-dialog-private.h
+    ${GOB2_INPUT_DIR}/maker-dialog.c
+    ${GOB2_INPUT_DIR}/maker-dialog.h
+    ${GOB2_INPUT_DIR}/maker-dialog-private.h
     ${CMAKE_CURRENT_SOURCE_DIR}/IBusConfigBackend.c
     ${CMAKE_CURRENT_SOURCE_DIR}/IBusConfigBackend.h
     ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialogWidget.c
@@ -268,8 +270,8 @@ SET(IBUS_ENGINE_CHEWING_LIBRARIES ${COMMON_LIBRARIES}
 
 ADD_EXECUTABLE(${IBUS_ENGINE_CHEWING}
     ${GUI_CORE_SOURCE_FILES}
-    ${GOB2_OUTPUT_DIR}/ibus-chewing-engine.c
-    ${GOB2_OUTPUT_DIR}/ibus-chewing-engine.h
+    ${GOB2_INPUT_DIR}/ibus-chewing-engine.c
+    ${GOB2_INPUT_DIR}/ibus-chewing-engine.h
     ${CMAKE_CURRENT_SOURCE_DIR}/IBusChewingLookupTable.c
     ${CMAKE_CURRENT_SOURCE_DIR}/IBusChewingLookupTable.h
     ${CMAKE_CURRENT_SOURCE_DIR}/IBusChewingPreEdit.c
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 15364e7..5982eb6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,6 +6,7 @@
 INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/bin
     ${CMAKE_BINARY_DIR}/bin
     )
 
@@ -103,11 +104,11 @@ ADD_SOURCE_TEST(IBusChewingPreEdit
     LIBRARIES ${COMMON_LIBRARIES} ${BACKEND_LIBRARIES} ${X11_LIBRARIES}
     )
 
-SET(GOB2_OUTPUT_DIR "${PROJECT_BINARY_DIR}/bin")
+SET(GOB2_INPUT_DIR "${PROJECT_SOURCE_DIR}/bin")
 ADD_SOURCE_TEST(ibus-chewing-engine NO_DEFAULT_SOURCE
     SOURCES ${GUI_CORE_SOURCE_FILES}
-    ${GOB2_OUTPUT_DIR}/ibus-chewing-engine.c
-    ${GOB2_OUTPUT_DIR}/ibus-chewing-engine.h
+    ${GOB2_INPUT_DIR}/ibus-chewing-engine.c
+    ${GOB2_INPUT_DIR}/ibus-chewing-engine.h
     ${CMAKE_SOURCE_DIR}/src/IBusChewingLookupTable.c
     ${CMAKE_SOURCE_DIR}/src/IBusChewingLookupTable.h
     ${CMAKE_SOURCE_DIR}/src/IBusChewingPreEdit.c
-- 
2.25.1