alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: remove unnecessary BUILDSWIG option

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson 2016-08-03 11:52:43 -06:00
parent bda66a3d06
commit 49e04593d8
13 changed files with 97 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -49,20 +49,19 @@ set (upm_VERSION_STRING ${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_
set (CMAKE_SWIG_FLAGS "") set (CMAKE_SWIG_FLAGS "")
option (BUILDDOC "Build all doc." OFF) option (BUILDDOC "Build all doc." OFF)
option (BUILDSWIG "Build swig modules." ON)
option (BUILDSWIGPYTHON "Build swig python 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 (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 (BUILDEXAMPLES "Build C++ example binaries" OFF)
option (BUILDJAVAEXAMPLES "Build java example jars" OFF) option (BUILDJAVAEXAMPLES "Build java example jars" OFF)
option (BUILDSWIGJAVA "Build swig java modules" OFF)
option (IPK "Generate IPK using CPack" OFF) option (IPK "Generate IPK using CPack" OFF)
option (RPM "Generate RPM using CPack" OFF) option (RPM "Generate RPM using CPack" OFF)
option (BUILDTESTS "Generate check-ups for upm" ON) option (BUILDTESTS "Generate check-ups for upm" ON)
option (ENABLECXX11 "Enable C++11 standards support" ON) option (ENABLECXX11 "Enable C++11 standards support" ON)
# Find swig # Find swig
if (BUILDSWIG) if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA)
if (BUILDSWIGNODE) if (BUILDSWIGNODE)
find_package (SWIG 3.0.5 REQUIRED) find_package (SWIG 3.0.5 REQUIRED)
else () else ()
@ -125,7 +124,7 @@ if (BUILDDOC)
endif (DOXYGEN_FOUND) endif (DOXYGEN_FOUND)
# Check if Sphinx is installed and add target to generate API documentation # Check if Sphinx is installed and add target to generate API documentation
find_package (Sphinx) find_package (Sphinx)
if(SPHINX_FOUND AND BUILDSWIG AND BUILDSWIGPYTHON) if(SPHINX_FOUND AND BUILDSWIGPYTHON)
# Python required for Sphinx build # Python required for Sphinx build
find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED) find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED)
string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING})

8
src/CMakeLists.txt
View File

@ -27,7 +27,7 @@ macro (upm_CREATE_INSTALL_PKGCONFIG generated_file install_location)
endmacro (upm_CREATE_INSTALL_PKGCONFIG) endmacro (upm_CREATE_INSTALL_PKGCONFIG)
macro(upm_SWIG_PYTHON) macro(upm_SWIG_PYTHON)
if (BUILDSWIGPYTHON AND BUILDSWIG) if (BUILDSWIGPYTHON)
include_directories ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..
@ -50,7 +50,7 @@ macro(upm_SWIG_PYTHON)
endmacro() endmacro()
macro(upm_SWIG_NODE) 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 # 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 # 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 # 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() endmacro()
macro(upm_SWIG_JAVA) macro(upm_SWIG_JAVA)
if (BUILDSWIGJAVA AND BUILDSWIG) if (BUILDSWIGJAVA)
FIND_PACKAGE (JNI REQUIRED) FIND_PACKAGE (JNI REQUIRED)
pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0) pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0)
@ -166,7 +166,7 @@ macro(upm_doxygen)
set (classname ${libname}) set (classname ${libname})
endif() endif()
set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
if (BUILDSWIGPYTHON AND BUILDSWIG) if (BUILDSWIGPYTHON)
add_dependencies (_pyupm_${libname} pyupm_doxy2swig) add_dependencies (_pyupm_${libname} pyupm_doxy2swig)
add_dependencies (pydoc _pyupm_${libname}) add_dependencies (pydoc _pyupm_${libname})
else () else ()

16
src/adafruitms1438/CMakeLists.txt
View File

