mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 10:28:59 +08:00
804c421d64
* Fixing ogdf and liblemon compile issues on ubuntu * [ogdf] Avoid patch by passing cmake options
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9a7c918..3d6cf35 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -268,7 +268,7 @@ CONFIGURE_FILE(
|
|
${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
|
|
@ONLY
|
|
)
|
|
-IF(UNIX)
|
|
+IF(UNIX OR TRUE)
|
|
INSTALL(
|
|
FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
|
|
DESTINATION share/lemon/cmake
|
|
@@ -282,9 +282,9 @@ ENDIF()
|
|
|
|
install(
|
|
EXPORT lemon-targets
|
|
- FILE lemon-config.cmake
|
|
- NAMESPACE lemon::
|
|
- DESTINATION share/lemon
|
|
+ FILE lemon-targets.cmake
|
|
+ NAMESPACE unofficial::lemon::
|
|
+ DESTINATION share/lemon/cmake
|
|
)
|
|
|
|
CONFIGURE_FILE(
|
|
diff --git a/cmake/LEMONConfig.cmake.in b/cmake/LEMONConfig.cmake.in
|
|
index b0d2d8b..ce54986 100644
|
|
--- a/cmake/LEMONConfig.cmake.in
|
|
+++ b/cmake/LEMONConfig.cmake.in
|
|
@@ -1,4 +1,4 @@
|
|
-SET(LEMON_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" CACHE PATH "LEMON include directory")
|
|
+SET(LEMON_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../include" CACHE PATH "LEMON include directory")
|
|
SET(LEMON_INCLUDE_DIRS "${LEMON_INCLUDE_DIR}")
|
|
|
|
IF(UNIX)
|
|
@@ -7,7 +7,12 @@ ELSEIF(WIN32)
|
|
SET(LEMON_LIB_NAME "lemon.lib")
|
|
ENDIF(UNIX)
|
|
|
|
-SET(LEMON_LIBRARY "@CMAKE_INSTALL_PREFIX@/lib/${LEMON_LIB_NAME}" CACHE FILEPATH "LEMON library")
|
|
+SET(LEMON_LIBRARY
|
|
+ optimized "${CMAKE_CURRENT_LIST_DIR}/../../lib/${LEMON_LIB_NAME}"
|
|
+ debug "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/${LEMON_LIB_NAME}"
|
|
+ CACHE FILEPATH "LEMON library")
|
|
SET(LEMON_LIBRARIES "${LEMON_LIBRARY}")
|
|
|
|
MARK_AS_ADVANCED(LEMON_LIBRARY LEMON_INCLUDE_DIR)
|
|
+
|
|
+include(${CMAKE_CURRENT_LIST_DIR}/lemon-targets.cmake)
|