From b0d95c14ede60c7fa4c833135ae8c86e20d8dca3 Mon Sep 17 00:00:00 2001 From: Alex Cameron Date: Thu, 4 Aug 2022 03:09:47 +1000 Subject: [PATCH 1/7] Only build necessary Sleigh components --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index febd65800..8d6836189 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,10 +127,15 @@ set(sleigh_ADDITIONAL_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/x86-ia # GHIDRA SLEIGH FetchContent_Declare(sleigh GIT_REPOSITORY https://github.com/lifting-bits/sleigh.git - GIT_TAG 5ee2f2c16250a6529108e6a6fff89e0f147502d2 + GIT_TAG 3e188779e13935dd14790acfc2faf850810ca943 ) FetchContent_MakeAvailable(sleigh) + +if(IS_DIRECTORY "${sleigh_SOURCE_DIR}") + set_property(DIRECTORY ${sleigh_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL YES) +endif() + add_library(thirdparty_sleigh INTERFACE) target_link_libraries(thirdparty_sleigh INTERFACE sleigh::sla From c619b8cb009b1d7513c043978bcf977c701b59fd Mon Sep 17 00:00:00 2001 From: Alex Cameron Date: Thu, 4 Aug 2022 17:42:14 +1000 Subject: [PATCH 2/7] Use ON instead of YES --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d6836189..1ae564aff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,7 @@ FetchContent_Declare(sleigh FetchContent_MakeAvailable(sleigh) if(IS_DIRECTORY "${sleigh_SOURCE_DIR}") - set_property(DIRECTORY ${sleigh_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL YES) + set_property(DIRECTORY ${sleigh_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL ON) endif() add_library(thirdparty_sleigh INTERFACE) From 056bb61a705c78f7b56e3e535d84f57fa28f8a33 Mon Sep 17 00:00:00 2001 From: Alex Cameron Date: Mon, 15 Aug 2022 14:03:33 +1000 Subject: [PATCH 3/7] Use build variables to ensure support and specs are built --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ae564aff..c99a46f3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,12 +130,10 @@ FetchContent_Declare(sleigh GIT_TAG 3e188779e13935dd14790acfc2faf850810ca943 ) +set(sleigh_BUILD_SUPPORT ON CACHE BOOL "" FORCE) +set(sleigh_BUILD_SLEIGHSPECS ON CACHE BOOL "" FORCE) FetchContent_MakeAvailable(sleigh) -if(IS_DIRECTORY "${sleigh_SOURCE_DIR}") - set_property(DIRECTORY ${sleigh_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL ON) -endif() - add_library(thirdparty_sleigh INTERFACE) target_link_libraries(thirdparty_sleigh INTERFACE sleigh::sla From 27688944b3eb91125fa2758134b9853c4d02a148 Mon Sep 17 00:00:00 2001 From: Alex Cameron Date: Mon, 15 Aug 2022 14:58:50 +1000 Subject: [PATCH 4/7] Update Sleigh git tag --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c99a46f3f..6dd6f43f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ set(sleigh_ADDITIONAL_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/x86-ia # GHIDRA SLEIGH FetchContent_Declare(sleigh GIT_REPOSITORY https://github.com/lifting-bits/sleigh.git - GIT_TAG 3e188779e13935dd14790acfc2faf850810ca943 + GIT_TAG 04db45f0b73372aa038e79b7e3fc44c3eb14732b ) set(sleigh_BUILD_SUPPORT ON CACHE BOOL "" FORCE) From f2e980b3d04b29be50be0476d134b1872f83a9bc Mon Sep 17 00:00:00 2001 From: Alex Cameron Date: Thu, 18 Aug 2022 17:51:52 +1000 Subject: [PATCH 5/7] Bump git tag again --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dd6f43f6..c0e995979 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ set(sleigh_ADDITIONAL_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/x86-ia # GHIDRA SLEIGH FetchContent_Declare(sleigh GIT_REPOSITORY https://github.com/lifting-bits/sleigh.git - GIT_TAG 04db45f0b73372aa038e79b7e3fc44c3eb14732b + GIT_TAG 79a2b17384cffc11bdd06092ab9b12421924812f ) set(sleigh_BUILD_SUPPORT ON CACHE BOOL "" FORCE) From 75adcde81c978dac2101be9408ef56ca4da23d52 Mon Sep 17 00:00:00 2001 From: Alex Cameron Date: Thu, 18 Aug 2022 20:19:43 +1000 Subject: [PATCH 6/7] Force write to `sleigh_ADDITIONAL_PATCHES` --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0e995979..c5f547707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,7 @@ target_link_libraries(thirdparty_gflags INTERFACE ) set(sleigh_ENABLE_TESTS OFF) -set(sleigh_ADDITIONAL_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/x86-ia.patch;${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/arm-thumb.patch") +set(sleigh_ADDITIONAL_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/x86-ia.patch;${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/arm-thumb.patch" CACHE STRING "" FORCE) # GHIDRA SLEIGH FetchContent_Declare(sleigh From 3a489c09d9c7bb6981c4d0be26b01b293871ad29 Mon Sep 17 00:00:00 2001 From: Alex Cameron Date: Mon, 22 Aug 2022 15:42:55 +1000 Subject: [PATCH 7/7] Bump git tag --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5f547707..b163b6d3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ set(sleigh_ADDITIONAL_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/patches/sleigh/x86-ia # GHIDRA SLEIGH FetchContent_Declare(sleigh GIT_REPOSITORY https://github.com/lifting-bits/sleigh.git - GIT_TAG 79a2b17384cffc11bdd06092ab9b12421924812f + GIT_TAG 74838a39ba7ddd91becb1d7f59e6cc3d7e3956de ) set(sleigh_BUILD_SUPPORT ON CACHE BOOL "" FORCE)