livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-17657: Merge branch 'more-c++17' into DRTVWR-568. 

Converting on DRTVWR-568 as the project branch going forward.
master
Nat Goodspeed 2022-09-01 14:07:52 -04:00
parent 215bc3883b 675cfedb8a
commit 5883ff178b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -156,6 +156,7 @@ elseif(DARWIN)
# Support our "@executable_path/../Resources" load path for executables
# that end up in any of the above SHARED_LIB_STAGING_DIR_MUMBLE
# directories.
file(MAKE_DIRECTORY "${SHARED_LIB_STAGING_DIR}")
file(CREATE_LINK "Release/Resources" "${SHARED_LIB_STAGING_DIR}/Resources"
SYMBOLIC)

2
indra/test/CMakeLists.txt
View File

@ -121,6 +121,8 @@ elseif (DARWIN)
# executable. This SHOULD properly be "$<TARGET_FILE_DIR:lltest>/Resources",
# but the CMake $<TARGET_FILE_DIR> generator expression isn't evaluated by
# CREATE_LINK, so fudge it.
# Make sure the symlink's parent directory exists...
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/test")
file(CREATE_LINK "../sharedlibs/Release/Resources" "${CMAKE_BINARY_DIR}/test/Resources"
SYMBOLIC)
endif (WINDOWS)