diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2010-05-28 11:48:29 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2010-05-28 11:48:29 +0000 |
| commit | e37e3ba26af8b6046c39e430e798ec54b350091f (patch) | |
| tree | c049323f5cbf92fb26015c865796f598c1f98204 /epan/wspython | |
| parent | c160ddd1de5dde05193156bedd47dc9a89f92616 (diff) | |
| download | wireshark-e37e3ba26af8b6046c39e430e798ec54b350091f.tar.gz | |
Remaining fixes for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4788
- Compile the python code directly into epan - don't link it in as
a static lib.
- Call make-init-lua.pl with the top level directory instead of the
current directory. Change make-init-lua.pl accordingly.
svn path=/trunk/; revision=33009
Diffstat (limited to 'epan/wspython')
| -rw-r--r-- | epan/wspython/CMakeLists.txt | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/epan/wspython/CMakeLists.txt b/epan/wspython/CMakeLists.txt index 9287188dc5..f6dcac4da7 100644 --- a/epan/wspython/CMakeLists.txt +++ b/epan/wspython/CMakeLists.txt @@ -21,50 +21,22 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) - set(WSPYTHON_FILES - wspy_register.c - wspy_proto.c -) - -set(CLEAN_FILES - ${WSPYTHON_FILES} -) - -if (WERROR) - set_source_files_properties( - ${CLEAN_FILES} - PROPERTIES - COMPILE_FLAGS -Werror - ) -endif() - -set(wspython_LIBS - ${PYTHON_LIBRARIES} + wspython/wspy_register.c + wspython/wspy_proto.c ) -add_library(wspython STATIC - ${WSPYTHON_FILES} -) -set_target_properties(wspython PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS}) - -target_link_libraries(wspython ${wspython_LIBS}) - install(PROGRAMS - register-dissector.py - wspy_dissector.py - wspy_libws.py + wspython/register-dissector.py + wspython/wspy_dissector.py + wspython/wspy_libws.py DESTINATION ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION} ) install(DIRECTORY - wspy_dissectors + wspython/wspy_dissectors DESTINATION ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION} PATTERN ".svn" EXCLUDE |