mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 05:41:37 +08:00
2b35366a5d
* refine hpx port * v db * add tcmalloc on unix * refine comment * v db * remove hardcoded mpi dep * v db * portfile cleanup * v db * add pkgconf as a dep * v db * [snappy] remove debug suffix and add pc file * hpx pass through _HOST_TRIPLET for pkgconf * v db * fix snappy in ffmpeg * v db * fix name clash of output names * v db * remove tcmalloc * v db * remove bin dir; seems empty on !windows * v db * b v * v db * baseline stuff * fix jemalloc missing msvc_compat headers * v db * install usage for hpx * v db * Update versions/f-/ffmpeg.json * revert v db * bump ffmpeg * v db * remove jemalloc since I can force it thorugh the triplet any way. * v db Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
diff --git a/cmake/HPX_GeneratePackageUtils.cmake b/cmake/HPX_GeneratePackageUtils.cmake
|
|
index 3ec8002..b098465 100644
|
|
--- a/cmake/HPX_AddModule.cmake
|
|
+++ b/cmake/HPX_AddModule.cmake
|
|
@@ -437,7 +437,7 @@ function(add_hpx_module libname modulename)
|
|
elseif(MSVC)
|
|
set(_module_target hpx_${modulename})
|
|
target_link_libraries(
|
|
- hpx_${libname} PRIVATE -WHOLEARCHIVE:$<TARGET_FILE:hpx_${modulename}>
|
|
+ hpx_${libname} PRIVATE -WHOLEARCHIVE:$<TARGET_FILE:$<TARGET_NAME:hpx_${modulename}>>
|
|
)
|
|
endif()
|
|
target_link_libraries(hpx_${libname} PRIVATE ${_module_target})
|
|
--- a/cmake/HPX_GeneratePackageUtils.cmake
|
|
+++ b/cmake/HPX_GeneratePackageUtils.cmake
|
|
@@ -101,7 +101,7 @@ function(
|
|
)
|
|
set(_libraries
|
|
${_libraries}
|
|
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:${target}>>$<BUILD_INTERFACE:$<TARGET_FILE:${target}>>
|
|
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:$<TARGET_NAME:${target}>>>$<BUILD_INTERFACE:$<TARGET_FILE:${target}>>
|
|
)
|
|
endif()
|
|
elseif("${dep_target}" MATCHES "^-l")
|