diff options
| -rw-r--r-- | epan/wspython/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugins/tpg/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ui/gtk/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ui/qt/CMakeLists.txt | 17 |
4 files changed, 2 insertions, 26 deletions
diff --git a/epan/wspython/CMakeLists.txt b/epan/wspython/CMakeLists.txt index e99d17df56..ef565baa38 100644 --- a/epan/wspython/CMakeLists.txt +++ b/epan/wspython/CMakeLists.txt @@ -30,14 +30,14 @@ install(PROGRAMS wspython/register-dissector.py wspython/wspy_dissector.py wspython/wspy_libws.py - DESTINATION + DESTINATION ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION} ) install(DIRECTORY wspython/wspy_dissectors - DESTINATION + DESTINATION ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION} PATTERN ".svn" EXCLUDE ) diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt index 7b9f2bc997..7be20d76f8 100644 --- a/plugins/tpg/CMakeLists.txt +++ b/plugins/tpg/CMakeLists.txt @@ -51,7 +51,6 @@ ADD_CUSTOM_COMMAND( ${_tpg}/tpg.yp DEPENDS ${_tpg}/tpg.yp - ) ADD_CUSTOM_COMMAND( diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt index f0a172de87..69692b6adf 100644 --- a/ui/gtk/CMakeLists.txt +++ b/ui/gtk/CMakeLists.txt @@ -280,9 +280,3 @@ install( PATTERN ".svn" EXCLUDE ) -#install(TARGETS ui -# LIBRARY DESTINATION lib -# RUNTIME DESTINATION lib -# ARCHIVE DESTINATION lib -#) - diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index d6bd7e0cf2..2b686a658d 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -153,20 +153,3 @@ add_library(qtui STATIC ) set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") -#install( -# DIRECTORY -# . -# DIRECTORY_PERMISSIONS -# OWNER_EXECUTE OWNER_WRITE OWNER_READ -# GROUP_EXECUTE GROUP_READ -# WORLD_EXECUTE WORLD_READ -# DESTINATION -# ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME} -#) - -#install(TARGETS ui -# LIBRARY DESTINATION lib -# RUNTIME DESTINATION lib -# ARCHIVE DESTINATION lib -#) - |