diff options
| author | Han Hu <huhan8807@gmail.com> | 2017-04-18 19:07:44 +0800 |
|---|---|---|
| committer | Han Hu <huhan8807@gmail.com> | 2017-04-18 19:07:44 +0800 |
| commit | 9f9c3ac4429d3b6a9dc0355431073e074bcd0a74 (patch) | |
| tree | 04a6eab7e5040461b36fd93d19902d41ebc300bf | |
| parent | 80825d491fc818a903ee53e331d53a6c6247e9a9 (diff) | |
| download | vcpkg-9f9c3ac4429d3b6a9dc0355431073e074bcd0a74.tar.gz vcpkg-9f9c3ac4429d3b6a9dc0355431073e074bcd0a74.zip | |
fix patch file due to missing some not commited changes.
| -rw-r--r-- | ports/geographiclib/remove-tools-and-fix-version.patch | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/ports/geographiclib/remove-tools-and-fix-version.patch b/ports/geographiclib/remove-tools-and-fix-version.patch index d7c7598e0..d4f94e02c 100644 --- a/ports/geographiclib/remove-tools-and-fix-version.patch +++ b/ports/geographiclib/remove-tools-and-fix-version.patch @@ -23,8 +23,25 @@ index e79923b..3448362 100644 if (MSVC AND BUILD_NETGEOGRAPHICLIB) if (GEOGRAPHICLIB_PRECISION EQUAL 2) set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 0c8ad64..7dc4096 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -14,10 +14,10 @@ configure_file (project-config.cmake.in + configure_file (project-config-version.cmake.in + "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY) + export (TARGETS +- ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} ${TOOLS} ++ ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} + FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake") + export (TARGETS +- ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} ${TOOLS} ++ ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} + NAMESPACE ${PROJECT_NAME}:: + FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake") + diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in -index 3b3b9e8..a5ea344 100644 +index 3b3b9e8..bc2ce19 100644 --- a/cmake/project-config-version.cmake.in +++ b/cmake/project-config-version.cmake.in @@ -18,10 +18,10 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR @@ -32,7 +49,7 @@ index 3b3b9e8..a5ea344 100644 set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@") set (PACKAGE_VERSION_UNSUITABLE TRUE) -elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") -+# elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") ++#elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") # Reject if there's a mismatch in MSVC compiler versions - set (REASON "_MSC_VER = @MSVC_VERSION@") - set (PACKAGE_VERSION_UNSUITABLE TRUE) |