diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-10-29 08:48:27 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-10-29 08:48:27 +0100 |
| commit | 85a0f33711fd4467b9027da85ab9e09e406398d4 (patch) | |
| tree | abe8cd4fd01a44d7237ac8258d21899606e22b00 /bin/gui | |
| parent | 23211065e9be0d02f5a93c7ab1b6a95e0b38a7ba (diff) | |
| download | uca-85a0f33711fd4467b9027da85ab9e09e406398d4.tar.gz uca-85a0f33711fd4467b9027da85ab9e09e406398d4.tar.bz2 uca-85a0f33711fd4467b9027da85ab9e09e406398d4.tar.xz uca-85a0f33711fd4467b9027da85ab9e09e406398d4.zip | |
Cleanup CMakeLists.txt
Diffstat (limited to 'bin/gui')
| -rw-r--r-- | bin/gui/CMakeLists.txt | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/bin/gui/CMakeLists.txt b/bin/gui/CMakeLists.txt index c42bf35..bb5a8f4 100644 --- a/bin/gui/CMakeLists.txt +++ b/bin/gui/CMakeLists.txt @@ -1,8 +1,6 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.6) -add_definitions("--std=c99 -Wall") - -# --- Find packages and libraries --------------------------------------------- +#{{{ Configure find_package(PkgConfig) pkg_check_modules(GTK2 gtk+-2.0>=2.22) @@ -13,12 +11,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.glade ${CMAKE_CURRENT_BINARY_DIR}) - -# --- Build targets ----------------------------------------------------------- -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - +#}}} +#{{{ Target if (GTK2_FOUND) - include_directories(${GTK2_INCLUDE_DIRS}) + include_directories(${GTK2_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR}) set(BINARY "uca-camera-control") add_executable(${BINARY} @@ -31,7 +28,7 @@ if (GTK2_FOUND) m uca ringbuffer - ${GTK2_LIBRARIES} + ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES}) install(TARGETS ${BINARY} @@ -40,3 +37,4 @@ if (GTK2_FOUND) install(FILES control.glade DESTINATION share/libuca) endif() +#}}} |