CMake:

- Add opcua to the list of plugins to build
- Link the gtk stuff statically into wireshark
- Beginnings of "make install"
- Change a few things about install paths

svn path=/trunk/; revision=30029

1 files changed, 11 insertions, 8 deletions

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 894fa55a36..f3ce7afc9a 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -1,16 +1,22 @@
 /* cmakeconfig.h.in */
 
+/* Note: You cannot use earlier #defines in later #cmakedefines (cmake 2.6.2). */
+
 /* Version number of package */
-#define VERSION "@CPACK_PACKAGE_VERSION@"
+#define VERSION "${CPACK_PACKAGE_VERSION}"
 
+/* FIXME: Move the path stuff to the CMakeInstallDirs.cmake file */
 /* Directory for data */
-#define DATAFILE_DIR "@CMAKE_INSTALL_PREFIX@/share/@CPACK_PACKAGE_NAME@"
+#define DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}"
 
-/* Define to 1 if we want to enable plugins */
-#cmakedefine HAVE_PLUGINS 1
+/* Path to Python. */
+#cmakedefine PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/python/${CPACK_PACKAGE_VERSION}"
 
 /* Directory where plugins reside */
-#define PLUGIN_DIR "${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}"
+#define PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}"
+
+/* Define to 1 if we want to enable plugins */
+#cmakedefine HAVE_PLUGINS 1
 
 /* Link plugins statically into Wireshark */
 #cmakedefine ENABLE_STATIC 1
@@ -123,9 +129,6 @@
 /* Define to 1 if you have libpython. */
 #cmakedefine HAVE_PYTHON 1
 
-/* Path to Python. */
-#cmakedefine PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/${CPACK_PACKAGE_NAME}/python/${VERSION}"
-
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H 1