From 1a1465dab94a2829cedb4ee4cd0c0169cea0fdeb Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 16 Jan 2019 14:23:45 -0500 Subject: Re-enable warnings-as-errors (-Werror) in Mac builds. --- indra/cmake/00-Common.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 40fc706a99..03da30649a 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -151,6 +151,8 @@ endif (LINUX) if (DARWIN) + # Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default + set(CLANG_DISABLE_FATAL_WARNINGS OFF) set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") set(DARWIN_extra_cstar_flags "-Wno-unused-local-typedef -Wno-deprecated-declarations") -- cgit v1.3 From ba24af923c87a9ab4307ab6a66c587df380f5be9 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 4 Mar 2019 14:59:33 +0200 Subject: Fix for local studio builds --- indra/cmake/00-Common.cmake | 2 ++ indra/newview/CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 17 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 03da30649a..d7957d2b20 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -45,6 +45,8 @@ endif() # Don't bother with a MinSizeRel build. set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING "Supported build types." FORCE) + +set(UNATTENDED ON CACHE BOOL ”On Windows, turn this OFF to implicitly run VSTool.exe after configure.”) # Platform-specific compilation flags. diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b5fcb18cfc..37da7f2c2a 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1877,6 +1877,21 @@ if (WINDOWS) windows-crash-logger ) + # sets the 'working directory' for debugging from visual studio. + if ((NOT UNATTENDED) AND (NOT DEFINED ENV{TEAMCITY_PROJECT_NAME})) + add_custom_command( + TARGET ${VIEWER_BINARY_NAME} POST_BUILD + COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe + ARGS + --solution + ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln + --workingdir + ${VIEWER_BINARY_NAME} + "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging." + ) + endif ((NOT UNATTENDED) AND (NOT DEFINED ENV{TEAMCITY_PROJECT_NAME})) + if (PACKAGE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2 -- cgit v1.3 From 50f0843e7606c09a29738bfb56bf0bb52ed0cbe2 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 6 Mar 2019 16:31:11 +0200 Subject: Get rid of vstool --- indra/cmake/00-Common.cmake | 2 -- indra/newview/CMakeLists.txt | 20 +++++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index d7957d2b20..03da30649a 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -45,8 +45,6 @@ endif() # Don't bother with a MinSizeRel build. set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING "Supported build types." FORCE) - -set(UNATTENDED ON CACHE BOOL ”On Windows, turn this OFF to implicitly run VSTool.exe after configure.”) # Platform-specific compilation flags. diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 37da7f2c2a..a7e8db1b1c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1878,19 +1878,13 @@ if (WINDOWS) ) # sets the 'working directory' for debugging from visual studio. - if ((NOT UNATTENDED) AND (NOT DEFINED ENV{TEAMCITY_PROJECT_NAME})) - add_custom_command( - TARGET ${VIEWER_BINARY_NAME} POST_BUILD - COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe - ARGS - --solution - ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln - --workingdir - ${VIEWER_BINARY_NAME} - "${CMAKE_CURRENT_SOURCE_DIR}" - COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging." - ) - endif ((NOT UNATTENDED) AND (NOT DEFINED ENV{TEAMCITY_PROJECT_NAME})) + # Condition for version can be moved to requirements once build agents will be updated (see TOOL-3865) + if ((NOT UNATTENDED) AND (${CMAKE_VERSION} VERSION_GREATER "3.7.2")) + set_property( + TARGET ${VIEWER_BINARY_NAME} + PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) + endif ((NOT UNATTENDED) AND (${CMAKE_VERSION} VERSION_GREATER "3.7.2")) if (PACKAGE) add_custom_command( -- cgit v1.3 From 0574d03bfa60191fd06a11f157b86c1862ae6059 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Mon, 17 Jun 2019 19:46:20 +0300 Subject: OPEN-345 Fixed enigmatic messages during build --- doc/contributions.txt | 1 + indra/cmake/BuildPackagesInfo.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/doc/contributions.txt b/doc/contributions.txt index 29fc71510b..4d976ff31d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1447,6 +1447,7 @@ Tonya Souther STORM-1905 BUG-3875 BUG-3968 + OPEN-345 Torben Trautman TouchaHoney Perhaps TraductoresAnonimos Alter diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index 93461cea95..4314cca33d 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -8,7 +8,7 @@ include(Python) # building in an IDE, it probably isn't. Set it explicitly using # run_build_test.py. add_custom_command(OUTPUT packages-info.txt - COMMENT Generating packages-info.txt for the about box + COMMENT "Generating packages-info.txt for the about box" MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py ${CMAKE_SOURCE_DIR}/../autobuild.xml -- cgit v1.3