summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-08-04 14:33:01 -0700
committerbrad kittenbrink <brad@lindenlab.com>2009-08-04 14:33:01 -0700
commitdc62495da6e5c153c0df57fdbce6b0f40c0208f2 (patch)
treed116cd59835b98bf75c23c4d55fa77be212587d9 /indra
parent945656147ccdca0557c5096c933817e5fd803344 (diff)
parent47e547fcba802af3145f06fa5b8aa9af2942d294 (diff)
Merged my big mondo merge and boost package changes with nat's DEV-34837 work.
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/Linking.cmake1
-rw-r--r--indra/llcommon/CMakeLists.txt22
2 files changed, 15 insertions, 8 deletions
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 30b3cc9994..1f3553539f 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -19,6 +19,7 @@ if (NOT STANDALONE)
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})
+ set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs")
endif (WINDOWS)
endif (NOT STANDALONE)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 3ac2f6f80d..410cd0f6b2 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -244,22 +244,28 @@ if(LLCOMMON_LINK_SHARED)
# llcommon.dll get written to the DLL staging directory.
# Also this directory is shared with RunBuildTest.cmake, y'know, for the tests.
set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR})
- endif(SHARED_LIB_STAGING_DIR)
-
- if(LINUX)
- get_target_property(LLCOMMON_PATH llcommon LOCATION)
- get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME)
- add_custom_command(
+ if(NOT WINDOWS)
+ get_target_property(LLCOMMON_PATH llcommon LOCATION)
+ get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME)
+ add_custom_command(
TARGET llcommon POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS
-E
copy_if_different
- ${LLCOMMON_FILE}
+ ${LLCOMMON_PATH}
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/${LLCOMMON_FILE}
COMMENT "Copying llcommon to the staging folder."
)
- endif(LINUX)
+ endif(NOT WINDOWS)
+ endif(SHARED_LIB_STAGING_DIR)
+
+ if (DARWIN)
+ set_target_properties(llcommon PROPERTIES
+ BUILD_WITH_INSTALL_RPATH 1
+ INSTALL_NAME_DIR "@executable_path/../Resources"
+ )
+ endif(DARWIN)
else(LLCOMMON_LINK_SHARED)
add_library (llcommon ${llcommon_SOURCE_FILES})