Merge remote branch 'origin/master' into dexela

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/uca-camera.c

1 files changed, 45 insertions, 4 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dffd35d..bef3712 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,8 @@ project(uca C)
 
 set(TARNAME "libuca")
 set(UCA_VERSION_MAJOR "1")
-set(UCA_VERSION_MINOR "0")
-set(UCA_VERSION_PATCH "2dev")
+set(UCA_VERSION_MINOR "1")
+set(UCA_VERSION_PATCH "0dev")
 set(UCA_DESCRIPTION "Unified Camera Access")
 
 set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}")
@@ -16,7 +16,7 @@ set(PACKAGE_TARNAME "${TARNAME}")
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket")
 
-set(CPACK_GENERATOR "DEB;RPM;")
+set(CPACK_GENERATOR "RPM")
 set(CPACK_PACKAGE_RELEASE 3)
 set(CPACK_DEBIAN_PACKAGE_NAME "libuca")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang <matthias.vogelgesang@kit.edu>")
@@ -25,7 +25,48 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY ${UCA_DESCRIPTION})
 
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
 
-SET(UCA_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(UCA_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+
+set(UCA_ENUM_HDRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/uca-camera.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/plugins/pco/uca-pco-camera.h)
+
+
+# ---  Common configuration ---------------------------------------------------
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.sh.in
+               ${CMAKE_CURRENT_BINARY_DIR}/package.sh)
+
+
+# --- Common flags ------------------------------------------------------------
+
+add_definitions("-std=c99 -Wall")
+
+
+# --- Common libraries --------------------------------------------------------
+
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+find_package(PkgConfig)
+find_program(GLIB2_MKENUMS glib-mkenums REQUIRED)
+pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED)
+pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED)
+pkg_check_modules(GMODULE2 gmodule-2.0>=2.24 REQUIRED)
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${GLIB2_INCLUDE_DIRS}
+    ${GOBJECT2_INCLUDE_DIRS})
+
+set(UCA_DEPS
+    ${GLIB2_LIBRARIES}
+    ${GOBJECT2_LIBRARIES}
+    ${GMODULE2_LIBRARIES})
 
 add_subdirectory(src)
+add_subdirectory(plugins)
 add_subdirectory(test)
+add_subdirectory(tools)