mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 23:10:25 +08:00
1550b9e71b
* [many ports] Upgrades 2019.07.11 * Re-generate patches and fix build errors. * [manyport]Fix build errors. * Fix avro-c and console-bridge failures, revert curl and tesseract * fix botan failure * Fix build errors and undo some ports upgrades. * [aws-c-common,chipmunk,cxxopts,grpc]Fix build errors * Fix build errors. * [angle]Undo upgrade changes. * [directxtk]Fix UWP build error (#7233) * Revert leptonica since it cause tesseract failed * Revert jsonnet * [google-cloud-cpp] Disable parallel configure due to source directory writes * [many ports] Undo undesired changes * [bitsery] Fix indentation * [avro-c][aws-c-common][graphite2] Convert line endings to minimize PR diff * fix console-bridge and remove usockets unused patch * update ogre patch * [many ports] Revert unneeded changes w.r.t. master. Add missing write to console-bridge. * [console-bridge] Fix export macro * [avro-c] Revert upgrade; split to #7875 * [avro-c] Complete previous revert
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 496712d..3df05c7 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -82,10 +82,12 @@ if (BUILD_SHARED_LIBS)
|
|
endif()
|
|
|
|
add_subdirectory(src)
|
|
-add_subdirectory(tests)
|
|
-add_subdirectory(doc)
|
|
-if (NOT GRAPHITE2_NFILEFACE)
|
|
- add_subdirectory(gr2fonttest)
|
|
+if(NOT DISABLE_TESTS)
|
|
+ add_subdirectory(tests)
|
|
+ add_subdirectory(doc)
|
|
+ if (NOT GRAPHITE2_NFILEFACE)
|
|
+ add_subdirectory(gr2fonttest)
|
|
+ endif()
|
|
endif()
|
|
|
|
set(version 3.0.1)
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 389cf5a..94b7f99 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -127,7 +127,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
|
endif ()
|
|
endif()
|
|
include(Graphite)
|
|
- if (BUILD_SHARED_LIBS)
|
|
+ if (NOT DISABLE_TESTS)
|
|
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
|
|
endif ()
|
|
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
|
|
@@ -141,7 +141,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
|
LINKER_LANGUAGE C)
|
|
target_link_libraries(graphite2 c)
|
|
include(Graphite)
|
|
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
|
|
+ if (NOT DISABLE_TESTS)
|
|
+ nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
|
|
+ endif ()
|
|
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
|
|
CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
|
|
endif()
|