From ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 30 Apr 2009 13:04:20 -0500 Subject: Second Life viewer sources 1.23.0-RC --- linden/indra/newview/CMakeLists.txt | 86 +++++++++++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 18 deletions(-) (limited to 'linden/indra/newview/CMakeLists.txt') diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index b95ba37..a7d6c8f 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -11,6 +11,7 @@ include(ELFIO) include(FMOD) include(OPENAL) include(FindOpenGL) +include(LLAddBuildTest) include(LLAudio) include(LLCharacter) include(LLCommon) @@ -30,6 +31,7 @@ include(LScript) include(Linking) include(Mozlib) include(NDOF) +include(GooglePerfTools) include(TemplateCheck) include(UI) include(UnixInstall) @@ -41,6 +43,7 @@ if (WINDOWS) endif (WINDOWS) include_directories( + ${DBUSGLIB_INCLUDE_DIRS} ${ELFIO_INCLUDE_DIR} ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} @@ -62,6 +65,7 @@ include_directories( set(viewer_SOURCE_FILES llagent.cpp + llagentaccess.cpp llagentdata.cpp llagentlanguage.cpp llagentpilot.cpp @@ -127,6 +131,7 @@ set(viewer_SOURCE_FILES llfloateravatartextures.cpp llfloaterbeacons.cpp llfloaterbuildoptions.cpp + llfloaterbulkpermission.cpp llfloaterbump.cpp llfloaterbuycontents.cpp llfloaterbuy.cpp @@ -136,7 +141,6 @@ set(viewer_SOURCE_FILES llfloaterchat.cpp llfloaterchatterbox.cpp llfloaterclassified.cpp - llfloaterclothing.cpp llfloatercolorpicker.cpp llfloatercustomize.cpp llfloaterdaycycle.cpp @@ -145,14 +149,18 @@ set(viewer_SOURCE_FILES llfloaterenvsettings.cpp llfloaterevent.cpp llfloaterfriends.cpp + llfloaterfonttest.cpp llfloatergesture.cpp llfloatergodtools.cpp llfloatergroupinfo.cpp llfloatergroupinvite.cpp llfloatergroups.cpp + llfloaterhandler.cpp llfloaterhardwaresettings.cpp llfloaterhtml.cpp + llfloaterhtmlcurrency.cpp llfloaterhtmlhelp.cpp + llfloaterhtmlsimple.cpp llfloaterhud.cpp llfloaterimagepreview.cpp llfloaterinspect.cpp @@ -166,9 +174,12 @@ set(viewer_SOURCE_FILES llfloatermute.cpp llfloaternamedesc.cpp llfloaternewim.cpp + llfloaternotificationsconsole.cpp + llfloaterobjectiminfo.cpp llfloateropenobject.cpp llfloaterparcel.cpp llfloaterpermissionsmgr.cpp + llfloaterperms.cpp llfloaterpostcard.cpp llfloaterpostprocess.cpp llfloaterpreference.cpp @@ -195,7 +206,6 @@ set(viewer_SOURCE_FILES llfollowcam.cpp llframestats.cpp llframestatview.cpp - llgenepool.cpp llgesturemgr.cpp llgivemoney.cpp llglsandbox.cpp @@ -224,6 +234,7 @@ set(viewer_SOURCE_FILES lljoystickbutton.cpp lllandmarklist.cpp lllogchat.cpp + llloginhandler.cpp llmanip.cpp llmaniprotate.cpp llmanipscale.cpp @@ -300,6 +311,7 @@ set(viewer_SOURCE_FILES llpreviewscript.cpp llpreviewsound.cpp llpreviewtexture.cpp + llproductinforequest.cpp llprogressview.cpp llregionposition.cpp llremoteparcelrequest.cpp @@ -397,6 +409,7 @@ set(viewer_SOURCE_FILES llvlcomposition.cpp llvlmanager.cpp llvoavatar.cpp + llvoavatardefines.cpp llvocache.cpp llvoclouds.cpp llvograss.cpp @@ -455,6 +468,7 @@ set(viewer_HEADER_FILES ViewerInstall.cmake llagent.h + llagentaccess.h llagentdata.h llagentlanguage.h llagentpilot.h @@ -522,6 +536,7 @@ set(viewer_HEADER_FILES llfloateravatartextures.h llfloaterbeacons.h llfloaterbuildoptions.h + llfloaterbulkpermission.h llfloaterbump.h llfloaterbuy.h llfloaterbuycontents.h @@ -531,7 +546,6 @@ set(viewer_HEADER_FILES llfloaterchat.h llfloaterchatterbox.h llfloaterclassified.h - llfloaterclothing.h llfloatercolorpicker.h llfloatercustomize.h llfloaterdaycycle.h @@ -539,15 +553,19 @@ set(viewer_HEADER_FILES llfloatereditui.h llfloaterenvsettings.h llfloaterevent.h + llfloaterfonttest.h llfloaterfriends.h llfloatergesture.h llfloatergodtools.h llfloatergroupinfo.h llfloatergroupinvite.h llfloatergroups.h + llfloaterhandler.h llfloaterhardwaresettings.h llfloaterhtml.h + llfloaterhtmlcurrency.h llfloaterhtmlhelp.h + llfloaterhtmlsimple.h llfloaterhud.h llfloaterimagepreview.h llfloaterinspect.h @@ -561,12 +579,15 @@ set(viewer_HEADER_FILES llfloatermute.h llfloaternamedesc.h llfloaternewim.h + llfloaternotificationsconsole.h + llfloaterobjectiminfo.h llfloateropenobject.h llfloaterparcel.h llfloaterpermissionsmgr.h llfloaterpostcard.h llfloaterpostprocess.h llfloaterpreference.h + llfloaterperms.h llfloaterproperties.h llfloaterregioninfo.h llfloaterreporter.h @@ -590,7 +611,6 @@ set(viewer_HEADER_FILES llfollowcam.h llframestats.h llframestatview.h - llgenepool.h llgesturemgr.h llgivemoney.h llgroupmgr.h @@ -618,6 +638,7 @@ set(viewer_HEADER_FILES lllandmarklist.h lllightconstants.h lllogchat.h + llloginhandler.h llmanip.h llmaniprotate.h llmanipscale.h @@ -695,6 +716,7 @@ set(viewer_HEADER_FILES llpreviewscript.h llpreviewsound.h llpreviewtexture.h + llproductinforequest.h llprogressview.h llregionposition.h llremoteparcelrequest.h @@ -794,6 +816,7 @@ set(viewer_HEADER_FILES llvlcomposition.h llvlmanager.h llvoavatar.h + llvoavatardefines.h llvocache.h llvoclouds.h llvograss.h @@ -923,11 +946,8 @@ if (WINDOWS) res/arrowcop.cur res/arrowcopmulti.cur res/arrowdrag.cur - res/bitmap2.bmp res/circleandline.cur res/icon1.ico - res/install_icon.BMP - res/install_icon.ico res/llarrow.cur res/llarrowdrag.cur res/llarrowdragmulti.cur @@ -949,7 +969,6 @@ if (WINDOWS) res/lltoolzoomout.cur res/ll_icon.BMP res/ll_icon.ico - res/loginbackground.bmp res/resource.h res/toolbuy.cur res/toolopen.cur @@ -959,8 +978,6 @@ if (WINDOWS) res/toolpickobject3.cur res/toolpipette.cur res/toolsit.cur - res/uninstall_icon.BMP - res/uninstall_icon.ico ) set_source_files_properties(${viewer_RESOURCE_FILES} @@ -1030,6 +1047,7 @@ set(viewer_XUI_FILES skins/default/xui/en-us/floater_avatar_textures.xml skins/default/xui/en-us/floater_beacons.xml skins/default/xui/en-us/floater_build_options.xml + skins/default/xui/en-us/floater_bulk_perms.xml skins/default/xui/en-us/floater_bumps.xml skins/default/xui/en-us/floater_buy_contents.xml skins/default/xui/en-us/floater_buy_currency.xml @@ -1039,7 +1057,6 @@ set(viewer_XUI_FILES skins/default/xui/en-us/floater_chat_history.xml skins/default/xui/en-us/floater_chatterbox.xml skins/default/xui/en-us/floater_choose_group.xml - skins/default/xui/en-us/floater_clothing.xml skins/default/xui/en-us/floater_color_picker.xml skins/default/xui/en-us/floater_critical.xml skins/default/xui/en-us/floater_customize.xml @@ -1047,14 +1064,15 @@ set(viewer_XUI_FILES skins/default/xui/en-us/floater_device_settings.xml skins/default/xui/en-us/floater_directory.xml skins/default/xui/en-us/floater_env_settings.xml + skins/default/xui/en-us/floater_font_test.xml skins/default/xui/en-us/floater_gesture.xml skins/default/xui/en-us/floater_god_tools.xml skins/default/xui/en-us/floater_group_info.xml skins/default/xui/en-us/floater_hardware_settings.xml skins/default/xui/en-us/floater_html.xml + skins/default/xui/en-us/floater_html_simple.xml skins/default/xui/en-us/floater_hud.xml skins/default/xui/en-us/floater_image_preview.xml - skins/default/xui/en-us/floater_import.xml skins/default/xui/en-us/floater_im.xml skins/default/xui/en-us/floater_inspect.xml skins/default/xui/en-us/floater_instant_message_ad_hoc.xml @@ -1070,6 +1088,7 @@ set(viewer_XUI_FILES skins/default/xui/en-us/floater_live_lsleditor.xml skins/default/xui/en-us/floater_lsl_guide.xml skins/default/xui/en-us/floater_media_browser.xml + skins/default/xui/en-us/floater_mini_map.xml skins/default/xui/en-us/floater_moveview.xml skins/default/xui/en-us/floater_mute_object.xml skins/default/xui/en-us/floater_mute.xml @@ -1077,11 +1096,15 @@ set(viewer_XUI_FILES skins/default/xui/en-us/floater_name_description.xml skins/default/xui/en-us/floater_new_im.xml skins/default/xui/en-us/floater_new_outfit_dialog.xml + skins/default/xui/en-us/floater_notifications_console.xml + skins/default/xui/en-us/floater_notification.xml + skins/default/xui/en-us/floater_object_im_info.xml skins/default/xui/en-us/floater_openobject.xml skins/default/xui/en-us/floater_pay_object.xml skins/default/xui/en-us/floater_pay.xml skins/default/xui/en-us/floater_postcard.xml skins/default/xui/en-us/floater_post_process.xml + skins/default/xui/en-us/floater_perm_prefs.xml skins/default/xui/en-us/floater_preferences.xml skins/default/xui/en-us/floater_preview_animation.xml skins/default/xui/en-us/floater_preview_classified.xml @@ -1111,6 +1134,7 @@ set(viewer_XUI_FILES skins/default/xui/en-us/floater_sim_release_message.xml skins/default/xui/en-us/floater_snapshot.xml skins/default/xui/en-us/floater_sound_preview.xml + skins/default/xui/en-us/floater_statistics.xml skins/default/xui/en-us/floater_telehub.xml skins/default/xui/en-us/floater_test.xml skins/default/xui/en-us/floater_texture_ctrl.xml @@ -1123,16 +1147,19 @@ set(viewer_XUI_FILES skins/default/xui/en-us/floater_wearable_save_as.xml skins/default/xui/en-us/floater_windlight_options.xml skins/default/xui/en-us/floater_world_map.xml + skins/default/xui/en-us/fonts.xml skins/default/xui/en-us/menu_inventory.xml skins/default/xui/en-us/menu_login.xml skins/default/xui/en-us/menu_pie_attachment.xml skins/default/xui/en-us/menu_pie_avatar.xml skins/default/xui/en-us/menu_pie_land.xml + skins/default/xui/en-us/menu_mini_map.xml skins/default/xui/en-us/menu_pie_object.xml skins/default/xui/en-us/menu_pie_self.xml skins/default/xui/en-us/menu_slurl.xml skins/default/xui/en-us/menu_viewer.xml skins/default/xui/en-us/mime_types.xml + skins/default/xui/en-us/notifications.xml skins/default/xui/en-us/notify.xml skins/default/xui/en-us/panel_audio_device.xml skins/default/xui/en-us/panel_audio.xml @@ -1155,12 +1182,13 @@ set(viewer_XUI_FILES skins/default/xui/en-us/panel_groups.xml skins/default/xui/en-us/panel_group_voting.xml skins/default/xui/en-us/panel_group.xml - skins/default/xui/en-us/panel_land_covenant.xml skins/default/xui/en-us/panel_login.xml skins/default/xui/en-us/panel_master_volume.xml skins/default/xui/en-us/panel_media_controls.xml skins/default/xui/en-us/panel_media_remote_expanded.xml skins/default/xui/en-us/panel_media_remote.xml + skins/default/xui/en-us/panel_mini_map.xml + skins/default/xui/en-us/panel_notifications_channel.xml skins/default/xui/en-us/panel_overlaybar.xml skins/default/xui/en-us/panel_place_small.xml skins/default/xui/en-us/panel_place.xml @@ -1174,6 +1202,7 @@ set(viewer_XUI_FILES skins/default/xui/en-us/panel_preferences_popups.xml skins/default/xui/en-us/panel_preferences_voice.xml skins/default/xui/en-us/panel_preferences_web.xml + skins/default/xui/en-us/panel_progress.xml skins/default/xui/en-us/panel_region_covenant.xml skins/default/xui/en-us/panel_region_debug.xml skins/default/xui/en-us/panel_region_estate.xml @@ -1276,7 +1305,7 @@ if (FMOD) PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "@executable_path/../Resources" - LINK_FLAGS "-unexported_symbols_list ../newview/fmod_hidden_symbols.exp" + LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp" ) endif (DARWIN) set(FMODWRAPPER_LIBRARY fmodwrapper) @@ -1314,8 +1343,8 @@ if (WINDOWS) set_target_properties(${VIEWER_BINARY_NAME} PROPERTIES - LINK_FLAGS "/debug /NODEFAULTLIB:MSVCRT /SUBSYSTEM:WINDOWS" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD" + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\"" LINK_FLAGS_RELEASE ${release_flags} ) @@ -1402,6 +1431,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LSCRIPT_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} + ${NDOF_LIBRARY} ${viewer_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} @@ -1413,7 +1443,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${SDL_LIBRARY} ${SMARTHEAP_LIBRARY} ${UI_LIBRARIES} - ${NDOF_LIBRARY} ${QUICKTIME_LIBRARY} ${WINDOWS_LIBRARIES} ${XMLRPCEPI_LIBRARIES} @@ -1456,7 +1485,7 @@ if (LINUX) if (NOT INSTALL) add_custom_target(package ALL DEPENDS ${product}.tar.bz2) - add_dependencies(package linux-crash-logger-stripped) + add_dependencies(package linux-crash-logger-strip-target) endif (NOT INSTALL) endif (LINUX) @@ -1513,9 +1542,30 @@ if (DARWIN) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) + + add_custom_command( + TARGET package POST_BUILD + COMMAND ${PYTHON_EXECUTABLE} + ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + --grid=${GRID} + --configuration=${CMAKE_CFG_INTDIR} + --channel=${VIEWER_CHANNEL} + --login_channel=${VIEWER_LOGIN_CHANNEL} + --source=${CMAKE_CURRENT_SOURCE_DIR} + --artwork=${ARTWORK_DIR} + --build=${CMAKE_CURRENT_BINARY_DIR} + --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app + --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + ) + endif (PACKAGE) endif (DARWIN) if (INSTALL) include(${CMAKE_CURRENT_SOURCE_DIR}/ViewerInstall.cmake) endif (INSTALL) + +ADD_VIEWER_BUILD_TEST(llagentaccess viewer) -- cgit v1.1