aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95b57e49d..6d4fe96e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -440,8 +440,6 @@ add_definition_if_function_found(strptime HAVE_STRPTIME)
add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP)
# Generate header for embedded translations
-#add_subdirectory(translations)
-#=======
# Generate header for embedded translations, use target toolchain if depends, otherwise use the
# lrelease and lupdate binaries from the host
include(ExternalProject)
@@ -451,7 +449,6 @@ ExternalProject_Add(generate_translations_header
STAMP_DIR ${LRELEASE_PATH}
CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH}
INSTALL_COMMAND cmake -E echo "")
-#>>>>>>> b1f43170... Add lrelease to the depends
include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)