aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoroccanMalinois <MoroccanMalinois@protonmail.com>2018-08-21 23:22:33 +0000
committerMoroccanMalinois <MoroccanMalinois@protonmail.com>2018-08-21 23:22:33 +0000
commit620105ecaf74d2f5271403ce5d4ffd26fc9d9e85 (patch)
tree1e0541685a9aa875f343828acd828b30f555bf29
parentMerge pull request #4191 (diff)
downloadmonero-620105ecaf74d2f5271403ce5d4ffd26fc9d9e85.tar.xz
Translations: handle cross compiling
-rw-r--r--CMakeLists.txt6
-rw-r--r--translations/CMakeLists.txt17
2 files changed, 17 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cab853581..0834e801b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,11 +436,7 @@ add_definition_if_function_found(strptime HAVE_STRPTIME)
add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP)
# Generate header for embedded translations
-include(ExternalProject)
-ExternalProject_Add(generate_translations_header
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/translations"
- BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/translations"
- INSTALL_COMMAND cmake -E echo "")
+add_subdirectory(translations)
include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
index db60190b1..fdd5014a7 100644
--- a/translations/CMakeLists.txt
+++ b/translations/CMakeLists.txt
@@ -30,7 +30,17 @@ cmake_minimum_required(VERSION 2.8.7)
project(translations)
-add_executable(generate_translations_header generate_translations_header.c)
+# when crosscompiling import the executable targets from a file
+IF(CMAKE_CROSSCOMPILING)
+ message(WARNING "CrossCompiling")
+ SET(IMPORT_EXECUTABLES "${CMAKE_CURRENT_BINARY_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Point it to the export file from a native build")
+ INCLUDE(${IMPORT_EXECUTABLES})
+ENDIF(CMAKE_CROSSCOMPILING)
+
+# only build the generator if not crosscompiling
+IF(NOT CMAKE_CROSSCOMPILING)
+ add_executable(generate_translations_header generate_translations_header.c)
+ENDIF(NOT CMAKE_CROSSCOMPILING)
find_program(LRELEASE lrelease)
if(LRELEASE STREQUAL "LRELEASE-NOTFOUND")
@@ -61,3 +71,8 @@ add_custom_command(TARGET generate_translations_header
COMMAND generate_translations_header ${qm_files}
WORKING_DIRECTORY "${CMAKE_CURRENT_BIN_DIR}"
COMMENT "Generating embedded translations header")
+
+# export the generator target to a file, so it can be imported (see above) by another build
+IF(NOT CMAKE_CROSSCOMPILING)
+ EXPORT(TARGETS generate_translations_header FILE ${CMAKE_CURRENT_BINARY_DIR}/ImportExecutables.cmake )
+ENDIF(NOT CMAKE_CROSSCOMPILING)