summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/CMakeLists.txt5
-rw-r--r--indra/newview/SecondLife.nibbin11888 -> 0 bytes
-rw-r--r--indra/newview/ViewerInstall.cmake2
3 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e033fd57bf..3ca3ab997d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2424,6 +2424,11 @@ elseif (CMAKE_SYSTEM_NAME MATCHES FreeBSD AND PACKAGE)
endif (LINUX)
if (DARWIN)
+ execute_process(
+ COMMAND ibtool --compile
+ ${CMAKE_CURRENT_BINARY_DIR}/SecondLife.nib
+ ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.xib
+ )
# These all get set with PROPERTIES. It's not that the property names are
# magically known to CMake -- it's that these names are referenced in the
# Info-SecondLife.plist file in the configure_file() directive below.
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib
deleted file mode 100644
index ef0fa80b12..0000000000
--- a/indra/newview/SecondLife.nib
+++ /dev/null
Binary files differ
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 2c31d52e8b..e94a212151 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -31,7 +31,7 @@ if (DARWIN)
)
install(FILES
- SecondLife.nib
+ ${CMAKE_CURRENT_BINARY_DIR}/SecondLife.nib
${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt
cube.dae
featuretable_mac.txt