Merge topic 'SIMPLEITK-663_TooManySuperbuildCommandArguments' into next

97b3d17 Do not pass unneeded language arguments on the command line
SimpleITK · Aug 14, 2015 · dd3c435 · dd3c435
2 parents 16c870c + 97b3d17
commit dd3c435
Showing 1 changed file with 95 additions and 66 deletions.
diff --git a/CMake/sitkLanguageOptions.cmake b/CMake/sitkLanguageOptions.cmake
@@ -36,12 +36,14 @@ mark_as_advanced( LUA_ADDITIONAL_LIBRARIES )
 
 option ( WRAP_LUA "Wrap Lua" ${WRAP_LUA_DEFAULT} )
 
-list( APPEND SITK_LANGUAGES_VARS
-  LUA_LIBRARIES
-  LUA_INCLUDE_DIR
-  LUA_VERSION_STRING
-  LUA_ADDITIONAL_LIBRARIES
-  )
+if ( WRAP_LUA )
+  list( APPEND SITK_LANGUAGES_VARS
+    LUA_LIBRARIES
+    LUA_INCLUDE_DIR
+    LUA_VERSION_STRING
+    LUA_ADDITIONAL_LIBRARIES
+    )
+endif()
 
 
 
@@ -66,21 +68,26 @@ if ( PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND
 else()
   set( WRAP_PYTHON_DEFAULT OFF )
 endif()
-list( APPEND SITK_LANGUAGES_VARS
-  PYTHON_DEBUG_LIBRARY
-  PYTHON_EXECUTABLE
-  PYTHON_LIBRARY
-  PYTHON_INCLUDE_DIR
-#  PYTHON_INCLUDE_PATH ( deprecated )
-   )
-# Debian "jessie" has this additional variable required to match
-# python versions.
-if(PYTHON_INCLUDE_DIR2)
+
+option( WRAP_PYTHON "Wrap Python" ${WRAP_PYTHON_DEFAULT} )
+
+if ( WRAP_PYTHON )
   list( APPEND SITK_LANGUAGES_VARS
-    PYTHON_INCLUDE_DIR2
+    PYTHON_DEBUG_LIBRARY
+    PYTHON_EXECUTABLE
+    PYTHON_LIBRARY
+    PYTHON_INCLUDE_DIR
+    #  PYTHON_INCLUDE_PATH ( deprecated )
     )
-endif()
-option( WRAP_PYTHON "Wrap Python" ${WRAP_PYTHON_DEFAULT} )
+# Debian "jessie" has this additional variable required to match
+# python versions.
+  if(PYTHON_INCLUDE_DIR2)
+    list( APPEND SITK_LANGUAGES_VARS
+      PYTHON_INCLUDE_DIR2
+      )
+  endif()
+endif ()
+
 
 if (DEFINED  WRAP_JAVA AND WRAP_JAVA)
   set(_QUIET "REQUIRED")
@@ -95,29 +102,32 @@ if ( ${JAVA_FOUND} AND ${JNI_FOUND} )
 else ( ${JAVA_FOUND} AND ${JNI_FOUND} )
   set( WRAP_JAVA_DEFAULT OFF )
 endif ( ${JAVA_FOUND} AND ${JNI_FOUND} )
-list( APPEND SITK_LANGUAGES_VARS
-  Java_JAVA_EXECUTABLE
-  Java_JAVAC_EXECUTABLE
-  Java_JAR_EXECUTABLE
-  Java_VERSION_STRING
-  Java_VERSION_MAJOR
-  Java_VERSION_MINOR
-  Java_VERSION_PATCH
-  Java_VERSION_TWEAK
-  Java_VERSION
-  Java_INCLUDE_DIRS
-  Java_LIBRARIES
-  JNI_INCLUDE_DIRS
-  JNI_LIBRARIES
-  JAVA_AWT_LIBRARY
-  JAVA_JVM_LIBRARY
-  JAVA_INCLUDE_PATH
-  JAVA_INCLUDE_PATH2
-  JAVA_AWT_INCLUDE_PATH
-
-  )
+
 option ( WRAP_JAVA "Wrap Java" ${WRAP_JAVA_DEFAULT} )
 
+if ( WRAP_JAVA )
+  list( APPEND SITK_LANGUAGES_VARS
+    Java_JAVA_EXECUTABLE
+    Java_JAVAC_EXECUTABLE
+    Java_JAR_EXECUTABLE
+    Java_VERSION_STRING
+    Java_VERSION_MAJOR
+    Java_VERSION_MINOR
+    Java_VERSION_PATCH
+    Java_VERSION_TWEAK
+    Java_VERSION
+    Java_INCLUDE_DIRS
+    Java_LIBRARIES
+    JNI_INCLUDE_DIRS
+    JNI_LIBRARIES
+    JAVA_AWT_LIBRARY
+    JAVA_JVM_LIBRARY
+    JAVA_INCLUDE_PATH
+    JAVA_INCLUDE_PATH2
+    JAVA_AWT_INCLUDE_PATH
+    )
+endif()
+
 
 if (DEFINED  WRAP_TCL AND WRAP_TCL)
   set(_QUIET "REQUIRED")
@@ -131,30 +141,41 @@ if ( ${TCL_FOUND} )
 else ( ${TCL_FOUND} )
   set ( WRAP_TCL_DEFAULT OFF )
 endif ( ${TCL_FOUND} )
-list( APPEND SITK_LANGUAGES_VARS
-  TCL_LIBRARY
-  TCL_INCLUDE_PATH
-  TCL_TCLSH
-  TK_LIBRARY
-  TK_INCLUDE_PATH
-  TK_WISH )
+
 option ( WRAP_TCL "Wrap Tcl" ${WRAP_TCL_DEFAULT} )
 
+if ( WRAP_TCL )
+  list( APPEND SITK_LANGUAGES_VARS
+    TCL_LIBRARY
+    TCL_INCLUDE_PATH
+    TCL_TCLSH
+    TK_LIBRARY
+    TK_INCLUDE_PATH
+    TK_WISH
+    )
+endif()
+
+
 find_package ( Ruby QUIET )
 if ( ${RUBY_FOUND} )
   set ( WRAP_RUBY_DEFAULT ON )
 else ( ${RUBY_FOUND} )
   set ( WRAP_RUBY_DEFAULT OFF )
 endif ( ${RUBY_FOUND} )
-list( APPEND SITK_LANGUAGES_VARS
-  RUBY_EXECUTABLE
-  RUBY_INCLUDE_DIRS
-  RUBY_LIBRARY
-  RUBY_VERSION
-  RUBY_FOUND
-  RUBY_INCLUDE_PATH )
+
 option ( WRAP_RUBY "Wrap Ruby" ${WRAP_RUBY_DEFAULT} )
 
+if ( WRAP_RUBY )
+  list( APPEND SITK_LANGUAGES_VARS
+    RUBY_EXECUTABLE
+    RUBY_INCLUDE_DIRS
+    RUBY_LIBRARY
+    RUBY_VERSION
+    RUBY_FOUND
+    RUBY_INCLUDE_PATH
+    )
+endif()
+
 
 if (DEFINED  WRAP_CSHARP AND WRAP_CSHARP)
   set(_QUIET "REQUIRED")
@@ -168,13 +189,18 @@ if ( ${CSHARP_FOUND} AND NOT MINGW )
 else ()
   set ( WRAP_CSHARP_DEFAULT OFF )
 endif ()
-list( APPEND SITK_LANGUAGES_VARS
-  CSHARP_COMPILER
-  CSHARP_INTERPRETER
-  CSHARP_PLATFORM
-)
+
 option ( WRAP_CSHARP "Wrap C#" ${WRAP_CSHARP_DEFAULT} )
 
+if ( WRAP_CSHARP )
+  list( APPEND SITK_LANGUAGES_VARS
+    CSHARP_COMPILER
+    CSHARP_INTERPRETER
+    CSHARP_PLATFORM
+    )
+endif()
+
+
 if (DEFINED  WRAP_R AND WRAP_R)
   set(_QUIET "REQUIRED")
 else()
@@ -188,15 +214,18 @@ else( )
   set ( WRAP_R_DEFAULT OFF )
 endif( )
 
-
-list( APPEND SITK_LANGUAGES_VARS
- R_INCLUDE_DIR
- R_LIBRARIES
- R_LIBRARY_BASE
- R_COMMAND
- RSCRIPT_EXECUTABLE )
 option ( WRAP_R "Wrap R" ${WRAP_R_DEFAULT} )
 
+if ( WRAP_R )
+  list( APPEND SITK_LANGUAGES_VARS
+    R_INCLUDE_DIR
+    R_LIBRARIES
+    R_LIBRARY_BASE
+    R_COMMAND
+    RSCRIPT_EXECUTABLE )
+endif()
+
+
 if( WIN32 )
   mark_as_advanced( WRAP_R )
 endif()