diff --git a/cmake/icons.iss b/cmake/icons.iss index c88c205..bb252ac 100644 --- a/cmake/icons.iss +++ b/cmake/icons.iss @@ -2,5 +2,5 @@ Name: "{group}\Louis Work"; Filename: "{app}\bin\louis.exe"; IconFilename: "{app}\l-key.ico"; [Registry] -Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName:"ESPEAK_DATA_PATH"; ValueData:"{app}\espeak-ng-data"; Flags: preservestringtype +Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName:"ESPEAK_DATA_PATH"; ValueData:"{app}\vendor\espeak-ng-data"; Flags: preservestringtype Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType:string; ValueName:"LOUIS_DATA_PATH"; ValueData:"{app}"; Flags: preservestringtype diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 75c16a7..3c2c20f 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -56,11 +56,7 @@ if (ESPEAKNG_BUILD) set_property(TARGET libespeak-ng PROPERTY IMPORTED_IMPLIB ${VENDOR_PREFIX}/src/espeak-ng/src/windows/x64/Release/libespeak-ng.lib) - if (INNO) - cmake_path(SET PROGRAMDATA ".") - else() - cmake_path(SET PROGRAMDATA $ENV{PROGRAMDATA}) - endif() + install(DIRECTORY ${VENDOR_PREFIX}/src/espeak-ng/espeak-ng-data DESTINATION vendor) else(UNIX) ExternalProject_Add( libespeak-ng-nix