diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-09-01 14:07:52 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-09-01 14:07:52 -0400 |
| commit | 5883ff178bb608b10eafe9bfa0aeb961d8afcecd (patch) | |
| tree | dbe9432d8d2b8e525f3bf9032406be939452391a /indra | |
| parent | 215bc3883b7988680b83e6e1ef148b775ad329d3 (diff) | |
| parent | 675cfedb8af74c14ce30759f1d6193f954b88f7b (diff) | |
SL-17657: Merge branch 'more-c++17' into DRTVWR-568.
Converting on DRTVWR-568 as the project branch going forward.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 1 | ||||
| -rw-r--r-- | indra/test/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index fbec709f0c..d75ff0c810 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -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) diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index 161e957784..9e65ceb926 100644 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -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) |