Skip to content

Commit 00bd94a

Browse files
committed
Allow Pc File Install With Window MSI Installer
Tested with: ```console cmake -S . -B build -D BUILD_INSTALLER=1 cmake --build build --config Release --target package ``` Install generated msi and setup environment. ```batch C:\Users\a_user>pkg-config --list-all libze_loader Level Zero Loader - Runtime Library Loader for Level Zero level-zero Level Zero - Level Zero ``` Signed-off-by: Schilling, Matthew <matthew.schilling@intel.com>
1 parent c757c82 commit 00bd94a

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

source/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ if(CANONICAL_LIB_COMPONENT)
8787
)
8888
endif()
8989

90-
if(NOT BUILD_INSTALLER)
9190
file(RELATIVE_PATH pkgconfig_prefix "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
9291
file(RELATIVE_PATH pkgconfig_include_dir "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
9392
file(RELATIVE_PATH pkgconfig_lib_dir "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_FULL_LIBDIR}")
@@ -97,13 +96,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/level-zero.pc.in ${CMAKE_CURRENT_BINA
9796

9897
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libze_loader.pc"
9998
"${CMAKE_CURRENT_BINARY_DIR}/level-zero.pc"
100-
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" COMPONENT ${SDK_COMPONENT_STRING})
99+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT ${SDK_COMPONENT_STRING})
101100

102101
if(CANONICAL_SDK_COMPONENT)
103102
# EXCLUDE_FROM_ALL: CPack-only; avoids duplicate install_manifest.txt entries.
104103
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libze_loader.pc"
105104
"${CMAKE_CURRENT_BINARY_DIR}/level-zero.pc"
106-
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" COMPONENT ${CANONICAL_SDK_COMPONENT}
105+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT ${CANONICAL_SDK_COMPONENT}
107106
EXCLUDE_FROM_ALL)
108107
endif()
109-
endif()

0 commit comments

Comments
 (0)