summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorKartic Krishnamurthy <drunkensufi@lindenlab.com>2008-11-07 00:07:44 +0000
committerKartic Krishnamurthy <drunkensufi@lindenlab.com>2008-11-07 00:07:44 +0000
commitb2bfb128e7d30e1cdb293a2ac192a0cbe63fe528 (patch)
tree29fbacff21395f53f5b029796f90a34638118fe9 /indra/cmake
parent24ff4831f2a24045b3d06e81581dbe6d20475722 (diff)
Merged into release with command:
================================= svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge . QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally QA tested: Beast, Oskar DEV's fulfilled as part of this branch: ====================================== DEV-20842 Prevent accidental activation of DPO procs DEV-23028 Mac build fails - link error dual inclusion DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems DEV-22997 Xcode project: 'server' target has no dependencies DEV-23353 Friend request custom messages come through as an asset tag. DEV-23309 Voice Chat Indicator does not show active voice status DEV-23187 Can't teleport to home location
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/APR.cmake18
-rw-r--r--indra/cmake/CMakeLists.txt1
-rw-r--r--indra/cmake/Linking.cmake8
3 files changed, 10 insertions, 17 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index fe3ca941ee..523d8ee27e 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -15,23 +15,17 @@ if (STANDALONE)
else (STANDALONE)
use_prebuilt_binary(apr_suite)
if (WINDOWS)
- set(WINLIBS_PREBUILT_DEBUG_DIR
- ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug
- )
- set(WINLIBS_PREBUILT_RELEASE_DIR
- ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
- )
set(APR_LIBRARIES
- debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1.lib
- optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1.lib
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
)
set(APRUTIL_LIBRARIES
- debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1.lib
- optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1.lib
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
)
set(APRICONV_LIBRARIES
- debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1.lib
- optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1.lib
+ debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
)
elseif (DARWIN)
set(APR_LIBRARIES
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 1b9bcffd16..a2658d3f3a 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -48,7 +48,6 @@ set(cmake_SOURCE_FILES
LLMath.cmake
LLMedia.cmake
LLMessage.cmake
- LLPhysics.cmake
LLPrimitive.cmake
LLRender.cmake
LLScene.cmake
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index c9748e3b28..167c5dd31c 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -7,15 +7,15 @@ if (NOT STANDALONE)
set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
elseif (LINUX)
if (VIEWER)
- set(ARCH_PREBUILT_DIRS
- ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
- set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
- set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
+ set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
else (VIEWER)
set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
endif (VIEWER)
+ set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
+ set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
elseif (DARWIN)
set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
+ set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
endif (WINDOWS)
endif (NOT STANDALONE)