From a296593e6717a3cfa8253c4dfcf503c11147d507 Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Wed, 2 Nov 2011 17:00:22 +0100 Subject: foobar --- src/CMakeLists.txt | 9 +++++---- src/Config.h.in | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f2ffdd0..96d2d5e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,12 +13,13 @@ set(LCHOOSER_MOC_HEADERS "SessionTreeModel.h") set(LCHOOSER_MOC_SOURCES "SessionTreeModel.cpp") set(LCHOOSER_HEADERS "Session.h" "SessionTreeItem.h" "VSession.h" "VSessionHandler.h" "XSession.h" "XSessionHandler.h") set(LCHOOSER_SOURCES "SessionTreeItem.cpp" "VSession.cpp" "VSessionHandler.cpp" "XSession.cpp" "XSessionHandler.cpp") +set(LCHOOSER_CONFIG_HEADERS "Version.h" "Config.h") QT4_WRAP_CPP(LCHOOSER_MOC_SOURCES ${LCHOOSER_MOC_HEADERS}) -add_library (Chooser_static STATIC ${LCHOOSER_SOURCES} ${LCHOOSER_MOC_SOURCES} ${LCHOOSER_HEADERS} ${LCHOOSER_MOC_HEADERS}) +add_library (Chooser_static STATIC ${LCHOOSER_SOURCES} ${LCHOOSER_MOC_SOURCES} ${LCHOOSER_HEADERS} ${LCHOOSER_MOC_HEADERS} ${LCHOOSER_CONFIG_HEADERS}) set_target_properties (Chooser_static PROPERTIES OUTPUT_NAME Chooser) -add_library (Chooser_shared SHARED ${LCHOOSER_SOURCES} ${LCHOOSER_MOC_SOURCES} ${LCHOOSER_HEADERS} ${LCHOOSER_MOC_HEADERS}) +add_library (Chooser_shared SHARED ${LCHOOSER_SOURCES} ${LCHOOSER_MOC_SOURCES} ${LCHOOSER_HEADERS} ${LCHOOSER_MOC_HEADERS} ${LCHOOSER_CONFIG_HEADERS}) set_target_properties (Chooser_shared PROPERTIES OUTPUT_NAME Chooser) install(TARGETS Chooser_static Chooser_shared @@ -40,8 +41,8 @@ set(CPACK_COMPONENT_DEV_DEPENDS libs) set(CPACK_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Sebastian Schmelzer ") #required -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "emuchooser is ...") -set(CPACK_PACKAGE_DESCRIPTION "...") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Library for vmchooser and emuchooser..") +set(CPACK_PACKAGE_DESCRIPTION "Library for vmchooser and emuchooser..") set(CPACK_PACKAGE_VERSION "${libChooser_VERSION_MAJOR}.${libChooser_VERSION_MINOR}.${libChooser_VERSION_PATCH}") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtcore4") set(CPACK_DEBIAN_PACKAGE_SECTION "misc") diff --git a/src/Config.h.in b/src/Config.h.in index bce2669..31381b0 100644 --- a/src/Config.h.in +++ b/src/Config.h.in @@ -1,6 +1,6 @@ #ifndef CONFIG_H #define CONFIG_H -#cmakedefine DEBUG 1 +#cmakedefine DEBUG @DEBUG@ #endif //CONFIG_H -- cgit v1.2.3-55-g7522