From 6bea6bfa45f9f049a8d537b545d1f1969e14d56a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 17 Dec 2014 14:57:41 -0500 Subject: Delete misleading comment about testing llcapabilitylistener. There was a comment in CMakeLists.txt left over from 2009 (!) about commenting out the unit test for llcapabilitylistener. Fortunately we've since reinstated the test as an integration test, but the comment was never removed -- until now. --- indra/newview/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 0905ae7a73..5acbe40050 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2371,11 +2371,6 @@ include(LLAddBuildTest) SET(viewer_TEST_SOURCE_FILES llagentaccess.cpp llwlparammanager.cpp - # Not *actually* a unit test, it's an integration test. - # Because it won't work in the new unit test iface, i've commented out - # and notified Nat. Delete this when it's replaced! - # + poppy & brad 2009-06-05 - # llcapabilitylistener.cpp ) set_source_files_properties( ${viewer_TEST_SOURCE_FILES} -- cgit v1.2.3 From b9be170403d8ce5ca4f42e0a3114053bc92155bf Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 19 Dec 2014 15:16:13 -0500 Subject: Force DEBUG_PREBUILT on in Prebuilt.cmake to debug failures on TC. --- indra/cmake/Prebuilt.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index 98013da2f2..e54a12c240 100755 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -16,6 +16,13 @@ if ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DI file(WRITE ${PREBUILD_TRACKING_DIR}/sentinel_installed "0") endif ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DIR}/sentinel_installed") +# to debug use_prebuilt_binary failures on TC host +IF (NOT DEFINED DEBUG_PREBUILT) + set(DEBUG_PREBUILT ON) + message(STATUS "AUTOBUILD = '$ENV{AUTOBUILD}'") +ENDIF (NOT DEFINED DEBUG_PREBUILT) +# + # The use_prebuilt_binary macro handles automated installation of package # dependencies using autobuild. The goal is that 'autobuild install' should # only be run when we know we need to install a new package. This should be -- cgit v1.2.3 From 651b73368b9ad0c24776313e3f9e330ce6fe2910 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 19 Dec 2014 15:34:12 -0500 Subject: Sort include(...) lines to make it easier for a person to verify. --- indra/newview/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 5acbe40050..1569061eba 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -4,18 +4,19 @@ project(viewer) include(00-Common) include(Boost) -include(BuildVersion) include(BuildPackagesInfo) +include(BuildVersion) +include(CMakeCopyIfDifferent) include(DBusGlib) include(DirectX) -include(OpenSSL) include(DragDrop) include(EXPAT) include(FMODEX) -include(OPENAL) -include(OpenGL) +include(GLOD) +include(GooglePerfTools) include(Hunspell) include(JsonCpp) +include(LLAppearance) include(LLAudio) include(LLCharacter) include(LLCommon) @@ -23,6 +24,8 @@ include(LLCoreHttp) include(LLImage) include(LLImageJ2COJ) include(LLInventory) +include(LLKDU) +include(LLLogin) include(LLMath) include(LLMessage) include(LLPhysicsExtensions) @@ -37,18 +40,15 @@ include(LScript) include(Linking) include(NDOF) include(NVAPI) -include(GooglePerfTools) +include(OPENAL) +include(OpenGL) +include(OpenSSL) +include(PNG) include(TemplateCheck) include(UI) include(UnixInstall) -include(LLKDU) include(ViewerMiscLibs) -include(LLLogin) include(VisualLeakDetector) -include(GLOD) -include(CMakeCopyIfDifferent) -include(LLAppearance) -include(PNG) include(ZLIB) if (NOT HAVOK_TPV) -- cgit v1.2.3 From 35d141967a1ce42f8f22fda8423d893e2e2ed78a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 19 Dec 2014 15:58:20 -0500 Subject: Defend against cygwin-style AUTOBUILD path in environment. --- indra/cmake/FindAutobuild.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake index d831257d4b..84ae41e8aa 100755 --- a/indra/cmake/FindAutobuild.cmake +++ b/indra/cmake/FindAutobuild.cmake @@ -13,6 +13,9 @@ IF (NOT AUTOBUILD_EXECUTABLE) # If cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var IF (DEFINED ENV{AUTOBUILD}) SET(AUTOBUILD_EXECUTABLE $ENV{AUTOBUILD}) + # In case $AUTOBUILD is a cygwin path, fix it back to Windows style + STRING(REGEX REPLACE "^/cygdrive/(.)/" "\\1:/" AUTOBUILD_EXECUTABLE + "${AUTOBUILD_EXECUTABLE}") ELSE (DEFINED ENV{AUTOBUILD}) IF(WIN32) SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe) -- cgit v1.2.3 From 77edde175240b91f9deb85cfc365c27d04dcc3ce Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 19 Dec 2014 16:42:26 -0500 Subject: Backed out changeset 4356b6a222c7: forcing DEBUG_PREBUILT output. It appears that our trouble was due to a cygwin-style path in the AUTOBUILD environment variable, and that changeset 0e0bd8b546ad fixed it. --- indra/cmake/Prebuilt.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index e54a12c240..98013da2f2 100755 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -16,13 +16,6 @@ if ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DI file(WRITE ${PREBUILD_TRACKING_DIR}/sentinel_installed "0") endif ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DIR}/sentinel_installed") -# to debug use_prebuilt_binary failures on TC host -IF (NOT DEFINED DEBUG_PREBUILT) - set(DEBUG_PREBUILT ON) - message(STATUS "AUTOBUILD = '$ENV{AUTOBUILD}'") -ENDIF (NOT DEFINED DEBUG_PREBUILT) -# - # The use_prebuilt_binary macro handles automated installation of package # dependencies using autobuild. The goal is that 'autobuild install' should # only be run when we know we need to install a new package. This should be -- cgit v1.2.3