@ -7,13 +7,11 @@ include_directories("../pca9685")
upm_module_init() upm_module_init()
add_dependencies(${libname} pca9685) add_dependencies(${libname} pca9685)
target_link_libraries(${libname} pca9685) target_link_libraries(${libname} pca9685)
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (jsupm_${libname} pca9685)
swig_link_libraries (jsupm_${libname} pca9685) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (pyupm_${libname} pca9685)
swig_link_libraries (pyupm_${libname} pca9685)
endif()
endif() endif()

18
src/bacnetmstp/CMakeLists.txt
View File

@ -10,15 +10,13 @@ if (BACNET_FOUND)
upm_module_init() upm_module_init()
add_dependencies(${libname} ${BACNET_LIBRARIES}) add_dependencies(${libname} ${BACNET_LIBRARIES})
target_link_libraries(${libname} ${BACNET_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${libname} ${BACNET_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) swig_link_libraries (jsupm_${libname} ${BACNET_LIBRARIES})
swig_link_libraries (jsupm_${libname} ${BACNET_LIBRARIES}) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) swig_link_libraries (pyupm_${libname} ${BACNET_LIBRARIES})
swig_link_libraries (pyupm_${libname} ${BACNET_LIBRARIES}) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) swig_link_libraries (javaupm_${libname} ${BACNET_LIBRARIES})
swig_link_libraries (javaupm_${libname} ${BACNET_LIBRARIES})
endif()
endif() endif()
endif () endif ()

24
src/e50hx/CMakeLists.txt
View File

@ -11,18 +11,16 @@ if (BACNET_FOUND)
include_directories("../bacnetmstp") include_directories("../bacnetmstp")
upm_module_init() upm_module_init()
target_link_libraries(${libname} bacnetmstp) target_link_libraries(${libname} bacnetmstp)
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (jsupm_${libname} bacnetmstp)
swig_link_libraries (jsupm_${libname} bacnetmstp) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (pyupm_${libname} bacnetmstp)
swig_link_libraries (pyupm_${libname} bacnetmstp) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (javaupm_${libname} bacnetmstp)
swig_link_libraries (javaupm_${libname} bacnetmstp)
endif()
endif() endif()
endif () endif ()

18
src/h803x/CMakeLists.txt
View File

@ -9,15 +9,13 @@ if (MODBUS_FOUND)
include_directories(${MODBUS_INCLUDE_DIRS}) include_directories(${MODBUS_INCLUDE_DIRS})
upm_module_init() upm_module_init()
target_link_libraries(${libname} ${MODBUS_LIBRARIES}) target_link_libraries(${libname} ${MODBUS_LIBRARIES})
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES}) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES}) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
endif()
endif() endif()
endif () endif ()

12
src/hwxpxx/CMakeLists.txt
View File

@ -9,12 +9,10 @@ if (MODBUS_FOUND)
include_directories(${MODBUS_INCLUDE_DIRS}) include_directories(${MODBUS_INCLUDE_DIRS})
upm_module_init() upm_module_init()
target_link_libraries(${libname} ${MODBUS_LIBRARIES}) target_link_libraries(${libname} ${MODBUS_LIBRARIES})
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES}) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
endif()
endif() endif()
endif () endif ()

24
src/ozw/CMakeLists.txt
View File

@ -9,18 +9,16 @@ if (OPENZWAVE_FOUND)
include_directories(${OPENZWAVE_INCLUDE_DIRS}) include_directories(${OPENZWAVE_INCLUDE_DIRS})
upm_module_init() upm_module_init()
target_link_libraries(${libname} ${OPENZWAVE_LIBRARIES}) target_link_libraries(${libname} ${OPENZWAVE_LIBRARIES})
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (jsupm_${libname} ${OPENZWAVE_LIBRARIES})
swig_link_libraries (jsupm_${libname} ${OPENZWAVE_LIBRARIES}) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (pyupm_${libname} ${OPENZWAVE_LIBRARIES})
swig_link_libraries (pyupm_${libname} ${OPENZWAVE_LIBRARIES}) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (javaupm_${libname} ${OPENZWAVE_LIBRARIES})
swig_link_libraries (javaupm_${libname} ${OPENZWAVE_LIBRARIES})
endif()
endif() endif()
endif () endif ()

18
src/t3311/CMakeLists.txt
View File

@ -9,15 +9,13 @@ if (MODBUS_FOUND)
include_directories(${MODBUS_INCLUDE_DIRS}) include_directories(${MODBUS_INCLUDE_DIRS})
upm_module_init() upm_module_init()
target_link_libraries(${libname} ${MODBUS_LIBRARIES}) target_link_libraries(${libname} ${MODBUS_LIBRARIES})
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (jsupm_${libname} ${MODBUS_LIBRARIES}) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (pyupm_${libname} ${MODBUS_LIBRARIES}) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
swig_link_libraries (javaupm_${libname} ${MODBUS_LIBRARIES})
endif()
endif() endif()
endif () endif ()

24
src/t8100/CMakeLists.txt
View File

@ -11,18 +11,16 @@ if (BACNET_FOUND)
include_directories("../bacnetmstp") include_directories("../bacnetmstp")
upm_module_init() upm_module_init()
target_link_libraries(${libname} bacnetmstp) target_link_libraries(${libname} bacnetmstp)
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (jsupm_${libname} bacnetmstp)
swig_link_libraries (jsupm_${libname} bacnetmstp) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (pyupm_${libname} bacnetmstp)
swig_link_libraries (pyupm_${libname} bacnetmstp) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (javaupm_${libname} bacnetmstp)
swig_link_libraries (javaupm_${libname} bacnetmstp)
endif()
endif() endif()
endif () endif ()

24
src/tb7300/CMakeLists.txt
View File

@ -11,18 +11,16 @@ if (BACNET_FOUND)
include_directories("../bacnetmstp") include_directories("../bacnetmstp")
upm_module_init() upm_module_init()
target_link_libraries(${libname} bacnetmstp) target_link_libraries(${libname} bacnetmstp)
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (jsupm_${libname} bacnetmstp)
swig_link_libraries (jsupm_${libname} bacnetmstp) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (pyupm_${libname} bacnetmstp)
swig_link_libraries (pyupm_${libname} bacnetmstp) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
set_target_properties(${SWIG_MODULE_javaupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE) swig_link_libraries (javaupm_${libname} bacnetmstp)
swig_link_libraries (javaupm_${libname} bacnetmstp)
endif()
endif() endif()
endif () endif ()

2
src/upm/CMakeLists.txt
View File

@ -1,5 +1,5 @@
install (DIRECTORY . DESTINATION include/upm FILES_MATCHING PATTERN "*.hpp") install (DIRECTORY . DESTINATION include/upm FILES_MATCHING PATTERN "*.hpp")
if (BUILDSWIGJAVA AND BUILDSWIG) if (BUILDSWIGJAVA)
set (libname "interfaces") set (libname "interfaces")
set (libdescription "upm interfaces") set (libdescription "upm interfaces")
set (module_src ${libname}.cxx) set (module_src ${libname}.cxx)

18
src/vcap/CMakeLists.txt
View File

@ -8,15 +8,13 @@ if (JPEG_FOUND)
set (reqlibname "jpeg") set (reqlibname "jpeg")
upm_module_init() upm_module_init()
target_link_libraries(${libname} jpeg) target_link_libraries(${libname} jpeg)
if (BUILDSWIG) if (BUILDSWIGNODE)
if (BUILDSWIGNODE) swig_link_libraries (jsupm_${libname} jpeg)
swig_link_libraries (jsupm_${libname} jpeg) endif()
endif() if (BUILDSWIGPYTHON)
if (BUILDSWIGPYTHON) swig_link_libraries (pyupm_${libname} jpeg)
swig_link_libraries (pyupm_${libname} jpeg) endif()
endif() if (BUILDSWIGJAVA)
if (BUILDSWIGJAVA) swig_link_libraries (javaupm_${libname} jpeg)
swig_link_libraries (javaupm_${libname} jpeg)
endif()
endif() endif()
endif() endif()