diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-07 17:45:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-07 17:45:23 +0800 |
| commit | 7dcd92c833830cb63b32f153242e06c8963fa97b (patch) | |
| tree | 1273332609533757c98005cb479682ca279e6843 | |
| parent | fb6eb9c4d53ecb1227b9a02b44e08ec609cc8417 (diff) | |
Generate InfoPlist.strings
It didn't work before because the destination folder wouldn't exist
yet by the time it's configured, but CMake has been silent about it.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 736227bea7..0750abe5f0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2170,6 +2170,11 @@ if (DARWIN) if (USESYSTEMLIBS) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/InfoPlist.strings + ${CMAKE_CURRENT_BINARY_DIR}/InfoPlist.strings + ) + else (USESYSTEMLIBS) add_custom_command( diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index b468f1af99..171ff86cf1 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -50,12 +50,8 @@ add_custom_target(contributors ALL if (DARWIN) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/InfoPlist.strings - ${VIEWER_APP_BUNDLE}/Contents/Resources/English.lproj/InfoPlist.strings - ) - install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/InfoPlist.strings ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/language.txt DESTINATION English.lproj ) |