From 77aac5f99097abaace0535fd8bd56b7c99c85293 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 10 Jun 2012 23:10:25 +0200 Subject: [PATCH] Don't add any autobuild prepacked dirs to link search path when building standalone. --- indra/cmake/Linking.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index a904eca538..e68076aaeb 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -33,6 +33,8 @@ else(WINDOWS OR DARWIN) set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER}) endif(WINDOWS OR DARWIN) +if( NOT STANDALONE ) # Don't add any autobuild dirs when building standalone + # 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") @@ -46,9 +48,12 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "ReleaseFS" AND NOT "${CMAKE_BUILD_TYPE}" #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}) +endif( NOT STANDALONE ) # Don't add any autobuild dirs when building standalone + if (LINUX) set(DL_LIBRARY dl) set(PTHREAD_LIBRARY pthread)