build: remove unnecessary BUILDSWIG option

Signed-off-by: Jon Trulson <jtrulson@ics.com>
2025-07-01 01:11:10 +03:00 · 2016-08-03 11:52:43 -06:00
parent bda66a3d06
commit 49e04593d8
13 changed files with 97 additions and 118 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -27,7 +27,7 @@ macro (upm_CREATE_INSTALL_PKGCONFIG generated_file install_location)
 endmacro (upm_CREATE_INSTALL_PKGCONFIG)

 macro(upm_SWIG_PYTHON)
-  if (BUILDSWIGPYTHON AND BUILDSWIG)
+  if (BUILDSWIGPYTHON)

    include_directories (
      ${CMAKE_CURRENT_SOURCE_DIR}/..
@ -50,7 +50,7 @@ macro(upm_SWIG_PYTHON)
 endmacro()

 macro(upm_SWIG_NODE)
-  if (BUILDSWIGNODE AND BUILDSWIG)
+  if (BUILDSWIGNODE)
    # SWIG treats SWIG_FLAGS as a list and not a string so semicolon seperation is
    # required. This hardcodes V8_VERSION to be <10 but I assume that's not going
    # to be a problem for a little while! SWIG uses a padded SWIG_V8 version which
@ -112,7 +112,7 @@ macro(upm_SWIG_NODE)
 endmacro()

 macro(upm_SWIG_JAVA)
-  if (BUILDSWIGJAVA AND BUILDSWIG)
+  if (BUILDSWIGJAVA)

    FIND_PACKAGE (JNI REQUIRED)
    pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0)
@ -166,7 +166,7 @@ macro(upm_doxygen)
      set (classname ${libname})
    endif()
    set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
-    if (BUILDSWIGPYTHON AND BUILDSWIG)
+    if (BUILDSWIGPYTHON)
      add_dependencies (_pyupm_${libname} pyupm_doxy2swig)
      add_dependencies (pydoc _pyupm_${libname})
    else ()
--- a/src/adafruitms1438/CMakeLists.txt
+++ b/src/adafruitms1438/CMakeLists.txt
@ -7,13 +7,11 @@ include_directories("../pca9685")
 upm_module_init()
 add_dependencies(${libname} pca9685)
 target_link_libraries(${libname} pca9685)
-if (BUILDSWIG)
-  if (BUILDSWIGNODE)
-    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (jsupm_${libname} pca9685)
-  endif()
-  if (BUILDSWIGPYTHON)
-  set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-    swig_link_libraries (pyupm_${libname} pca9685)
-  endif()
+if (BUILDSWIGNODE)
+  set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+  swig_link_libraries (jsupm_${libname} pca9685)
+endif()
+if (BUILDSWIGPYTHON)
+  set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+  swig_link_libraries (pyupm_${libname} pca9685)
 endif()
