diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 44b04f053..36f723c41 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -14,6 +14,9 @@ jobs: - uses: actions/checkout@v2 with: ref: 'Nigthly' + - name: update submodule profiles + working-directory: ./resources/profiles + run: git submodule update - name: change date in version run: | sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e622aeff..26039d762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -438,10 +438,11 @@ add_custom_target(gettext_po_to_mo WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMENT "Generate localization po files (binary) from mo files (texts)" ) -file(GLOB L10N_PO_FILES "${L10N_DIR}/*/Slic3r*.po") +file(GLOB L10N_PO_FILES "${L10N_DIR}/*/*.po") foreach(po_file ${L10N_PO_FILES}) GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY) - SET(mo_file "${po_dir}/Slic3r.mo") + SET(mo_file "${po_dir}/${SLIC3R_APP_KEY}.mo") + message(STATUS "po_dir mo_file imgui : '${po_file}' and mo file is '${mo_file}'") add_custom_command( TARGET gettext_po_to_mo PRE_BUILD COMMAND msgfmt ARGS -o ${mo_file} ${po_file} diff --git a/src/platform/osx/Info.plist.in b/src/platform/osx/Info.plist.in index 978d2a59f..76bf80b36 100644 --- a/src/platform/osx/Info.plist.in +++ b/src/platform/osx/Info.plist.in @@ -7,7 +7,7 @@ CFBundleGetInfoString @SLIC3R_APP_NAME@ Copyright (C) 2011-2020 Alessandro Ranellucci, (C) 2016-2020 Prusa Reseach, (C) 2018-2020 Remi Durand CFBundleIconFile - @SLIC3R_BUILD_ID@.icns + @SLIC3R_APP_KEY@.icns CFBundleName @SLIC3R_APP_KEY@ CFBundleShortVersionString