File tree 5 files changed +7
-7
lines changed
5 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ add_llvm_tool(${OPENCL_AOT_PROJECT_NAME} ${TARGET_SOURCES})
14
14
15
15
if (WIN32 )
16
16
# 0x2000: exclude CWD from DLL loading path
17
- target_link_options (${OPENCL_AOT_PROJECT_NAME} PRIVATE "/DEPENDENTLOADFLAG:0x2000" )
17
+ target_link_options (${OPENCL_AOT_PROJECT_NAME} PRIVATE "LINKER: /DEPENDENTLOADFLAG:0x2000" )
18
18
endif ()
19
19
20
20
if (NOT MSVC )
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ include(CheckLinkerFlag)
7
7
# file as ${ARG_TARGET_NAME}.pdb in bin folder.
8
8
# NOTE: LLD does not currently support /PDBSTRIPPED so the PDB file is optional.
9
9
macro (add_stripped_pdb ARG_TARGET_NAME)
10
- check_linker_flag(CXX "/PDBSTRIPPED:${ARG_TARGET_NAME} .stripped.pdb"
10
+ check_linker_flag(CXX "LINKER: /PDBSTRIPPED:${ARG_TARGET_NAME} .stripped.pdb"
11
11
LINKER_SUPPORTS_PDBSTRIPPED)
12
12
if (LINKER_SUPPORTS_PDBSTRIPPED)
13
13
target_link_options (${ARG_TARGET_NAME}
14
- PRIVATE "/PDBSTRIPPED:${ARG_TARGET_NAME} .stripped.pdb" )
14
+ PRIVATE "LINKER: /PDBSTRIPPED:${ARG_TARGET_NAME} .stripped.pdb" )
15
15
install (FILES "${CMAKE_CURRENT_BINARY_DIR} /${ARG_TARGET_NAME} .stripped.pdb"
16
16
DESTINATION ${CMAKE_INSTALL_PREFIX} /bin
17
17
RENAME "${ARG_TARGET_NAME} .pdb"
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
91
91
# Embed manifest into the sycl.dll where ur_win_proxy_loader.dll is described as sycl.dll's private dll and will always be loaded from the same directory.
92
92
# 0x2000: LOAD_LIBRARY_SAFE_CURRENT_DIRS flag. Using this flag means that loading dependency DLLs (of sycl.dll)
93
93
# from the current directory is only allowed if it is under a directory in the Safe load list.
94
- target_link_options (${LIB_NAME} PRIVATE /DEPENDENTLOADFLAG:0x2000 /MANIFEST:NO /MANIFEST:EMBED /MANIFESTINPUT:${CMAKE_CURRENT_SOURCE_DIR} /${MANIFEST_FILE_NAME} )
94
+ target_link_options (${LIB_NAME} PRIVATE "LINKER: /DEPENDENTLOADFLAG:0x2000" "LINKER: /MANIFEST:NO" "LINKER: /MANIFEST:EMBED" "LINKER: /MANIFESTINPUT:${CMAKE_CURRENT_SOURCE_DIR} /${MANIFEST_FILE_NAME} " )
95
95
endif ()
96
96
97
97
target_compile_definitions (${LIB_OBJ_NAME} PRIVATE __SYCL_INTERNAL_API )
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ target_link_libraries(sycl-ls
19
19
)
20
20
if (WIN32 )
21
21
# 0x900: Search for the dependency DLLs only in the System32 directory and in the directory with sycl-ls.exe
22
- target_link_options (sycl-ls PRIVATE /DEPENDENTLOADFLAG:0x900)
22
+ target_link_options (sycl-ls PRIVATE LINKER: /DEPENDENTLOADFLAG:0x900)
23
23
endif ()
24
24
install (TARGETS sycl-ls
25
25
RUNTIME DESTINATION "bin" COMPONENT sycl-ls)
Original file line number Diff line number Diff line change @@ -60,8 +60,8 @@ if (MSVC)
60
60
target_link_libraries (ur_win_proxy_loader PRIVATE shlwapi)
61
61
# 0x2000: LOAD_LIBRARY_SAFE_CURRENT_DIRS flag. Using this flag means that loading dependency DLLs
62
62
# from the current directory is only allowed if it is under a directory in the Safe load list.
63
- target_link_options (ur_win_proxy_loaderd PRIVATE /DEPENDENTLOADFLAG:0x2000)
64
- target_link_options (ur_win_proxy_loader PRIVATE /DEPENDENTLOADFLAG:0x2000)
63
+ target_link_options (ur_win_proxy_loaderd PRIVATE LINKER: /DEPENDENTLOADFLAG:0x2000)
64
+ target_link_options (ur_win_proxy_loader PRIVATE LINKER: /DEPENDENTLOADFLAG:0x2000)
65
65
install (TARGETS ur_win_proxy_loaderd
66
66
RUNTIME DESTINATION "bin" COMPONENT ur_win_proxy_loader)
67
67
endif ()
You can’t perform that action at this time.
0 commit comments