diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-15 08:53:48 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-15 08:53:48 +0100 |
| commit | d4f1fc90188820a00a74a7e5fd04f6feffa7537e (patch) | |
| tree | 8de40811f49ed755004d0c104edfad8123b45623 /src | |
| parent | 8f1b7c6d44bb5e5f44b497e3260364407a98361e (diff) | |
| parent | 73246448ec8294d781bb7f223fce395d49bfb6e4 (diff) | |
| download | uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.tar.gz uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.tar.bz2 uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.tar.xz uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.zip | |
Merge branch 'dexela_simple_packaging'
Conflicts:
.gitignore
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.h.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/config.h.in b/src/config.h.in index e3911a1..d16158b 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -3,6 +3,8 @@ #cmakedefine HAVE_PHOTRON_FASTCAM #cmakedefine HAVE_UFO_CAMERA #cmakedefine HAVE_PYLON_CAMERA +#cmakedefine HAVE_DEXELA_CL #cmakedefine HAVE_MOCK_CAMERA -#define CONTROL_GLADE_PATH "${CMAKE_INSTALL_PREFIX}/share/libuca/control.glade" +//#define CONTROL_GLADE_PATH "${CMAKE_INSTALL_PREFIX}/share/libuca/control.glade" +#define CONTROL_GLADE_PATH "./control.glade" |