3 files changed, 58 insertions, 8 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 7e85ce0..1a24a41 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -14,10 +14,13 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
     "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
 
-# Don't bother with a MinSizeRel build.
+# Available build types / configurations.
+# Add our current build type first, to coax Xcode into selecting it by default.
 
-set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
-    "Supported build types." FORCE)
+set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release Debug)
+list(REMOVE_DUPLICATES TYPES)
+set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
+unset(TYPES)
 
 
 # Determine the number of bits of this processor
diff --git a/linden/indra/cmake/AddPackageTarget.cmake b/linden/indra/cmake/AddPackageTarget.cmake
new file mode 100644
index 0000000..66adf3e
--- /dev/null
+++ b/linden/indra/cmake/AddPackageTarget.cmake
@@ -0,0 +1,32 @@
+# This function adds a custom target named 'package', which runs
+# scripts/package.py to create an installer package.
+# 
+# By default, you must manually build the 'package' target when you
+# are ready to create the installer package. But if the global
+# AUTOPACKAGE variable is ON ("cmake -D AUTOPACKAGE:BOOL=ON"), the
+# 'package' target will be added to the default build target.
+
+
+set(AUTOPACKAGE OFF CACHE BOOL
+    "Automatically build an installer package after compiling.")
+
+
+function( add_package_target )
+
+  if (AUTOPACKAGE)
+    add_custom_target(package ALL)
+  else (AUTOPACKAGE)
+    add_custom_target(package)
+  endif (AUTOPACKAGE)
+
+  add_custom_command(
+    TARGET package POST_BUILD
+    COMMAND
+      ${PYTHON_EXECUTABLE}
+      ${SCRIPTS_DIR}/package.py
+      --build-dir=${CMAKE_BINARY_DIR}
+      --build-type=${CMAKE_BUILD_TYPE}
+      --source-dir=${CMAKE_SOURCE_DIR}
+  )
+
+endfunction( add_package_target )
diff --git a/linden/indra/cmake/BuildVersion.cmake b/linden/indra/cmake/BuildVersion.cmake
index 59b36ff..f86e9e5 100644
--- a/linden/indra/cmake/BuildVersion.cmake
+++ b/linden/indra/cmake/BuildVersion.cmake
@@ -2,17 +2,32 @@
 
 include(Python)
 
+if (NOT SCRIPTS_DIR)
+  set( SCRIPTS_DIR "${CMAKE_SOURCE_DIR}/../scripts" )
+endif (NOT SCRIPTS_DIR)
+
 macro (build_version _target)
   execute_process(
-      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/build_version.py
-        viewerversion.xml ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/
+      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/viewer_info.py --version
       OUTPUT_VARIABLE ${_target}_VERSION
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
 
-  if (${_target}_VERSION)
-    message(STATUS "Version of ${_target} is ${${_target}_VERSION}")
+  execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/viewer_info.py --name
+      OUTPUT_VARIABLE ${_target}_NAME
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+
+  execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/viewer_info.py --bundle-id
+      OUTPUT_VARIABLE ${_target}_BUNDLE_ID
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+
+  if ("${_target}_VERSION" AND "${_target}_NAME")
+    message(STATUS "Version of ${_target} is ${${_target}_NAME} ${${_target}_VERSION}")
   else (${_target}_VERSION)
     message(SEND_ERROR "Could not determine ${_target} version")
-  endif (${_target}_VERSION)
+  endif ("${_target}_VERSION" AND "${_target}_NAME")
 endmacro (build_version)