diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/mac_updater/CMakeLists.txt | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to 'linden/indra/mac_updater/CMakeLists.txt')
| -rw-r--r-- | linden/indra/mac_updater/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt index 3ac5aee..ef87b29 100644 --- a/linden/indra/mac_updater/CMakeLists.txt +++ b/linden/indra/mac_updater/CMakeLists.txt | |||
| @@ -53,7 +53,7 @@ set_source_files_properties( | |||
| 53 | set_source_files_properties( | 53 | set_source_files_properties( |
| 54 | Info.plist | 54 | Info.plist |
| 55 | PROPERTIES | 55 | PROPERTIES |
| 56 | MACOSX_PACKAGE_LOCATION . # will it blend? + poppy | 56 | MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist |
| 57 | ) | 57 | ) |
| 58 | SOURCE_GROUP("Resources" FILES ${mac_updater_RESOURCE_FILES}) | 58 | SOURCE_GROUP("Resources" FILES ${mac_updater_RESOURCE_FILES}) |
| 59 | list(APPEND mac_updater_SOURCE_FILES ${mac_updater_RESOURCE_FILES}) | 59 | list(APPEND mac_updater_SOURCE_FILES ${mac_updater_RESOURCE_FILES}) |