Skip to content
Snippets Groups Projects
Commit b6e90099 authored by Oz Linden's avatar Oz Linden
Browse files

pull in linux build fixes for STORM-1121

parents 67acdb72 61056a68
No related branches found
No related tags found
No related merge requests found
# -*- cmake -*- # -*- cmake -*-
add_subdirectory(llui_libtest) add_subdirectory(llui_libtest)
if (LLIMAGE_LIBTEST) IF (LLIMAGE_LIBTEST)
MESSAGE(STATUS "Build llimage_libtest")
add_subdirectory(llimage_libtest) add_subdirectory(llimage_libtest)
endif (LLIMAGE_LIBTEST) ELSE (LLIMAGE_LIBTEST)
MESSAGE(STATUS "Skip llimage_libtest")
ENDIF (LLIMAGE_LIBTEST)
...@@ -6,19 +6,15 @@ project (llimage_libtest) ...@@ -6,19 +6,15 @@ project (llimage_libtest)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(Linking)
include(LLSharedLibs)
include(LLImage) include(LLImage)
include(LLImageJ2COJ) include(LLImageJ2COJ)
include(LLKDU) include(LLKDU)
include(LLMath)
include(LLVFS) include(LLVFS)
include_directories( include_directories(
${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS}
${LLIMAGE_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
) )
set(llimage_libtest_SOURCE_FILES set(llimage_libtest_SOURCE_FILES
...@@ -102,20 +98,20 @@ add_custom_command(TARGET llimage_libtest POST_BUILD ...@@ -102,20 +98,20 @@ add_custom_command(TARGET llimage_libtest POST_BUILD
if (DARWIN) if (DARWIN)
# Copy the required libraries to the package app # Copy the required libraries to the package app
add_custom_command(TARGET llimage_libtest POST_BUILD add_custom_command(TARGET llimage_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libapr-1.0.3.7.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libapr-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libapr-1.0.3.7.dylib DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libapr-1.0.dylib
) )
add_custom_command(TARGET llimage_libtest POST_BUILD add_custom_command(TARGET llimage_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libaprutil-1.0.3.8.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libaprutil-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libaprutil-1.0.3.8.dylib DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libaprutil-1.0.dylib
) )
add_custom_command(TARGET llimage_libtest POST_BUILD add_custom_command(TARGET llimage_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libexception_handler.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexception_handler.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libexception_handler.dylib DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexception_handler.dylib
) )
add_custom_command(TARGET llimage_libtest POST_BUILD add_custom_command(TARGET llimage_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libexpat.0.5.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexpat.1.5.2.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libexpat.0.5.0.dylib DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexpat.1.5.2.dylib
) )
endif (DARWIN) endif (DARWIN)
...@@ -127,5 +123,3 @@ endif (WINDOWS) ...@@ -127,5 +123,3 @@ endif (WINDOWS)
# *NOTE: This could be removed, or only built by TeamCity, if the build # *NOTE: This could be removed, or only built by TeamCity, if the build
# and link times become too long. # and link times become too long.
add_dependencies(viewer llimage_libtest) add_dependencies(viewer llimage_libtest)
ll_deploy_sharedlibs_command(llimage_libtest)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment