Merge pull request #122 from xusheng6:fix_binja_build

PiperOrigin-RevId: 601714136 Change-Id: I2f257bb90de44e215877333be1b61f1b7cfdb08a
google · Jan 26, 2024 · 3dcf548 · 3dcf548
2 parents 85c89a4 + f24acfa
commit 3dcf548
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/binaryninja/stubs/binaryninjacore.cc b/binaryninja/stubs/binaryninjacore.cc
@@ -21,7 +21,7 @@
 // clang-format off
 #include "exceptions.h"  // NOLINT
 #define BINARYNINJACORE_LIBRARY
-#include "binaryninjaapi.h"  // NOLINT
+#include "binaryninjacore.h"  // NOLINT
 // clang-format on
 
 extern "C" {

diff --git a/binaryninja/stubs/binaryninjacore_stable.cc b/binaryninja/stubs/binaryninjacore_stable.cc
@@ -21,7 +21,7 @@
 // clang-format off
 #include "exceptions.h"  // NOLINT
 #define BINARYNINJACORE_LIBRARY
-#include "binaryninjaapi.h"  // NOLINT
+#include "binaryninjacore.h"  // NOLINT
 // clang-format on
 
 extern "C" {

diff --git a/binaryninja/stubs/regenerate-api-stubs.sh b/binaryninja/stubs/regenerate-api-stubs.sh
@@ -70,7 +70,7 @@ cd "${THIS_DIR}"
 // clang-format off
 #include "exceptions.h"  // NOLINT
 #define BINARYNINJACORE_LIBRARY
-#include "binaryninjaapi.h"  // NOLINT
+#include "binaryninjacore.h"  // NOLINT
 // clang-format on
 
 extern "C" {

diff --git a/cmake/BinExportDeps.cmake b/cmake/BinExportDeps.cmake
@@ -98,7 +98,6 @@ if(BINEXPORT_ENABLE_BINARYNINJA)
   FetchContent_Declare(binaryninjaapi
     GIT_REPOSITORY https://github.com/Vector35/binaryninja-api.git
     GIT_TAG        ${_binexport_binaryninja_git_tag}
-    GIT_SUBMODULES "docs" # Workaround for CMake #20579
   )
   FetchContent_GetProperties(binaryninjaapi)
   if(NOT binaryninjaapi_POPULATED)