diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e08e50..7e2d064 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,9 +109,6 @@ add_subdirectory(openbr) # Build applications add_subdirectory(app) -# Build SWIG wrappers -add_subdirectory(swig) - # Build the documentation? option(BR_BUILD_DOCUMENTATION "Build Documentation (Requires doxygen and latex)") if(${BR_BUILD_DOCUMENTATION}) @@ -124,7 +121,7 @@ endif() # Install install(FILES CHANGELOG.md LICENSE.txt README.md DESTINATION .) -install(DIRECTORY share data DESTINATION .) +install(DIRECTORY data share DESTINATION .) install(DIRECTORY ${BR_THIRDPARTY_SHARE} DESTINATION share) include(InstallDependencies) install_compiler_libraries() diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h index a7e1a7f..589531f 100644 --- a/openbr/openbr_plugin.h +++ b/openbr/openbr_plugin.h @@ -17,6 +17,8 @@ #ifndef __OPENBR_PLUGIN_H #define __OPENBR_PLUGIN_H +#ifdef __cplusplus + #include #include #include @@ -1237,4 +1239,6 @@ Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) +#endif // __cplusplus + #endif // __OPENBR_PLUGIN_H diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt deleted file mode 100644 index 9e5fdc7..0000000 --- a/swig/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Build SWIG Python wrapper? -set(BR_SDK_SWIG OFF CACHE BOOL "Enable SWIG wrappers.") - -if(${BR_SDK_SWIG}) - # Find SWIG - find_package(SWIG REQUIRED) - include(${SWIG_USE_FILE}) - - # Find Python - find_package(PythonLibs REQUIRED) - include_directories(${PYTHON_INCLUDE_PATH}) - - # Find Java - find_package(JNI REQUIRED) - include_directories(${JNI_INCLUDE_DIRS}) - - # Configure SWIG - set(CMAKE_SWIG_FLAGS "") - set_source_files_properties(br_sdk_swig.i PROPERTIES CPLUSPLUS ON SWIG_FLAGS "-includeall") - - # Build SWIG Python - swig_add_module(br_sdk_swig python br_sdk_swig.i) - swig_link_libraries(br_sdk_swig br_sdk ${PYTHON_LIBRARIES}) - - install(CODE "file( GLOB _GeneratedPythonSources \"${CMAKE_CURRENT_BINARY_DIR}/*.py\" )" - CODE "file( INSTALL \${_GeneratedPythonSources} DESTINATION \"include/br/python\" )") - install(TARGETS _br_sdk_swig - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - - # Build SWIG Java - swig_add_module(br_sdk_swig java br_sdk_swig.i) - swig_link_libraries(br_sdk_swig br_sdk ${JNI_LIBRARIES}) - - install(CODE "file( GLOB _GeneratedJavaSources \"${CMAKE_CURRENT_BINARY_DIR}/*.java\" )" - CODE "file( INSTALL \${_GeneratedJavaSources} DESTINATION \"include/br/java\" )") - install(TARGETS br_sdk_swig - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -endif() diff --git a/swig/mm_sdk_swig.i b/swig/mm_sdk_swig.i deleted file mode 100644 index 8a8afbf..0000000 --- a/swig/mm_sdk_swig.i +++ /dev/null @@ -1,7 +0,0 @@ -%module mm_sdk_swig -%{ -#include -%} - -%include -