[Nghost-commits] SF.net SVN: nghost:[2077] nghost2/branches/nghost2-qt

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 2077
          http://nghost.svn.sourceforge.net/nghost/?rev=2077&view=rev
Author:   kshots
Date:     2010-03-19 17:00:39 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
* Cleaned up qt branch to match current lib style in cmake

Modified Paths:
--------------
    nghost2/branches/nghost2-qt/CMakeLists.txt
    nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt
    nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt

Modified: nghost2/branches/nghost2-qt/CMakeLists.txt
===================================================================

--- nghost2/branches/nghost2-qt/CMakeLists.txt	2010-03-16 19:06:17 UTC (rev 2076)
+++ nghost2/branches/nghost2-qt/CMakeLists.txt	2010-03-19 17:00:39 UTC (rev 2077)
@@ -7,26 +7,12 @@
 include(FindSDL_ttf)
 include(FindSDL)
 include(FindQt4)
-option(enable_nscan
-	"Enables the nscan daemon"
-	ON)
-option(enable_nghost
-	"Enables the nghost application"
-	ON)
 option(enable_maintainer
 	"Enables the maintainer CFLAGS (-Wall -Werror)"
 	OFF)
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE STRING "Sets the installation dir for the executables")
-set(libdir ${prefix}/lib CACHE STRING "Sets the installation dir for the
-libraries")
-set(includedir ${prefix}/include CACHE STRING "Sets the installation dir for
-includes")
-set(datadir ${prefix}/share/nghost CACHE STRING "Sets the installation dir for
-data objects")
 set(sysconfdir /etc CACHE STRING "Sets the installation dir for system
 configuration files")
-set(xprefix ${prefix} CACHE STRING "Sets the X installation dir")
+set(xprefix ${CMAKE_INSTALL_PREFIX} CACHE STRING "Sets the X installation dir")
 set(pidfile /var/run/nscan CACHE STRING "Sets the compiled-in default pid
 file for nscan")
 set(dbusconfdir /etc/dbus-1/system.d CACHE STRING "Sets the location that
@@ -45,76 +31,4 @@
 if(enable_maintainer)
 	add_definitions("-Wall -Werror")
 endif(enable_maintainer)
-if(enable_nscan)
-	set(need_taglib ON)
-	set(need_sdl ON)
-	set(need_nghostplugin ON)
-	set(need_nghostlog ON)
-	set(need_nghostcore ON)
-	set(need_nghostdao ON)
-	set(need_nghostnet ON)
-	set(need_qt ON)
-	set(QT_USE_QTDBUS TRUE)
-	set(QT_USE_QTSQL TRUE)
-endif(enable_nscan)
-if(enable_nghost)
-	set(need_sdl ON)
-	set(need_qt ON)
-	set(need_glibmm ON)
-	set(need_xmlpp ON)
-	set(need_taglib ON)
-	set(need_nghostcore ON)
-	set(need_nghostdao ON)
-	set(need_nghostgui2 ON)
-	set(need_nghostlog ON)
-	set(need_nghostnet ON)
-	set(need_nghostplugin ON)
-	set(need_libtool ON)
-	set(QT_USE_QTDBUS TRUE)
-	set(QT_USE_QTSQL TRUE)
-endif(enable_nghost)
-if(need_libtool)
-	find_library(libtool_LIBRARY
-		ltdl
-		DOC "Libtool libraries")
-	find_path(libtool_INCLUDE_DIR
-		ltdl.h
-		DOC "Libtool headers")
-endif(need_libtool)
-if(need_qt)
-	find_package(Qt4 REQUIRED)
-	include(${QT_USE_FILE})
-endif(need_qt)
-if(need_sdl)
-	find_package(SDL REQUIRED)
-	find_package(SDL_image REQUIRED)
-	find_package(SDL_ttf REQUIRED)
-endif(need_sdl)
-if(need_glibmm)
-	pkg_check_modules(glibmm REQUIRED glibmm-2.4)
-endif(need_glibmm)
-if(need_xmlpp)
-	pkg_check_modules(xmlpp REQUIRED libxml++-2.6)
-endif(need_xmlpp)
-if(need_taglib)
-	pkg_check_modules(taglib REQUIRED taglib>=1.4)
-endif(need_taglib)
-if(need_nghostcore)
-	pkg_check_modules(nghostcore REQUIRED nghostcore)
-endif(need_nghostcore)
-if(need_nghostdao)
-	pkg_check_modules(nghostdao REQUIRED nghostdao)
-endif(need_nghostdao)
-if(need_nghostgui2)
-	pkg_check_modules(nghostgui2 REQUIRED nghostgui2)
-endif(need_nghostgui2)
-if(need_nghostlog)
-	pkg_check_modules(nghostlog REQUIRED nghostlog)
-endif(need_nghostlog)
-if(need_nghostnet)
-	pkg_check_modules(nghostnet REQUIRED nghostnet)
-endif(need_nghostnet)
-if(need_nghostplugin)
-	pkg_check_modules(nghostplugin REQUIRED nghostplugin)
-endif(need_nghostplugin)
 add_subdirectory(src)

Modified: nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt
===================================================================
--- nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt	2010-03-16 19:06:17 UTC (rev 2076)
+++ nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt	2010-03-19 17:00:39 UTC (rev 2077)
@@ -1,4 +1,21 @@
+option(enable_nghost "Enables the nghost application" ON)
 if(enable_nghost)
+	find_package(SDL REQUIRED)
+	pkg_check_modules(glibmm REQUIRED glibmm-2.4)
+	pkg_check_modules(xmlpp REQUIRED libxml++-2.6)
+	pkg_check_modules(taglib REQUIRED taglib>=1.4)
+	pkg_check_modules(nghostcore REQUIRED nghostcore)
+	pkg_check_modules(nghostdao REQUIRED nghostdao)
+	pkg_check_modules(nghostgui2 REQUIRED nghostgui2)
+	pkg_check_modules(nghostlog REQUIRED nghostlog)
+	pkg_check_modules(nghostnet REQUIRED nghostnet)
+	pkg_check_modules(nghostplugin REQUIRED nghostplugin)
+	find_library(libtool_LIBRARY ltdl DOC "Libtool libraries")
+	find_path(libtool_INCLUDE_DIR ltdl.h DOC "Libtool headers")
+	set(QT_USE_QTDBUS TRUE)
+	set(QT_USE_QTSQL TRUE)
+	find_package(Qt4 REQUIRED)
+	include(${QT_USE_FILE})
 	install(FILES nghost.conf connections.conf plugins.conf
 		DESTINATION ${sysconfdir}/nghost)
 	add_definitions(-DPLUGINDIR="${plugindir}")

Modified: nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt
===================================================================
--- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt	2010-03-16 19:06:17 UTC (rev 2076)
+++ nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt	2010-03-19 17:00:39 UTC (rev 2077)
@@ -1,4 +1,16 @@
+option(enable_nscan "Enables the nscan daemon" ON)
 if(enable_nscan)
+	pkg_check_modules(taglib REQUIRED taglib>=1.4)
+	find_package(SDL REQUIRED)
+	pkg_check_modules(nghostplugin REQUIRED nghostplugin)
+	pkg_check_modules(nghostlog REQUIRED nghostlog)
+	pkg_check_modules(nghostcore REQUIRED nghostcore)
+	pkg_check_modules(nghostdao REQUIRED nghostdao)
+	pkg_check_modules(nghostnet REQUIRED nghostnet)
+	set(QT_USE_QTDBUS TRUE)
+	set(QT_USE_QTSQL TRUE)
+	find_package(Qt4 REQUIRED)
+	include(${QT_USE_FILE})
 	install(FILES nscan.conf
 		DESTINATION ${sysconfdir}/nghost)
 	install(FILES nscan.dbus.conf
@@ -38,5 +50,5 @@
 		${nghostnet_LIBRARIES} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY}
 		${SDL_gfx_LIBRARY} ${libtool_LIBRARY} ${QT_LIBRARIES})
 	install(TARGETS nscan
-		RUNTIME DESTINATION ${exec_prefix})
+		RUNTIME DESTINATION sbin)
 endif(enable_nscan)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


