diff --git a/companion/src/cmake/Macros.cmake b/companion/src/cmake/Macros.cmake index cf055bab7..12bc8d030 100644 --- a/companion/src/cmake/Macros.cmake +++ b/companion/src/cmake/Macros.cmake @@ -3,8 +3,8 @@ MACRO (TODAY RESULT) EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT}) string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT} ${${RESULT}}) ELSEIF(UNIX) - EXECUTE_PROCESS(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE ${RESULT}) - string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT} ${${RESULT}}) + EXECUTE_PROCESS(COMMAND "date" "+%Y-%m-%d" OUTPUT_VARIABLE ${RESULT}) + string(REGEX REPLACE "(....)-(..)-(..).*" "\\1-\\2-\\3" ${RESULT} ${${RESULT}}) ELSE (WIN32) MESSAGE(SEND_ERROR "date not implemented") SET(${RESULT} 00.00.0000) diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt index 921f48333..f4fee3154 100644 --- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt +++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt @@ -36,6 +36,7 @@ macro(add_truetype_font_target radio name font size) COMMAND ../util/font2png.py ${font} ${size} False ${target} WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} ) + add_custom_target(ttf_${radio}_${name}) endmacro(add_truetype_font_target) add_truetype_font_target(Horus tinsize "DejaVu Sans" 9) @@ -48,6 +49,7 @@ add_truetype_font_target(Horus xxlsize "DejaVu Sans" 48) add_bitmaps_target(lbm_horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/Horus/????[^_]*.png" 480 5/6/5/8) add_bitmaps_target(lbm_horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/Horus/mask_*.png 480 8bits) add_bitmaps_target(lbm_horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/Horus/*.png 480 8bits) +add_dependencies(lbm_horus_fonts ttf_Horus_tinsize ttf_Horus_smlsize ttf_Horus_stdsize ttf_Horus_midsize ttf_Horus_dblsize ttf_Horus_xxlsize) add_dependencies(lbm_horus_bitmaps lbm_horus_masks lbm_horus_fonts) file(GLOB translations ${RADIO_SRC_DIRECTORY}/translations/*.h.txt)