From c4788eebeaa799e63b0846fefbf8779a3ffe5d28 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 29 May 2012 21:46:28 +0200 Subject: [PATCH] Fixed Linking.cmake file after merge with LL V3.3.2 and use Firestorm build targets instead V3's --- indra/cmake/Linking.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 47f944f9a5..a904eca538 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -33,13 +33,19 @@ else(WINDOWS OR DARWIN) set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER}) endif(WINDOWS OR DARWIN) -if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") +# Changed for Firestorm +#if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") +if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS_open") +# Changed for Firestorm # When we're building something other than Release, append the # packages/lib/release directory to deal with autobuild packages that don't # provide (e.g.) lib/debug libraries. list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}, extending AUTOBUILD_LIBS_INSTALL_DIRS") -endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") +# Changed for Firestorm +#endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") +endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS_open") +# Changed for Firestorm message(STATUS "For ${CMAKE_BUILD_TYPE}, AUTOBUILD_LIBS_INSTALL_DIRS: ${AUTOBUILD_LIBS_INSTALL_DIRS}") link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})