diff options
| author | Navid Rahimi <rahimi.nv@gmail.com> | 2018-07-11 11:47:13 +0430 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-11 00:17:13 -0700 |
| commit | 804c421d642ea679898d18de0c24b1d51c412f70 (patch) | |
| tree | a6b47d6e47e61568beb8e20495ef2a99f8505d5d | |
| parent | 91db517ba9df05ac8ac0989529eea0d9576164ec (diff) | |
| download | vcpkg-804c421d642ea679898d18de0c24b1d51c412f70.tar.gz vcpkg-804c421d642ea679898d18de0c24b1d51c412f70.zip | |
Fixing ogdf and liblemon compile issues on ubuntu (#3847)
* Fixing ogdf and liblemon compile issues on ubuntu
* [ogdf] Avoid patch by passing cmake options
| -rw-r--r-- | ports/liblemon/CONTROL | 2 | ||||
| -rw-r--r-- | ports/liblemon/fixup-targets.patch | 2 | ||||
| -rw-r--r-- | ports/ogdf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ogdf/portfile.cmake | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/liblemon/CONTROL b/ports/liblemon/CONTROL index 7e7a07402..704f02d9a 100644 --- a/ports/liblemon/CONTROL +++ b/ports/liblemon/CONTROL @@ -1,3 +1,3 @@ Source: liblemon -Version: 1.3.1-1 +Version: 1.3.1-2 Description: Library for Efficient Modeling and Optimization in Networks diff --git a/ports/liblemon/fixup-targets.patch b/ports/liblemon/fixup-targets.patch index 8a77f65d7..883e2a6ee 100644 --- a/ports/liblemon/fixup-targets.patch +++ b/ports/liblemon/fixup-targets.patch @@ -47,4 +47,4 @@ index b0d2d8b..ce54986 100644 MARK_AS_ADVANCED(LEMON_LIBRARY LEMON_INCLUDE_DIR)
+
-+include(./lemon-targets.cmake)
++include(${CMAKE_CURRENT_LIST_DIR}/lemon-targets.cmake)
diff --git a/ports/ogdf/CONTROL b/ports/ogdf/CONTROL index f02ae6450..fe2cf909c 100644 --- a/ports/ogdf/CONTROL +++ b/ports/ogdf/CONTROL @@ -1,3 +1,3 @@ Source: ogdf -Version: 2018-03-28-1 +Version: 2018-03-28-2 Description: Open Graph Drawing Framework diff --git a/ports/ogdf/portfile.cmake b/ports/ogdf/portfile.cmake index 97165e56c..5ad5e72ca 100644 --- a/ports/ogdf/portfile.cmake +++ b/ports/ogdf/portfile.cmake @@ -10,6 +10,11 @@ vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/2018-03-28 vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DCOIN_INSTALL_LIBRARY_DIR:STRING=lib + -DCOIN_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF + -DOGDF_INSTALL_LIBRARY_DIR:STRING=lib + -DOGDF_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF ) vcpkg_install_cmake() |