Skip to content
Snippets Groups Projects
Commit 278b6b68 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix macos test build

parent cc5ee819
No related branches found
No related tags found
No related merge requests found
...@@ -142,6 +142,9 @@ elseif(DARWIN) ...@@ -142,6 +142,9 @@ elseif(DARWIN)
libnghttp2.dylib libnghttp2.dylib
libnghttp2.14.dylib libnghttp2.14.dylib
libnghttp2.14.19.0.dylib libnghttp2.14.19.0.dylib
liburiparser.dylib
liburiparser.1.dylib
liburiparser.1.0.27.dylib
) )
if (USE_FMODSTUDIO) if (USE_FMODSTUDIO)
......
...@@ -102,6 +102,13 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources) ...@@ -102,6 +102,13 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
# Setup target # Setup target
ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES}) ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}") SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
if (DARWIN)
SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name}
PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_RPATH "@executable_path/Resources"
)
endif(DARWIN)
# #
# Per-codefile additional / external project dep and lib dep property extraction # Per-codefile additional / external project dep and lib dep property extraction
...@@ -230,6 +237,14 @@ FUNCTION(LL_ADD_INTEGRATION_TEST ...@@ -230,6 +237,14 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
) )
endif (WINDOWS) endif (WINDOWS)
if (DARWIN)
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_RPATH "@executable_path/Resources"
)
endif(DARWIN)
# Add link deps to the executable # Add link deps to the executable
if(TEST_DEBUG) if(TEST_DEBUG)
message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})") message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})")
......
...@@ -75,7 +75,7 @@ macro(ll_stage_sharedlib DSO_TARGET) ...@@ -75,7 +75,7 @@ macro(ll_stage_sharedlib DSO_TARGET)
if (DARWIN) if (DARWIN)
set_target_properties(${DSO_TARGET} PROPERTIES set_target_properties(${DSO_TARGET} PROPERTIES
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_NAME_DIR 1
INSTALL_NAME_DIR "@executable_path/../Frameworks" INSTALL_NAME_DIR "@executable_path/../Frameworks"
) )
endif(DARWIN) endif(DARWIN)
......
...@@ -96,7 +96,7 @@ if (DARWIN) ...@@ -96,7 +96,7 @@ if (DARWIN)
media_plugin_cef media_plugin_cef
PROPERTIES PROPERTIES
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_NAME_DIR 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp" LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
) )
......
...@@ -65,7 +65,7 @@ if (DARWIN) ...@@ -65,7 +65,7 @@ if (DARWIN)
media_plugin_example media_plugin_example
PROPERTIES PROPERTIES
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_NAME_DIR 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp" LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
) )
......
...@@ -66,7 +66,7 @@ if (DARWIN) ...@@ -66,7 +66,7 @@ if (DARWIN)
media_plugin_libvlc media_plugin_libvlc
PROPERTIES PROPERTIES
PREFIX "" PREFIX ""
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_NAME_DIR 1
INSTALL_NAME_DIR "@executable_path" INSTALL_NAME_DIR "@executable_path"
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp" LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment