Merge branch 'Vector35:dev' into dev

Author: ashvika-creator

CMakeLists.txt

@@ -60,7 +60,7 @@ elseif(BN_ALLOW_STUBS)
     add_dependencies(binaryninjaapi binaryninjacore_stubs)
     target_link_libraries(binaryninjaapi PUBLIC binaryninjacore_stubs)
 else()
-    message(FATAL_ERROR "No Binary Ninja installation was found and stub generation is disabled")
+    message(FATAL_ERROR "Could NOT find Binary Ninja installation. Please configure with -DBN_INSTALL_DIR=<path to Binary Ninja>, set the BN_INSTALL_DIR environment variable, or enable stub generation with -DBN_ALLOW_STUBS=ON")
 endif()
 
 if(BN_REF_COUNT_DEBUG)

cmake/FindBinaryNinjaCore.cmake

@@ -42,8 +42,7 @@ if(NOT BN_INTERNAL_BUILD)
     include(FindPackageHandleStandardArgs)
     find_package_handle_standard_args(BinaryNinjaCore
         FOUND_VAR BinaryNinjaCore_FOUND
-        REQUIRED_VARS CORE_LIBRARY
-        FAIL_MESSAGE "Could NOT find Binary Ninja installation. Please configure with -DBN_INSTALL_DIR=<path to Binary Ninja> or set the BN_INSTALL_DIR environment variable.")
+        REQUIRED_VARS CORE_LIBRARY)
 
     message(STATUS "Found Binary Ninja Core: ${CORE_LIBRARY}")
 

defaultarch/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(defaultarch)
 
 if(NOT BN_INTERNAL_BUILD)
-	add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ${PROJECT_BINARY_DIR}/api)
+	add_subdirectory(${PROJECT_SOURCE_DIR}/.. ${PROJECT_BINARY_DIR}/api)
 endif()
 
 file(GLOB SOURCES CONFIGURE_DEPENDS