Attachment #197075 for bug #276907




  endif (VIEWER)

  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
  #set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
endif (LINUX)



if (STANDALONE)
  add_definitions(-DLL_STANDALONE=1)

  #if (LINUX AND ${ARCH} STREQUAL "i686")
  #  add_definitions(-march=pentiumpro)
  #endif (LINUX AND ${ARCH} STREQUAL "i686")

else (STANDALONE)
  set(${ARCH}_linux_INCLUDES

Lines 38-44 Link Here

(-)linden/indra/linux_crash_logger/CMakeLists.txt (-1 / +1 lines)
38	${linux_crash_logger_HEADER_FILES}	38	${linux_crash_logger_HEADER_FILES}
39	)	39	)
40		40
41	list(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)	41	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
42		42
43	add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})	43	add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
44		44

Lines 914-920 Link Here

(-)linden/indra/newview/CMakeLists.txt (-1 / +1 lines)
914	if (LINUX)	914	if (LINUX)
915	LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)	915	LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
916	LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)	916	LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)
917	LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)	917	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
918		918
919	set(viewer_LIBRARIES	919	set(viewer_LIBRARIES
920	Xinerama	920	Xinerama

Return to bug 276907

Lines 165-171 Link Here

(-)linden/indra/cmake/00-Common.cmake (-4 / +4 lines)
165	endif (VIEWER)	165	endif (VIEWER)
166		166
167	set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")	167	set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
168	set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")	168	#set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
169	endif (LINUX)	169	endif (LINUX)
170		170
171		171
Lines 207-215 Link Here
207	if (STANDALONE)	207	if (STANDALONE)
208	add_definitions(-DLL_STANDALONE=1)	208	add_definitions(-DLL_STANDALONE=1)
209		209
210	if (LINUX AND ${ARCH} STREQUAL "i686")	210	#if (LINUX AND ${ARCH} STREQUAL "i686")
211	add_definitions(-march=pentiumpro)	211	# add_definitions(-march=pentiumpro)
212	endif (LINUX AND ${ARCH} STREQUAL "i686")	212	#endif (LINUX AND ${ARCH} STREQUAL "i686")
213		213
214	else (STANDALONE)	214	else (STANDALONE)
215	set(${ARCH}_linux_INCLUDES	215	set(${ARCH}_linux_INCLUDES