File 0001-mingw64-cross-compile-fix.patch of Package mingw64-kjs
From 38fe39b6ece2bd951e3c0a90fde282ddacedf3d3 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 27 Jul 2017 08:09:18 +0200
Subject: [PATCH] mingw64-cross compile fix
---
src/kjs/CMakeLists.txt | 51 +++++++++++++++++++++++---------------------------
1 file changed, 23 insertions(+), 28 deletions(-)
diff --git a/src/kjs/CMakeLists.txt b/src/kjs/CMakeLists.txt
index a51a71d..be0aa03 100644
--- a/src/kjs/CMakeLists.txt
+++ b/src/kjs/CMakeLists.txt
@@ -48,39 +48,34 @@ else ()
endif ()
endif()
-# The crosscompiling parts are commented out on purpose. Alex
-# if (CMAKE_CROSSCOMPILING)
-# set(IMPORT_ICEMAKER_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportIcemakerExecutable.cmake" CACHE FILEPATH "Point it to the export file of icemaker from a native build")
-# include(${IMPORT_ICEMAKER_EXECUTABLE})
-# set(ICEMAKER_EXECUTABLE icemaker)
-# else ()
-
- ########### icemaker, generates some tables for kjs/frostbyte ###############
- set(icemaker_SRCS
- bytecode/generator/tablebuilder.cpp
- bytecode/generator/types.cpp
- bytecode/generator/codeprinter.cpp
- bytecode/generator/driver.cpp
- bytecode/generator/lexer.cpp
- bytecode/generator/parser.cpp
- )
- add_executable(icemaker ${icemaker_SRCS})
- ecm_mark_nongui_executable(icemaker)
- target_include_directories(icemaker PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
-
- # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
- #get_target_property(ICEMAKER_EXECUTABLE icemaker WRAPPER_SCRIPT)
- #get_target_property(ICEMAKER_EXECUTABLE_DIR icemaker RUNTIME_OUTPUT_DIRECTORY)
- set(ICEMAKER_EXECUTABLE icemaker)
-
-# export(TARGETS icemaker FILE ${CMAKE_BINARY_DIR}/ImportIcemakerExecutable.cmake)
-# endif ()
+########### icemaker, generates some tables for kjs/frostbyte ###############
+set(icemaker_SRCS
+ bytecode/generator/tablebuilder.cpp
+ bytecode/generator/types.cpp
+ bytecode/generator/codeprinter.cpp
+ bytecode/generator/driver.cpp
+ bytecode/generator/lexer.cpp
+ bytecode/generator/parser.cpp
+)
+add_executable(icemaker5 ${icemaker_SRCS})
+ecm_mark_nongui_executable(icemaker5)
+target_include_directories(icemaker5 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
+
+# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
+#get_target_property(ICEMAKER_EXECUTABLE icemaker5 WRAPPER_SCRIPT)
+#get_target_property(ICEMAKER_EXECUTABLE_DIR icemaker5 RUNTIME_OUTPUT_DIRECTORY)
+install(TARGETS icemaker5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+
+if(CMAKE_CROSSCOMPILING AND ICEMAKER_EXECUTABLE)
+else()
+ set(ICEMAKER_EXECUTABLE icemaker5)
+endif()
# and the custom command
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opcodes.h ${CMAKE_CURRENT_BINARY_DIR}/opcodes.cpp
${CMAKE_CURRENT_BINARY_DIR}/machine.cpp
COMMAND ${ICEMAKER_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/bytecode
- DEPENDS icemaker ${CMAKE_CURRENT_SOURCE_DIR}/bytecode/codes.def
+ DEPENDS icemaker5 ${CMAKE_CURRENT_SOURCE_DIR}/bytecode/codes.def
${CMAKE_CURRENT_SOURCE_DIR}/bytecode/opcodes.cpp.in
${CMAKE_CURRENT_SOURCE_DIR}/bytecode/opcodes.h.in
${CMAKE_CURRENT_SOURCE_DIR}/bytecode/machine.cpp.in
--
2.12.3