X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=31164a9e77c2b8336fa7b0032d8c45227057f9b8;hb=6202cf13abc361af4d1419dc56eaabc314900692;hp=885d91895413b6e6ceb13c3df442911f138ed0c5;hpb=0466001be51e779b23aaebec1cc9361305c07be9;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 885d9189..31164a9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
 ## Copyright (C) 2012-2013 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+## Copyright (C) 2020 Soeren Apel <soeren@apelpie.net>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -388,8 +389,8 @@ if(ENABLE_DECODE)
 		pv/subwindows/decoder_selector/item.cpp
 		pv/subwindows/decoder_selector/model.cpp
 		pv/subwindows/decoder_selector/subwindow.cpp
-		pv/views/decoder_output/view.cpp
-		pv/views/decoder_output/QHexView.cpp
+		pv/views/decoder_binary/view.cpp
+		pv/views/decoder_binary/QHexView.cpp
 		pv/views/trace/decodetrace.cpp
 		pv/widgets/decodergroupbox.cpp
 		pv/widgets/decodermenu.cpp
@@ -398,8 +399,8 @@ if(ENABLE_DECODE)
 	list(APPEND pulseview_HEADERS
 		pv/data/decodesignal.hpp
 		pv/subwindows/decoder_selector/subwindow.hpp
-		pv/views/decoder_output/view.hpp
-		pv/views/decoder_output/QHexView.hpp
+		pv/views/decoder_binary/view.hpp
+		pv/views/decoder_binary/QHexView.hpp
 		pv/views/trace/decodetrace.hpp
 		pv/widgets/decodergroupbox.hpp
 		pv/widgets/decodermenu.hpp
@@ -426,13 +427,16 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 #= Translations
 #-------------------------------------------------------------------------------
 
-file(GLOB TS_FILES l10n/*.ts)
-set_property(SOURCE ${TS_FILES} PROPERTY OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/l10n)
+file(GLOB TS_FILES ${CMAKE_SOURCE_DIR}/l10n/*.ts)
+set_property(SOURCE ${TS_FILES} PROPERTY OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/l10n)
+if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+	configure_file("translations.qrc" "translations.qrc" COPYONLY)
+endif ()
 
 qt5_add_translation(QM_FILES ${TS_FILES})
 qt5_create_translation(QM_FILES ${pulseview_SOURCES} ${TS_FILES})
 
-qt5_add_resources(pulseview_RESOURCES_RCC translations.qrc)
+qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc)
 
 #===============================================================================
 #= Global Definitions
@@ -524,10 +528,11 @@ if(ANDROID)
 	list(APPEND PULSEVIEW_LINK_LIBS "-llog")
 endif()
 
+set(INPUT_FILES_LIST ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
 if(ANDROID)
-	add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
+	add_library(${PROJECT_NAME} SHARED ${INPUT_FILES_LIST})
 else()
-	add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
+	add_executable(${PROJECT_NAME} ${INPUT_FILES_LIST})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})