-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [nsync] update to 1.28.1 * https://github.com/google/nsync/releases/tag/1.28.1 * [nsync] update baseline * [onnxruntime] try fix with `find_package(nsync_cpp)` * [onnxruntime] correcting nsync_cpp search
- Loading branch information
Showing
9 changed files
with
40 additions
and
59 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
19 changes: 9 additions & 10 deletions
19
ports/nsync/fix-install.patch → ports/nsync/fix-cmake.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,31 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 6b1f1dc..328f9b6 100644 | ||
index fcc3f41..610710f 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -80,7 +80,7 @@ set (NSYNC_OS_CPP_SRC | ||
# https://cmake.org/cmake/help/v3.1/policy/CMP0054.html | ||
@@ -88,7 +88,7 @@ if ("${CMAKE_C_COMPILER_ID}X" STREQUAL "MSVCX") | ||
endif () | ||
|
||
# Pick the include directory for the operating system. | ||
-if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") | ||
+if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX") | ||
+if (("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") OR ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX")) | ||
include_directories ("${PROJECT_SOURCE_DIR}/platform/win32") | ||
set (NSYNC_CPP_FLAGS "/TP") | ||
|
||
@@ -230,7 +230,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X")) | ||
@@ -232,7 +232,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X")) | ||
endif () | ||
|
||
# Windows uses some include files from the posix directory also. | ||
-if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") | ||
+if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX") | ||
+if (("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") OR ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX")) | ||
include_directories ("${PROJECT_SOURCE_DIR}/platform/posix") | ||
endif () | ||
|
||
@@ -396,7 +396,8 @@ if (NSYNC_ENABLE_TESTS) | ||
@@ -398,7 +398,7 @@ if (NSYNC_ENABLE_TESTS) | ||
endforeach (t) | ||
endif () | ||
|
||
-set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) | ||
+# By default, install nsync always | ||
+# set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) | ||
+set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY FALSE) | ||
|
||
install (TARGETS nsync | ||
install (TARGETS nsync EXPORT nsync | ||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters