Commit 4a942857ff25e103b2406521bf418739576cb5ed
1 parent
d94a0f69
maintainance
Showing
4 changed files
with
5 additions
and
53 deletions
CMakeLists.txt
| @@ -109,9 +109,6 @@ add_subdirectory(openbr) | @@ -109,9 +109,6 @@ add_subdirectory(openbr) | ||
| 109 | # Build applications | 109 | # Build applications |
| 110 | add_subdirectory(app) | 110 | add_subdirectory(app) |
| 111 | 111 | ||
| 112 | -# Build SWIG wrappers | ||
| 113 | -add_subdirectory(swig) | ||
| 114 | - | ||
| 115 | # Build the documentation? | 112 | # Build the documentation? |
| 116 | option(BR_BUILD_DOCUMENTATION "Build Documentation (Requires doxygen and latex)") | 113 | option(BR_BUILD_DOCUMENTATION "Build Documentation (Requires doxygen and latex)") |
| 117 | if(${BR_BUILD_DOCUMENTATION}) | 114 | if(${BR_BUILD_DOCUMENTATION}) |
| @@ -124,7 +121,7 @@ endif() | @@ -124,7 +121,7 @@ endif() | ||
| 124 | 121 | ||
| 125 | # Install | 122 | # Install |
| 126 | install(FILES CHANGELOG.md LICENSE.txt README.md DESTINATION .) | 123 | install(FILES CHANGELOG.md LICENSE.txt README.md DESTINATION .) |
| 127 | -install(DIRECTORY share data DESTINATION .) | 124 | +install(DIRECTORY data share DESTINATION .) |
| 128 | install(DIRECTORY ${BR_THIRDPARTY_SHARE} DESTINATION share) | 125 | install(DIRECTORY ${BR_THIRDPARTY_SHARE} DESTINATION share) |
| 129 | include(InstallDependencies) | 126 | include(InstallDependencies) |
| 130 | install_compiler_libraries() | 127 | install_compiler_libraries() |
openbr/openbr_plugin.h
| @@ -17,6 +17,8 @@ | @@ -17,6 +17,8 @@ | ||
| 17 | #ifndef __OPENBR_PLUGIN_H | 17 | #ifndef __OPENBR_PLUGIN_H |
| 18 | #define __OPENBR_PLUGIN_H | 18 | #define __OPENBR_PLUGIN_H |
| 19 | 19 | ||
| 20 | +#ifdef __cplusplus | ||
| 21 | + | ||
| 20 | #include <QDataStream> | 22 | #include <QDataStream> |
| 21 | #include <QDebug> | 23 | #include <QDebug> |
| 22 | #include <QDir> | 24 | #include <QDir> |
| @@ -1237,4 +1239,6 @@ Q_DECLARE_METATYPE(QList<float>) | @@ -1237,4 +1239,6 @@ Q_DECLARE_METATYPE(QList<float>) | ||
| 1237 | Q_DECLARE_METATYPE(QList<br::Transform*>) | 1239 | Q_DECLARE_METATYPE(QList<br::Transform*>) |
| 1238 | Q_DECLARE_METATYPE(QList<br::Distance*>) | 1240 | Q_DECLARE_METATYPE(QList<br::Distance*>) |
| 1239 | 1241 | ||
| 1242 | +#endif // __cplusplus | ||
| 1243 | + | ||
| 1240 | #endif // __OPENBR_PLUGIN_H | 1244 | #endif // __OPENBR_PLUGIN_H |
swig/CMakeLists.txt deleted
| 1 | -# Build SWIG Python wrapper? | ||
| 2 | -set(BR_SDK_SWIG OFF CACHE BOOL "Enable SWIG wrappers.") | ||
| 3 | - | ||
| 4 | -if(${BR_SDK_SWIG}) | ||
| 5 | - # Find SWIG | ||
| 6 | - find_package(SWIG REQUIRED) | ||
| 7 | - include(${SWIG_USE_FILE}) | ||
| 8 | - | ||
| 9 | - # Find Python | ||
| 10 | - find_package(PythonLibs REQUIRED) | ||
| 11 | - include_directories(${PYTHON_INCLUDE_PATH}) | ||
| 12 | - | ||
| 13 | - # Find Java | ||
| 14 | - find_package(JNI REQUIRED) | ||
| 15 | - include_directories(${JNI_INCLUDE_DIRS}) | ||
| 16 | - | ||
| 17 | - # Configure SWIG | ||
| 18 | - set(CMAKE_SWIG_FLAGS "") | ||
| 19 | - set_source_files_properties(br_sdk_swig.i PROPERTIES CPLUSPLUS ON SWIG_FLAGS "-includeall") | ||
| 20 | - | ||
| 21 | - # Build SWIG Python | ||
| 22 | - swig_add_module(br_sdk_swig python br_sdk_swig.i) | ||
| 23 | - swig_link_libraries(br_sdk_swig br_sdk ${PYTHON_LIBRARIES}) | ||
| 24 | - | ||
| 25 | - install(CODE "file( GLOB _GeneratedPythonSources \"${CMAKE_CURRENT_BINARY_DIR}/*.py\" )" | ||
| 26 | - CODE "file( INSTALL \${_GeneratedPythonSources} DESTINATION \"include/br/python\" )") | ||
| 27 | - install(TARGETS _br_sdk_swig | ||
| 28 | - RUNTIME DESTINATION bin | ||
| 29 | - LIBRARY DESTINATION lib | ||
| 30 | - ARCHIVE DESTINATION lib) | ||
| 31 | - | ||
| 32 | - # Build SWIG Java | ||
| 33 | - swig_add_module(br_sdk_swig java br_sdk_swig.i) | ||
| 34 | - swig_link_libraries(br_sdk_swig br_sdk ${JNI_LIBRARIES}) | ||
| 35 | - | ||
| 36 | - install(CODE "file( GLOB _GeneratedJavaSources \"${CMAKE_CURRENT_BINARY_DIR}/*.java\" )" | ||
| 37 | - CODE "file( INSTALL \${_GeneratedJavaSources} DESTINATION \"include/br/java\" )") | ||
| 38 | - install(TARGETS br_sdk_swig | ||
| 39 | - RUNTIME DESTINATION bin | ||
| 40 | - LIBRARY DESTINATION lib | ||
| 41 | - ARCHIVE DESTINATION lib) | ||
| 42 | -endif() |