From c33879f83f3dd8bbab97feb37784fe84156603d6 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Wed, 16 Oct 2024 08:28:10 -0400 Subject: [PATCH] Drop unused patch --- ...abling-Desktop-or-CommandLine-builds.patch | 77 ------------------- 1 file changed, 77 deletions(-) delete mode 100644 recipes/connectome-workbench/patches/0001-Allow-disabling-Desktop-or-CommandLine-builds.patch diff --git a/recipes/connectome-workbench/patches/0001-Allow-disabling-Desktop-or-CommandLine-builds.patch b/recipes/connectome-workbench/patches/0001-Allow-disabling-Desktop-or-CommandLine-builds.patch deleted file mode 100644 index cb2b49973611e..0000000000000 --- a/recipes/connectome-workbench/patches/0001-Allow-disabling-Desktop-or-CommandLine-builds.patch +++ /dev/null @@ -1,77 +0,0 @@ -From efa47553d90554bbdf2a70dcaee3ad8b8d8af848 Mon Sep 17 00:00:00 2001 -From: Chris Markiewicz -Date: Mon, 14 Oct 2024 10:08:17 -0400 -Subject: [PATCH] Allow disabling Desktop or CommandLine builds - ---- - src/CMakeLists.txt | 20 ++++++++++++++------ - src/Tests/CMakeLists.txt | 7 ++++++- - 2 files changed, 20 insertions(+), 7 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7d194b435..db797f2e8 100755 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -56,6 +56,10 @@ set (WORKBENCH_APPLE_WB_COMMAND_BUNDLE_FLAG TRUE CACHE BOOL - If TRUE, build wb_command as a MacOS Bundle (wb_command.app). - If FALSE, build wb_command as a normal UNIX executable." - ) -+set (WORKBENCH_BUILD_CLI TRUE CACHE BOOL -+ "If TRUE, build wb_command.") -+set (WORKBENCH_BUILD_GUI TRUE CACHE BOOL -+ "If TRUE, build wb_view.") - - # - # Use when FindOpenMP does not work such as on Macs -@@ -635,13 +639,17 @@ ADD_SUBDIRECTORY ( Algorithms ) - ADD_SUBDIRECTORY ( Operations ) - ADD_SUBDIRECTORY ( Brain ) - ADD_SUBDIRECTORY ( Graphics ) --IF (NOT Qwt_FOUND) -- ADD_SUBDIRECTORY ( Qwt ) --ENDIF (NOT Qwt_FOUND) --ADD_SUBDIRECTORY ( GuiQt ) - ADD_SUBDIRECTORY ( Commands ) --ADD_SUBDIRECTORY ( Desktop ) --ADD_SUBDIRECTORY ( CommandLine ) -+IF (WORKBENCH_BUILD_CLI) -+ ADD_SUBDIRECTORY ( CommandLine ) -+ENDIF (WORKBENCH_BUILD_CLI) -+IF (WORKBENCH_BUILD_GUI) -+ IF (NOT Qwt_FOUND) -+ ADD_SUBDIRECTORY ( Qwt ) -+ ENDIF (NOT Qwt_FOUND) -+ ADD_SUBDIRECTORY ( GuiQt ) -+ ADD_SUBDIRECTORY ( Desktop ) -+ENDIF (WORKBENCH_BUILD_GUI) - ADD_SUBDIRECTORY ( Tests ) - if (WORKBENCH_USE_SIMD AND CPUINFO_COMPILES) - ADD_SUBDIRECTORY ( kloewe/cpuinfo ) -diff --git a/src/Tests/CMakeLists.txt b/src/Tests/CMakeLists.txt -index 4eb06fc6a..895191595 100644 ---- a/src/Tests/CMakeLists.txt -+++ b/src/Tests/CMakeLists.txt -@@ -111,7 +111,6 @@ Tests - Operations - Algorithms - OperationsBase --GuiQt - Brain - Files - Annotations -@@ -141,6 +140,12 @@ ${OPENMP_LIBRARY} - #${LIBS} - ) - -+IF (WORKBENCH_BUILD_GUI) -+ TARGET_LINK_LIBRARIES(test_driver -+ GuiQt -+ ) -+ENDIF (WORKBENCH_BUILD_GUI) -+ - IF(WIN32) - TARGET_LINK_LIBRARIES(test_driver - ${GLEW_LIBRARIES} --- -2.45.2 -