diff options
| author | jenn <jenn@lindenlab.com> | 2011-01-19 10:03:51 -0800 |
|---|---|---|
| committer | jenn <jenn@lindenlab.com> | 2011-01-19 10:03:51 -0800 |
| commit | 0d6ec39f44f9f32060bb5d02ad9281922a610516 (patch) | |
| tree | 5309bd92a763d14e55ecdb969d1a1923766918bf /indra/cmake | |
| parent | c4713b4f9fb873c3cdc07b80d78f6354a92cd424 (diff) | |
Cmake updates to get llkdu building on linux. Need to rebuild kdu tarball next.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 8 | ||||
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/run_build_test.py | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9741d4f890..3d49f97a2a 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -155,9 +155,9 @@ elseif(DARWIN) elseif(LINUX) # linux is weird, multiple side by side configurations aren't supported # and we don't seem to have any debug shared libs built yet anyways... - set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/debug") + set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}") set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}") - set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/release") + set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}") set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files @@ -170,12 +170,12 @@ elseif(LINUX) ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables # or ARCH_PREBUILT_DIRS - set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_debug") + set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") set(debug_files ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables # or ARCH_PREBUILT_DIRS - set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_release_client") + set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") # *FIX - figure out what to do with duplicate libalut.so here -brad set(release_files libapr-1.so.0 diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 3a6e746605..bbbb2df366 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -14,7 +14,7 @@ if (USE_KDU) else (WINDOWS) set(KDU_LIBRARY libkdu.a) endif (WINDOWS) - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu) + set(KDU_INCLUDE_DIR ${ARCH_PREBUILT_DIRS_RELEASE}/include/kdu) set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) set(LLKDU_LIBRARIES llkdu) endif (USE_KDU) diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index 37aa75e364..37aa75e364 100644..100755 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py |