Skip to content
Snippets Groups Projects
Commit 5883ff17 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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

Converting on DRTVWR-568 as the project branch going forward.
parents 215bc388 675cfedb
No related branches found
No related tags found
No related merge requests found
...@@ -156,6 +156,7 @@ elseif(DARWIN) ...@@ -156,6 +156,7 @@ elseif(DARWIN)
# Support our "@executable_path/../Resources" load path for executables # Support our "@executable_path/../Resources" load path for executables
# that end up in any of the above SHARED_LIB_STAGING_DIR_MUMBLE # that end up in any of the above SHARED_LIB_STAGING_DIR_MUMBLE
# directories. # directories.
file(MAKE_DIRECTORY "${SHARED_LIB_STAGING_DIR}")
file(CREATE_LINK "Release/Resources" "${SHARED_LIB_STAGING_DIR}/Resources" file(CREATE_LINK "Release/Resources" "${SHARED_LIB_STAGING_DIR}/Resources"
SYMBOLIC) SYMBOLIC)
......
...@@ -121,6 +121,8 @@ elseif (DARWIN) ...@@ -121,6 +121,8 @@ elseif (DARWIN)
# executable. This SHOULD properly be "$<TARGET_FILE_DIR:lltest>/Resources", # executable. This SHOULD properly be "$<TARGET_FILE_DIR:lltest>/Resources",
# but the CMake $<TARGET_FILE_DIR> generator expression isn't evaluated by # but the CMake $<TARGET_FILE_DIR> generator expression isn't evaluated by
# CREATE_LINK, so fudge it. # 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" file(CREATE_LINK "../sharedlibs/Release/Resources" "${CMAKE_BINARY_DIR}/test/Resources"
SYMBOLIC) SYMBOLIC)
endif (WINDOWS) endif (WINDOWS)
......
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