update cmake stuff

1 files changed, 31 insertions, 13 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 56e280e..14cc2a7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,13 +1,4 @@
-set(QT_USE_QTXML TRUE)
-set(QT_USE_QTWEBKIT TRUE)
-
-include(${QT_USE_FILE})
-
-file(GLOB_RECURSE EMUCHOOSER_RESOURCES "*.qrc")
-
-include_directories("/usr/include" "${CMAKE_CURRENT_BINARY_DIR}")
-
-################
+### CONFIGURE ##################################################################
 
 set(EMUCHOOSER_PLUGIN_PATH "/opt/openslx/plugin-repo/emuchooser")
 set(EMUCHOOSER_BIN_PATH "/var/opt/openslx/bin")
@@ -21,24 +12,51 @@ set(EMUCHOOSER_DEFAULT_HEIGHT "580")
 configure_file("Version.h.in" "Version.h")
 configure_file("Config.h.in" "Config.h")
 
-set(LCHOOSER_CONFIG_HEADERS "Version.h" "Config.h")
-#######
 
+
+### INCLUDES ###################################################################
+
+set(QT_USE_QTXML TRUE)
+set(QT_USE_QTWEBKIT TRUE)
+
+include(${QT_USE_FILE})
+
+find_package(PkgConfig)
+pkg_check_modules(LCHOOSER libChooser)
+
+include_directories("/usr/include" "${CMAKE_CURRENT_BINARY_DIR}" "${LCHOOSER_INCLUDE_DIRS}")
+
+set(EMUCHOOSER_CONFIG_HEADERS "Version.h" "Config.h")
 set(EMUCHOOSER_HEADERS "Globals.h")
 set(EMUCHOOSER_SOURCES "main.cpp" "Globals.cpp")
 
 set(EMUCHOOSER_MOC_HEADERS "Dialog.h" "JavaScriptInterface.h")
 set(EMUCHOOSER_MOC_SOURCES "Dialog.cpp" "JavaScriptInterface.cpp")
 
+file(GLOB_RECURSE EMUCHOOSER_RESOURCES "*.qrc")
+
 QT4_WRAP_CPP(EMUCHOOSER_MOC_SOURCES ${EMUCHOOSER_MOC_HEADERS})
 QT4_ADD_RESOURCES(EMUCHOOSER_RC_SOURCES ${EMUCHOOSER_RESOURCES})
 
+
+
+### BUILD ######################################################################
+
+
 add_executable (emuchooser ${EMUCHOOSER_SOURCES} ${EMUCHOOSER_MOC_SOURCES} ${EMUCHOOSER_RC_SOURCES} ${EMUCHOOSER_HEADERS} ${EMUCHOOSER_MOC_HEADERS})
 
-target_link_libraries(emuchooser "-lchooser" ${QT_LIBRARIES})
+target_link_libraries(emuchooser ${QT_LIBRARIES}  ${LCHOOSER_LDFLAGS} )
+
+
+
+### INSTALL ####################################################################
 
 INSTALL(TARGETS emuchooser RUNTIME DESTINATION bin)
 
+
+
+### BUILD PACKAGE ##############################################################
+
 set(CPACK_GENERATOR "DEB")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Sebastian Schmelzer <ssc@xss.nu>") #required
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "emuchooser")