mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 10:39:01 +08:00
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index b4a34f3d..4bd80d84 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -1343,10 +1343,10 @@ endif()
|
||
|
|
set(EVENT_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
|
||
|
|
|
||
|
|
# Make sure the paths are absolute.
|
||
|
|
-foreach(p LIB BIN INCLUDE CMAKE)
|
||
|
|
+foreach(p INCLUDE CMAKE)
|
||
|
|
set(var EVENT_INSTALL_${p}_DIR)
|
||
|
|
if(NOT IS_ABSOLUTE "${${var}}")
|
||
|
|
- set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
|
||
|
|
+ set(${var}_FULL "${CMAKE_INSTALL_PREFIX}/${${var}}")
|
||
|
|
endif()
|
||
|
|
endforeach()
|
||
|
|
|
||
|
|
@@ -1371,15 +1371,15 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfigBuildTree.cmake.in
|
||
|
|
# Generate the config file for the installation tree.
|
||
|
|
file(RELATIVE_PATH
|
||
|
|
REL_INCLUDE_DIR
|
||
|
|
- "${EVENT_INSTALL_CMAKE_DIR}"
|
||
|
|
- "${EVENT_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the Cmake dir.
|
||
|
|
+ "${EVENT_INSTALL_CMAKE_DIR_FULL}"
|
||
|
|
+ "${EVENT_INSTALL_INCLUDE_DIR_FULL}") # Calculate the relative directory from the Cmake dir.
|
||
|
|
|
||
|
|
# Note the EVENT_CMAKE_DIR is defined in LibeventConfig.cmake.in,
|
||
|
|
# we escape it here so it's evaluated when it is included instead
|
||
|
|
# so that the include dirs are givenrelative to where the
|
||
|
|
# config file is located.
|
||
|
|
set(EVENT__INCLUDE_DIRS
|
||
|
|
- "\${EVENT_CMAKE_DIR}/${REL_INCLUDE_DIR}")
|
||
|
|
+ "\${EVENT_CMAKE_DIR_FULL}/${REL_INCLUDE_DIR}")
|
||
|
|
|
||
|
|
configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfig.cmake.in
|
||
|
|
${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LibeventConfig.cmake
|