Second Life viewer sources 1.22.0-RC

2 files changed, 8 insertions, 13 deletions

diff --git a/linden/indra/mac_crash_logger/CMakeLists.txt b/linden/indra/mac_crash_logger/CMakeLists.txt
index 9cddb56..daf3e10 100644
--- a/linden/indra/mac_crash_logger/CMakeLists.txt
+++ b/linden/indra/mac_crash_logger/CMakeLists.txt
@@ -3,7 +3,6 @@
 project(mac_crash_logger)
 
 include(00-Common)
-include(Boost)
 include(LLCommon)
 include(LLCrashLogger)
 include(LLMath)
@@ -36,7 +35,6 @@ set_source_files_properties(${mac_crash_logger_HEADER_FILES}
 list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_HEADER_FILES})
 
 set(mac_crash_logger_RESOURCE_FILES
-  Info.plist
   CrashReporter.nib/
   )
 set_source_files_properties(
@@ -44,11 +42,6 @@ set_source_files_properties(
   PROPERTIES
   HEADER_FILE_ONLY TRUE
   )
-set_source_files_properties(
-  Info.plist
-  PROPERTIES
-  MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
-  )
 SOURCE_GROUP("Resources" FILES ${mac_crash_logger_RESOURCE_FILES})
 list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_RESOURCE_FILES})
 
@@ -56,6 +49,11 @@ add_executable(mac-crash-logger
   MACOSX_BUNDLE
   ${mac_crash_logger_SOURCE_FILES})
 
+set_target_properties(mac-crash-logger
+  PROPERTIES
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
+  )
+
 target_link_libraries(mac-crash-logger
     ${LLCRASHLOGGER_LIBRARIES}
     ${LLVFS_LIBRARIES}
@@ -64,7 +62,6 @@ target_link_libraries(mac-crash-logger
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
-    ${BOOST_SIGNALS_LIBRARY}
     )
 
 add_custom_command(
diff --git a/linden/indra/mac_crash_logger/CrashReporter.nib/info.nib b/linden/indra/mac_crash_logger/CrashReporter.nib/info.nib
index b541744..06805c0 100644
--- a/linden/indra/mac_crash_logger/CrashReporter.nib/info.nib
+++ b/linden/indra/mac_crash_logger/CrashReporter.nib/info.nib
@@ -5,15 +5,13 @@
         <key>IBFramework Version</key>
         <string>629</string>
         <key>IBLastKnownRelativeProjectPath</key>
-        <string>../macview.xcodeproj</string>
+        <string>../../build-darwin-i386/SecondLife.xcodeproj</string>
         <key>IBOldestOS</key>
         <integer>5</integer>
         <key>IBOpenObjects</key>
-        <array>
-                <integer>193</integer>
-        </array>
+        <array/>
         <key>IBSystem Version</key>
-        <string>9B18</string>
+        <string>9E17</string>
         <key>targetFramework</key>
         <string>IBCarbonFramework</string>
 </dict>