diff --git a/CMakeLists.txt b/CMakeLists.txt index 00e5951f..7822f9cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,20 +49,19 @@ set (upm_VERSION_STRING ${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_ set (CMAKE_SWIG_FLAGS "") option (BUILDDOC "Build all doc." OFF) -option (BUILDSWIG "Build swig modules." ON) option (BUILDSWIGPYTHON "Build swig python modules." ON) -option (BUILDPYTHON3 "Use python3 for building/installing/testing" OFF) option (BUILDSWIGNODE "Build swig node modules." ON) +option (BUILDSWIGJAVA "Build swig java modules" OFF) +option (BUILDPYTHON3 "Use python3 for building/installing/testing" OFF) option (BUILDEXAMPLES "Build C++ example binaries" OFF) option (BUILDJAVAEXAMPLES "Build java example jars" OFF) -option (BUILDSWIGJAVA "Build swig java modules" OFF) option (IPK "Generate IPK using CPack" OFF) option (RPM "Generate RPM using CPack" OFF) option (BUILDTESTS "Generate check-ups for upm" ON) option (ENABLECXX11 "Enable C++11 standards support" ON) # Find swig -if (BUILDSWIG) +if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA) if (BUILDSWIGNODE) find_package (SWIG 3.0.5 REQUIRED) else () @@ -125,7 +124,7 @@ if (BUILDDOC) endif (DOXYGEN_FOUND) # Check if Sphinx is installed and add target to generate API documentation find_package (Sphinx) - if(SPHINX_FOUND AND BUILDSWIG AND BUILDSWIGPYTHON) + if(SPHINX_FOUND AND BUILDSWIGPYTHON) # Python required for Sphinx build find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED) string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b9a85a06..39927b13 100644 --- 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 () diff --git a/src/adafruitms1438/CMakeLists.txt b/src/adafruitms1438/CMakeLists.txt index 34433e2a..70c85d9d 100644 --- 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() diff --git a/src/bacnetmstp/CMakeLists.txt b/src/bacnetmstp/CMakeLists.txt index 8f23f7e8..7c47c345 100644 --- 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 () diff --git a/src/e50hx/CMakeLists.txt b/src/e50hx/CMakeLists.txt index 609d5864..7d62b9ce 100644 --- 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 () diff --git a/src/h803x/CMakeLists.txt b/src/h803x/CMakeLists.txt index 3c723b03..51ef3c43 100644 --- 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 () diff --git a/src/hwxpxx/CMakeLists.txt b/src/hwxpxx/CMakeLists.txt index a23b6c5f..60ad8c9a 100644 --- 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 () diff --git a/src/ozw/CMakeLists.txt b/src/ozw/CMakeLists.txt index f450df7e..9b36c5d0 100644 --- 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 () diff --git a/src/t3311/CMakeLists.txt b/src/t3311/CMakeLists.txt index 9938378d..6dac7253 100644 --- 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 () diff --git a/src/t8100/CMakeLists.txt b/src/t8100/CMakeLists.txt index cc68020b..4d79f8ab 100644 --- 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 () diff --git a/src/tb7300/CMakeLists.txt b/src/tb7300/CMakeLists.txt index 8564c805..5cf1cc14 100644 --- 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 () diff --git a/src/upm/CMakeLists.txt b/src/upm/CMakeLists.txt index cd9b4793..2fd54026 100644 --- 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) diff --git a/src/vcap/CMakeLists.txt b/src/vcap/CMakeLists.txt index e0c634eb..df38aac3 100644 --- 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() \ No newline at end of file