--- a/src/bacnetmstp/CMakeLists.txt
+++ b/src/bacnetmstp/CMakeLists.txt
@ -10,15 +10,13 @@ if (BACNET_FOUND)
  upm_module_init()
  add_dependencies(${libname} ${BACNET_LIBRARIES})
  target_link_libraries(${libname} ${BACNET_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      swig_link_libraries (jsupm_${libname} ${BACNET_LIBRARIES})
-    endif()
-    if (BUILDSWIGPYTHON)
-      swig_link_libraries (pyupm_${libname} ${BACNET_LIBRARIES})
-    endif()
-    if (BUILDSWIGJAVA)
-        swig_link_libraries (javaupm_${libname} ${BACNET_LIBRARIES})
-    endif()
+  if (BUILDSWIGNODE)
+    swig_link_libraries (jsupm_${libname} ${BACNET_LIBRARIES})
+  endif()
+  if (BUILDSWIGPYTHON)
+    swig_link_libraries (pyupm_${libname} ${BACNET_LIBRARIES})
+  endif()
+  if (BUILDSWIGJAVA)
+    swig_link_libraries (javaupm_${libname} ${BACNET_LIBRARIES})
  endif()
 endif ()
--- a/src/e50hx/CMakeLists.txt
+++ b/src/e50hx/CMakeLists.txt
@ -11,18 +11,16 @@ if (BACNET_FOUND)
  include_directories("../bacnetmstp")
  upm_module_init()
  target_link_libraries(${libname} bacnetmstp)
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (jsupm_${libname} bacnetmstp)
-    endif()
-    if (BUILDSWIGPYTHON)
-      set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (pyupm_${libname} bacnetmstp)
-    endif()
-    if (BUILDSWIGJAVA)
-      set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (javaupm_${libname} bacnetmstp)
-    endif()
+  if (BUILDSWIGNODE)
+    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (jsupm_${libname} bacnetmstp)
+  endif()
+  if (BUILDSWIGPYTHON)
+    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (pyupm_${libname} bacnetmstp)
+  endif()
+  if (BUILDSWIGJAVA)
+    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (javaupm_${libname} bacnetmstp)
  endif()
 endif ()
--- a/src/h803x/CMakeLists.txt
+++ b/src/h803x/CMakeLists.txt
@ -9,15 +9,13 @@ if (MODBUS_FOUND)
  include_directories(${MODBUS_INCLUDE_DIRS})
  upm_module_init()
  target_link_libraries(${libname} ${MODBUS_LIBRARIES})
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
-    if (BUILDSWIGPYTHON)
-      swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
-    if (BUILDSWIGJAVA)
-      swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
+  if (BUILDSWIGNODE)
+    swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
+  endif()
+  if (BUILDSWIGPYTHON)
+    swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
+  endif()
+  if (BUILDSWIGJAVA)
+    swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
  endif()
 endif ()
--- a/src/hwxpxx/CMakeLists.txt
+++ b/src/hwxpxx/CMakeLists.txt
@ -9,12 +9,10 @@ if (MODBUS_FOUND)
  include_directories(${MODBUS_INCLUDE_DIRS})
  upm_module_init()
  target_link_libraries(${libname} ${MODBUS_LIBRARIES})
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
-    if (BUILDSWIGPYTHON)
-      swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
+  if (BUILDSWIGNODE)
+    swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
+  endif()
+  if (BUILDSWIGPYTHON)
+    swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
  endif()
 endif ()
--- a/src/ozw/CMakeLists.txt
+++ b/src/ozw/CMakeLists.txt
@ -9,18 +9,16 @@ if (OPENZWAVE_FOUND)
  include_directories(${OPENZWAVE_INCLUDE_DIRS})
  upm_module_init()
  target_link_libraries(${libname} ${OPENZWAVE_LIBRARIES})
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (jsupm_${libname} ${OPENZWAVE_LIBRARIES})
-    endif()
-    if (BUILDSWIGPYTHON)
-      set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (pyupm_${libname} ${OPENZWAVE_LIBRARIES})
-    endif()
-    if (BUILDSWIGJAVA)
-      set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (javaupm_${libname} ${OPENZWAVE_LIBRARIES})
-    endif()
+  if (BUILDSWIGNODE)
+    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (jsupm_${libname} ${OPENZWAVE_LIBRARIES})
+  endif()
+  if (BUILDSWIGPYTHON)
+    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (pyupm_${libname} ${OPENZWAVE_LIBRARIES})
+  endif()
+  if (BUILDSWIGJAVA)
+    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (javaupm_${libname} ${OPENZWAVE_LIBRARIES})
  endif()
 endif ()
--- a/src/t3311/CMakeLists.txt
+++ b/src/t3311/CMakeLists.txt
@ -9,15 +9,13 @@ if (MODBUS_FOUND)
  include_directories(${MODBUS_INCLUDE_DIRS})
  upm_module_init()
  target_link_libraries(${libname} ${MODBUS_LIBRARIES})
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
-    if (BUILDSWIGPYTHON)
-      swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
-    if (BUILDSWIGJAVA)
-        swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
-    endif()
+  if (BUILDSWIGNODE)
+    swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
+  endif()
+  if (BUILDSWIGPYTHON)
+    swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
+  endif()
+  if (BUILDSWIGJAVA)
+    swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
  endif()
 endif ()
--- a/src/t8100/CMakeLists.txt
+++ b/src/t8100/CMakeLists.txt
@ -11,18 +11,16 @@ if (BACNET_FOUND)
  include_directories("../bacnetmstp")
  upm_module_init()
  target_link_libraries(${libname} bacnetmstp)
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (jsupm_${libname} bacnetmstp)
-    endif()
-    if (BUILDSWIGPYTHON)
-      set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (pyupm_${libname} bacnetmstp)
-    endif()
-    if (BUILDSWIGJAVA)
-      set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (javaupm_${libname} bacnetmstp)
-    endif()
+  if (BUILDSWIGNODE)
+    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (jsupm_${libname} bacnetmstp)
+  endif()
+  if (BUILDSWIGPYTHON)
+    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (pyupm_${libname} bacnetmstp)
+  endif()
+  if (BUILDSWIGJAVA)
+    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (javaupm_${libname} bacnetmstp)
  endif()
 endif ()
--- a/src/tb7300/CMakeLists.txt
+++ b/src/tb7300/CMakeLists.txt
@ -11,18 +11,16 @@ if (BACNET_FOUND)
  include_directories("../bacnetmstp")
  upm_module_init()
  target_link_libraries(${libname} bacnetmstp)
-  if (BUILDSWIG)
-    if (BUILDSWIGNODE)
-      set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (jsupm_${libname} bacnetmstp)
-    endif()
-    if (BUILDSWIGPYTHON)
-      set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (pyupm_${libname} bacnetmstp)
-    endif()
-    if (BUILDSWIGJAVA)
-      set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-      swig_link_libraries (javaupm_${libname} bacnetmstp)
-    endif()
+  if (BUILDSWIGNODE)
+    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (jsupm_${libname} bacnetmstp)
+  endif()
+  if (BUILDSWIGPYTHON)
+    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (pyupm_${libname} bacnetmstp)
+  endif()
+  if (BUILDSWIGJAVA)
+    set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
+    swig_link_libraries (javaupm_${libname} bacnetmstp)
  endif()
 endif ()
--- a/src/upm/CMakeLists.txt
+++ b/src/upm/CMakeLists.txt
@ -1,5 +1,5 @@
 install (DIRECTORY . DESTINATION include/upm FILES_MATCHING PATTERN "*.hpp")
-if (BUILDSWIGJAVA AND BUILDSWIG)
+if (BUILDSWIGJAVA)
    set (libname "interfaces")
    set (libdescription "upm interfaces")
    set (module_src ${libname}.cxx)
--- a/src/vcap/CMakeLists.txt
+++ b/src/vcap/CMakeLists.txt
@ -8,15 +8,13 @@ if (JPEG_FOUND)
    set (reqlibname "jpeg")
    upm_module_init()
    target_link_libraries(${libname} jpeg)
-    if (BUILDSWIG)
-      if (BUILDSWIGNODE)
-        swig_link_libraries (jsupm_${libname} jpeg)
-      endif()
-      if (BUILDSWIGPYTHON)
-        swig_link_libraries (pyupm_${libname} jpeg)
-      endif()
-      if (BUILDSWIGJAVA)
-        swig_link_libraries (javaupm_${libname} jpeg)
-      endif()
+    if (BUILDSWIGNODE)
+      swig_link_libraries (jsupm_${libname} jpeg)
+    endif()
+    if (BUILDSWIGPYTHON)
+      swig_link_libraries (pyupm_${libname} jpeg)
+    endif()
+    if (BUILDSWIGJAVA)
+      swig_link_libraries (javaupm_${libname} jpeg)
    endif()
 endif()