mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 10:39:01 +08:00
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index e79923b..3448362 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -437,13 +437,13 @@ set_property (GLOBAL PROPERTY USE_FOLDERS ON)
|
||
|
|
# The list of subdirectories to process
|
||
|
|
add_subdirectory (src)
|
||
|
|
add_subdirectory (include/GeographicLib)
|
||
|
|
-add_subdirectory (tools)
|
||
|
|
-add_subdirectory (man)
|
||
|
|
-add_subdirectory (doc)
|
||
|
|
-add_subdirectory (js)
|
||
|
|
-add_subdirectory (matlab)
|
||
|
|
-add_subdirectory (python/geographiclib)
|
||
|
|
-add_subdirectory (examples)
|
||
|
|
+# add_subdirectory (tools)
|
||
|
|
+# add_subdirectory (man)
|
||
|
|
+# add_subdirectory (doc)
|
||
|
|
+# add_subdirectory (js)
|
||
|
|
+# add_subdirectory (matlab)
|
||
|
|
+# add_subdirectory (python/geographiclib)
|
||
|
|
+# add_subdirectory (examples)
|
||
|
|
if (MSVC AND BUILD_NETGEOGRAPHICLIB)
|
||
|
|
if (GEOGRAPHICLIB_PRECISION EQUAL 2)
|
||
|
|
set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib)
|
||
|
|
diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in
|
||
|
|
index 3b3b9e8..a5ea344 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
|
||
|
|
# since a multi-architecture library is built for that platform).
|
||
|
|
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@")
|
||
|
|
# Reject if there's a mismatch in MSVC compiler versions
|
||
|
|
- set (REASON "_MSC_VER = @MSVC_VERSION@")
|
||
|
|
- set (PACKAGE_VERSION_UNSUITABLE TRUE)
|
||
|
|
+# set (REASON "_MSC_VER = @MSVC_VERSION@")
|
||
|
|
+# set (PACKAGE_VERSION_UNSUITABLE TRUE)
|
||
|
|
elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@")
|
||
|
|
# Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}
|
||
|
|
set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@")
|