Merge pull request #2429 from blowekamp/enable_language_tests

blowekamp · web-flow · commit f0254cccec90 · 2025-09-11T16:45:29.000-04:00
For tests fix check if language is enabled
diff --git a/CMake/sitkAddTest.cmake b/CMake/sitkAddTest.cmake
@@ -96,7 +96,7 @@ endfunction()
 # This is a function which set up the environment for executing python examples and tests
 #
 function(sitk_add_python_test name)
-  if(NOT WRAP_PYTHON)
+  if(NOT WRAP_PYTHON AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_Python")
     return()
   endif()
 
@@ -141,7 +141,7 @@ endfunction()
 # This is a function which set up the environment for executing python examples and tests
 #
 function(sitk_add_pytest_test name)
-  if(NOT WRAP_PYTHON)
+  if(NOT WRAP_PYTHON AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_Python")
     return()
   endif()
 
@@ -192,7 +192,7 @@ endfunction()
 # This is a function which set up the enviroment for executing lua examples and tests
 #
 function(sitk_add_lua_test name)
-  if(NOT WRAP_LUA)
+  if(NOT WRAP_LUA AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_Lua")
     return()
   endif()
 
@@ -235,7 +235,7 @@ endfunction()
 # This is a function which set up the enviroment for executing ruby examples and tests
 #
 function(sitk_add_ruby_test name)
-  if(NOT WRAP_RUBY)
+  if(NOT WRAP_RUBY AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_Ruby")
     return()
   endif()
 
@@ -278,7 +278,7 @@ endfunction()
 # This is a function which set up the enviroment for executing TCL examples and tests
 #
 function(sitk_add_tcl_test name)
-  if(NOT WRAP_TCL)
+  if(NOT WRAP_TCL AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_Tcl")
     return()
   endif()
 
@@ -313,7 +313,7 @@ endfunction()
 # This is a function which set up the enviroment for executing JAVA examples and tests
 #
 function(sitk_add_java_test name java_file)
-  if(NOT WRAP_JAVA)
+  if(NOT WRAP_JAVA AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_Java")
     return()
   endif()
 
@@ -383,7 +383,7 @@ endfunction()
 # This is a function which set up the enviroment for executing R examples and tests
 #
 function(sitk_add_r_test name)
-  if(NOT WRAP_R)
+  if(NOT WRAP_R AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_R")
     return()
   endif()
 
@@ -438,7 +438,7 @@ endfunction()
 # enviroment for executing CSharp examples and tests.
 #
 function(sitk_add_csharp_test name csharp_file)
-  if(NOT WRAP_CSHARP)
+  if(NOT WRAP_CSHARP AND NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK_CSharp")
     return()
   endif()
 
diff --git a/Wrapping/CSharp/CMakeLists.txt b/Wrapping/CSharp/CMakeLists.txt
@@ -219,8 +219,6 @@ add_dependencies(
 add_subdirectory(dist)
 
 if(NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK" AND BUILD_TESTING)
-  set(WRAP_CSHARP 1)
-
   add_subdirectory(
     "${SimpleITK_SOURCE_DIR}/Testing/Unit/CSharp"
     "${CMAKE_BINARY_DIR}/Testing/Unit"
diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt
@@ -138,8 +138,6 @@ string(
 add_subdirectory(dist)
 
 if(NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK" AND BUILD_TESTING)
-  set(WRAP_JAVA 1)
-
   add_subdirectory(
     "${SimpleITK_SOURCE_DIR}/Testing/Unit/Java"
     "${CMAKE_BINARY_DIR}/Testing/Unit"
diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt
@@ -338,8 +338,6 @@ if(BUILD_TESTING)
 endif()
 
 if(NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK" AND BUILD_TESTING)
-  set(WRAP_PYTHON 1)
-
   if(BUILD_EXAMPLES)
     add_subdirectory(
       "${SimpleITK_SOURCE_DIR}/Examples"
diff --git a/Wrapping/R/CMakeLists.txt b/Wrapping/R/CMakeLists.txt
@@ -248,8 +248,6 @@ add_custom_command(
 )
 
 if(NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK" AND BUILD_TESTING)
-  set(WRAP_R 1)
-
   add_subdirectory(
     "${SimpleITK_SOURCE_DIR}/Testing/Unit/R"
     "${CMAKE_BINARY_DIR}/Testing/Unit"

Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,6 @@ add_custom_command(`
`248`	`248`	`)`
`249`	`249`
`250`	`250`	`if(NOT CMAKE_PROJECT_NAME STREQUAL "SimpleITK" AND BUILD_TESTING)`
`251`		`- set(WRAP_R 1)`
`252`		`-`
`253`	`251`	`add_subdirectory(`
`254`	`252`	`"${SimpleITK_SOURCE_DIR}/Testing/Unit/R"`
`255`	`253`	`"${CMAKE_BINARY_DIR}/Testing/Unit"`