From: <ks...@us...> - 2010-03-16 18:08:48
|
Revision: 2075 http://nghost.svn.sourceforge.net/nghost/?rev=2075&view=rev Author: kshots Date: 2010-03-16 18:08:41 +0000 (Tue, 16 Mar 2010) Log Message: ----------- * Made an effort to make configuration changes work more smoothly - each section of libnghost now has its own library checks and lookups Modified Paths: -------------- libnghost/CMakeLists.txt libnghost/src/core/CMakeLists.txt libnghost/src/core/nghostcore.pc.in libnghost/src/dao/CMakeLists.txt libnghost/src/dao/nghostdao.pc.in libnghost/src/gui2/CMakeLists.txt libnghost/src/gui2/gfxengine.cpp libnghost/src/gui2/nghostgui2.pc.in libnghost/src/gui3/CMakeLists.txt libnghost/src/gui3/nghostgui3.pc.in libnghost/src/log/CMakeLists.txt libnghost/src/log/nghostlog.pc.in libnghost/src/net/CMakeLists.txt libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt libnghost/src/plugins/actionevents/test/CMakeLists.txt libnghost/src/plugins/actionevents/time/CMakeLists.txt libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt libnghost/src/plugins/db/mysql/CMakeLists.txt libnghost/src/plugins/db/sqlite/CMakeLists.txt libnghost/src/plugins/download/curl/CMakeLists.txt libnghost/src/plugins/interface/CMakeLists.txt libnghost/src/plugins/interface/nghostplugin.pc.in libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt libnghost/src/plugins/media/video/ipc/CMakeLists.txt libnghost/src/plugins/media/video/phonon/CMakeLists.txt libnghost/src/plugins/media/video/phonon/phononplayer.h libnghost/src/plugins/media/video/xine/CMakeLists.txt libnghost/src/plugins/sample/CMakeLists.txt Modified: libnghost/CMakeLists.txt =================================================================== --- libnghost/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -11,242 +11,16 @@ include(FindOpenGL) include(FindGLU) include(FindCURL) -option(enable_core - "Enables the core library" - ON) -option(enable_dao - "Enables the dao library" - ON) -option(enable_gui2 - "Enables the gui2 library" - ON) -option(enable_gui3 - "Enables the gui3 library" - OFF) -option(enable_log - "Enables the log library" - ON) -option(enable_net - "Enables the net library" - ON) -option(enable_hdradio - "Enables the hdradio actionevents plugin" - OFF) -option(enable_ncarinfo - "Enables the ncarinfo actionevents plugin" - OFF) -option(enable_ng2dbus - "Enables the ng2dbus actionevents plugin" - OFF) -option(enable_ngpsd - "Enables the ngpsd actionevents plugin" - OFF) -option(enable_test - "Enables the test actionevents plugin" - OFF) -option(enable_time - "Enables the time actionevents plugin" - OFF) -option(enable_voicesynth - "Enables the voicesynth actionevents plugin" - OFF) -option(enable_nweather - "Enables the nweather client plugin" - OFF) -option(enable_mysql - "Enables the mysql database plugin" - OFF) -option(enable_sqlite3 - "Enables the sqlite3 database plugin" - ON) -option(enable_curl - "Enables the curl download plugin" - OFF) -option(enable_plugin - "Enables the nghost plugin interface library" - ON) -option(enable_artgrabbern2o2k - "Enables the n2o2k artgrabber plugin" - OFF) -option(enable_audiogstreamer - "Enables the gstreamer audio plugin" - ON) -option(enable_videogstreamer - "Enables the video gstreamer plugin" - ON) -option(enable_videoipc - "Enables the IPC video plugin" - ON) -option(enable_videophonon - "Enables the phonon (qt4) video plugin" - OFF) -option(enable_videoxine - "Enables the xine video plugin" - OFF) -option(enable_sample - "Enables the sample plugin" - OFF) option(enable_maintainer "Enables the maintainer CFLAGS (-Wall -Werror)" OFF) -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${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 -the include files") -set(plugindir ${libdir}/nghost CACHE STRING "Sets the installation dir for the -plugins") -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(plugindir ${CMAKE_INSTALL_PREFIX}/lib/nghost CACHE STRING + "Sets the installation dir for the plugins") +set(sysconfdir /etc CACHE STRING + "Sets the installation dir for system configuration files") set(VERSION 2.5.3) add_definitions(-std=c++0x) if(enable_maintainer) add_definitions("-Wall -Werror") endif(enable_maintainer) -if(enable_core) - set(need_libtool ON) - set(need_sdl ON) - set(need_boost ON) - set(need_x11 ON) -endif(enable_core) -if(enable_dao) - set(need_sdl_image ON) - set(need_taglib ON) - set(need_qt ON) - set(QT_USE_QTSQL TRUE) -endif(enable_dao) -if(enable_gui2) - set(need_x11 ON) - set(need_glibmm ON) - set(need_xmlpp ON) - set(need_sdl ON) - set(need_sdl_ttf ON) - set(need_sdl_image ON) - set(need_GL ON) - set(need_GLU ON) -endif(enable_gui2) -if(enable_gui3) - set(need_clutter ON) -endif(enable_gui3) -if(enable_net) - set(need_sdl ON) -endif(enable_net) -if(enable_hdradio) - set(need_sdl ON) - set(need_sdl_image ON) - set(need_sdl_gfx ON) - set(need_x11 ON) -endif(enable_hdradio) -if(enable_ncarinfo) - set(need_qt ON) - set(QT_USE_QTDBUS TRUE) -endif(enable_ncarinfo) -if(enable_ng2dbus) - set(need_qt ON) - set(QT_USE_QTDBUS TRUE) -endif(enable_ng2dbus) -if(enable_ngpsd) - set(need_dbus ON) -endif(enable_ngpsd) -if(enable_test) - set(need_qt ON) -endif(enable_test) -if(enable_time) - set(need_sdl ON) -endif(enable_time) -if(enable_mysql) - set(need_mysql ON) -endif(enable_mysql) -if(enable_sqlite3) - set(need_sqlite3 ON) -endif(enable_sqlite3) -if(enable_curl) - set(need_curl ON) -endif(enable_curl) -if(enable_plugin) - set(need_libtool ON) -endif(enable_plugin) -if(enable_artgrabbern2o2k) - set(need_xmlpp ON) -endif(enable_artgrabbern2o2k) -if(enable_audiogstreamer) - set(need_gstreamer ON) -endif(enable_audiogstreamer) -if(enable_videogstreamer) - set(need_gstreamer ON) -endif(enable_videogstreamer) -if(enable_videophonon) - set(need_qt ON) - set(QT_USE_PHONON TRUE) -endif(enable_videophonon) -if(enable_videoxine) - set(need_xine ON) -endif(enable_videoxine) -if(need_qt) - find_package(Qt4 REQUIRED) - include(${QT_USE_FILE}) -endif(need_qt) -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_curl) - find_package(CURL REQUIRED) -endif(need_curl) -if(need_mysql) - find_package(MYSQL REQUIRED) -endif(need_mysql) -if(need_sdl) - find_package(SDL REQUIRED) -endif(need_sdl) -if(need_sdl_image) - find_package(SDL_image REQUIRED) -endif(need_sdl_image) -if(need_sdl_ttf) - find_package(SDL_ttf REQUIRED) -endif(need_sdl_ttf) -if(need_boost) - find_package(Boost REQUIRED) -endif(need_boost) -if(need_x11) - find_package(X11 REQUIRED) -endif(need_x11) -if(need_GL) - find_package(OpenGL REQUIRED) -endif(need_GL) -if(need_GLU) - find_package(GLU REQUIRED) -endif(need_GLU) -if(need_xine) - pkg_check_modules(xine REQUIRED libxine) -endif(need_xine) -if(need_sqlite3) - pkg_check_modules(sqlite3 REQUIRED sqlite3) -endif(need_sqlite3) -if(need_dbus) - pkg_check_modules(dbus REQUIRED dbus-1) -endif(need_dbus) -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_gstreamer) - pkg_check_modules(gstreamer REQUIRED gstreamer-0.10>=0.10.12) -endif(need_gstreamer) -if(need_clutter) - pkg_check_modules(clutter REQUIRED clutter-1.0>=1.0) -endif(need_clutter) add_subdirectory(src) Modified: libnghost/src/core/CMakeLists.txt =================================================================== --- libnghost/src/core/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/core/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,6 +1,14 @@ +option(enable_core "Enables the core library" ON) if(enable_core) - add_definitions(-DSYSCONFDIR="${sysconfdir}" -DBINDIR="${exec_prefix}" - -DDATAROOTDIR="${datadir}" -DPLUGIN_DIR="${plugindir}" + find_library(libtool_LIBRARY ltdl DOC "Libtool libraries") + find_path(libtool_INCLUDE_DIR ltdl.h DOC "Libtool headers") + find_package(SDL REQUIRED) + find_package(Boost REQUIRED) + find_package(X11 REQUIRED) + add_definitions(-DSYSCONFDIR="${sysconfdir}" + -DBINDIR="${CMAKE_INSTALL_PREFIX}/bin" + -DDATAROOTDIR="${CMAKE_INSTALL_PREFIX}/share/nghost" + -DPLUGIN_DIR="${plugindir}" -DPACKAGE_NAME="${CMAKE_PROJECT_NAME}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostcore.pc.in ${CMAKE_BINARY_DIR}/nghostcore.pc @ONLY) @@ -17,20 +25,18 @@ add_library(nghostcore SHARED ${core_sources}) add_library(nghostcore-static STATIC ${core_sources}) add_dependencies(nghostcore-static nghostlog nghostplugin) - set_property(TARGET nghostcore APPEND PROPERTY PUBLIC_HEADER - ${core_headers}) - set_property(TARGET nghostcore PROPERTY SOVERSION 0.0.0) set_target_properties(nghostcore-static PROPERTIES OUTPUT_NAME - nghostcore) - set_target_properties(nghostcore PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostcore-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) - target_link_libraries(nghostcore-static nghsotlog nghostplugin + nghostcore CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostcore PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${core_headers} SOVERSION 0.0.0) + target_link_libraries(nghostcore-static nghostlog nghostplugin ${SDL_LIBRARY} ${libtool_LIBRARY} ${X11_LIBRARIES}) + target_link_libraries(nghostcore ${SDL_LIBRARY} ${libtool_LIBRARY} + ${X11_LIBRARIES}) install(TARGETS nghostcore nghostcore-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostcore.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_core) Modified: libnghost/src/core/nghostcore.pc.in =================================================================== --- libnghost/src/core/nghostcore.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/core/nghostcore.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostcore Description: nGhost vehicle multimedia frontend - core module Modified: libnghost/src/dao/CMakeLists.txt =================================================================== --- libnghost/src/dao/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/dao/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,10 @@ +option(enable_dao "Enables the dao nghost library" ON) if(enable_dao) + set(QT_USE_QTSQL TRUE) + find_package(Qt4 REQUIRED) + find_package(SDL_image REQUIRED) + pkg_check_modules(taglib REQUIRED taglib>=1.4) + include(${QT_USE_FILE}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostdao.pc.in ${CMAKE_BINARY_DIR}/nghostdao.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -16,20 +22,18 @@ add_library(nghostdao SHARED ${dao_sources}) add_library(nghostdao-static STATIC ${dao_sources}) add_dependencies(nghostdao-static nghostcore nghostlog nghostplugin) - set_property(TARGET nghostdao APPEND PROPERTY PUBLIC_HEADER - ${dao_headers}) - set_property(TARGET nghostdao PROPERTY SOVERSION 0.0.0) set_target_properties(nghostdao-static PROPERTIES OUTPUT_NAME - nghostdao) - set_target_properties(nghostdao PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostdao-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) + nghostdao CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostdao PROPERTIES PUBLIC_HEADER + ${dao_headers} SOVERSION 0.0.0 CLEAN_DIRECT_OUTPUT 1) target_link_libraries(nghostdao-static nghostcore nghostlog nghostplugin ${SDLIMAGE_LIBRARY} ${taglib_LIBRARIES} ${QT_LIBRARIES}) + target_link_libraries(nghostdao ${SDLIMAGE_LIBRARY} + ${taglib_LIBRARIES} ${QT_LIBRARIES}) install(TARGETS nghostdao nghostdao-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostdao.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_dao) Modified: libnghost/src/dao/nghostdao.pc.in =================================================================== --- libnghost/src/dao/nghostdao.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/dao/nghostdao.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostdao Description: DAO library for use with nghost projects Modified: libnghost/src/gui2/CMakeLists.txt =================================================================== --- libnghost/src/gui2/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui2/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,13 @@ +option(enable_gui2 "nghost2 gui library" ON) if(enable_gui2) + find_package(X11 REQUIRED) + find_package(SDL REQUIRED) + find_package(SDL_image REQUIRED) + find_package(SDL_ttf REQUIRED) + find_package(OpenGL REQUIRED) + find_package(GLU REQUIRED) + pkg_check_modules(glibmm REQUIRED glibmm-2.4) + pkg_check_modules(xmlpp REQUIRED libxml++-2.6) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostgui2.pc.in ${CMAKE_BINARY_DIR}/nghostgui2.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -23,23 +32,23 @@ add_library(nghostgui2-static STATIC ${gui2_sources}) add_dependencies(nghostgui2-static nghostlog nghostcore nghostdao nghostnet nghostplugin) - set_property(TARGET nghostgui2 APPEND PROPERTY PUBLIC_HEADER - ${gui2_headers}) - set_property(TARGET nghostgui2 PROPERTY SOVERSION 0.0.0) set_target_properties(nghostgui2-static PROPERTIES OUTPUT_NAME - nghostgui2) - set_target_properties(nghostgui2 PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostgui2-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) + nghostgui2 CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostgui2 PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${gui2_headers} SOVERSION 0.0.0) target_link_libraries(nghostgui2-static nghostlog nghostcore nghostdao nghostnet nghostplugin ${glibmm_LIBRARIES} ${xmlpp_LIBRARIES} ${X11_LIBRARIES} ${SDL_gfx_LIBRARY} ${SDLTTF_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARIES}) + target_link_libraries(nghostgui2 ${glibmm_LIBRARIES} + ${xmlpp_LIBRARIES} ${X11_LIBRARIES} ${SDL_gfx_LIBRARY} + ${SDLTTF_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDL_LIBRARY} + ${GLU_LIBRARY} ${OPENGL_LIBRARIES}) install(TARGETS nghostgui2 nghostgui2-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostgui2.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_gui2) Modified: libnghost/src/gui2/gfxengine.cpp =================================================================== --- libnghost/src/gui2/gfxengine.cpp 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui2/gfxengine.cpp 2010-03-16 18:08:41 UTC (rev 2075) @@ -17,7 +17,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. du * ***************************************************************************/ -#include <QWidget> #include <sstream> #include <string.h> #include <X11/X.h> Modified: libnghost/src/gui2/nghostgui2.pc.in =================================================================== --- libnghost/src/gui2/nghostgui2.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui2/nghostgui2.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostgui Description: gui library for use in nghost projects Modified: libnghost/src/gui3/CMakeLists.txt =================================================================== --- libnghost/src/gui3/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui3/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_gui3 "nghost2 gui3 library" OFF) if(enable_gui3) + pkg_check_modules(clutter REQUIRED clutter-1.0>=1.0) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostgui3.pc.in ${CMAKE_BINARY_DIR}/nghostgui3.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/core @@ -9,19 +11,16 @@ add_library(nghostgui3-static STATIC ${gui3_sources}) add_dependencies(nghostgui3-static nghostcore) set_target_properties(nghostgui3-static PROPERTIES OUTPUT_NAME - nghostgui3) - set_target_properties(nghostgui3 PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostgui3-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) - set_property(TARGET nghostgui3 APPEND PROPERTY PUBLIC_HEADER - ${gui3_headers}) - set_property(TARGET nghostgui3 PROPERTY SOVERSION 0.0.0) + nghostgui3 CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostgui3 PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${gui3_headers} SOVERSION 0.0.0) target_link_libraries(nghostgui3-static nghostcore ${clutter_LIBRARIES}) + target_link_libraries(nghostgui3 ${clutter_LIBRARIES}) install(TARGETS nghostgui3 nghostgui3-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostgui3.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_gui3) Modified: libnghost/src/gui3/nghostgui3.pc.in =================================================================== --- libnghost/src/gui3/nghostgui3.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui3/nghostgui3.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostgui3 Description: gui library for use in nghost3 projects Modified: libnghost/src/log/CMakeLists.txt =================================================================== --- libnghost/src/log/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/log/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_log "nghost2 log library" ON) if(enable_log) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostlog.pc.in ${CMAKE_BINARY_DIR}/nghostlog.pc @ONLY) @@ -7,18 +8,15 @@ set(log_sources debugtransportsyslog.cpp ndebug.cpp nerror.cpp) add_library(nghostlog SHARED ${log_sources}) add_library(nghostlog-static STATIC ${log_sources}) - set_property(TARGET nghostlog APPEND PROPERTY PUBLIC_HEADER - ${log_headers}) - set_property(TARGET nghostlog PROPERTY SOVERSION 0.0.0) + set_target_properties(nghostlog PROPERTIES CLEAN_DIRECT_OUTPUT 1 + SOVERSION 0.0.0) set_target_properties(nghostlog-static PROPERTIES OUTPUT_NAME - nghostlog) - set_target_properties(nghostlog PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostlog-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) + nghostlog CLEAN_DIRECT_OUTPUT 1) + set_property(TARGET nghostlog PROPERTY PUBLIC_HEADER ${log_headers}) install(TARGETS nghostlog nghostlog-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostlog.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_log) Modified: libnghost/src/log/nghostlog.pc.in =================================================================== --- libnghost/src/log/nghostlog.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/log/nghostlog.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostlog Description: log library for use in nghost projects Modified: libnghost/src/net/CMakeLists.txt =================================================================== --- libnghost/src/net/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/net/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_net "nghost2 net library" ON) if(enable_net) + find_package(SDL REQUIRED) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostnet.pc.in ${CMAKE_BINARY_DIR}/nghostnet.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -10,19 +12,16 @@ add_library(nghostnet-static STATIC ${net_sources}) add_dependencies(nghostnet-static nghostlog nghostcore) set_target_properties(nghostnet-static PROPERTIES OUTPUT_NAME - nghostnet) - set_target_properties(nghostnet PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostnet-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) - set_property(TARGET nghostnet APPEND PROPERTY PUBLIC_HEADER - ${net_headers}) - set_property(TARGET nghostnet PROPERTY SOVERSION 0.0.0) + nghostnet CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostnet PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${net_headers} SOVERSION 0.0.0) target_link_libraries(nghostnet-static nghostlog nghostcore ${SDL_LIBRARY}) + target_link_libraries(nghostnet ${SDL_LIBRARY}) install(TARGETS nghostnet nghostnet-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostnet.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_net) Modified: libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,9 @@ +option(enable_hdradio "nghost hdradio plugin" OFF) if(enable_hdradio) + find_package(SDL REQUIRED) + find_package(SDL_image REQUIRED) + find_package(SDL_gfx REQUIRED) + find_package(X11 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/gui2 ${CMAKE_SOURCE_DIR}/src/net ${CMAKE_SOURCE_DIR}/src/log Modified: libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_ncarinfo "nghost2 ncarinfo plugin" OFF) if(enable_ncarinfo) + find_package(Qt4 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/dao ${CMAKE_SOURCE_DIR}/src/gui2 ${CMAKE_SOURCE_DIR}/src/net Modified: libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_ng2dbus "nghost2 dbus plugin" OFF) if(enable_ng2dbus) + find_package(Qt4 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log) set(ng2dbus_headers ng2dbus.h adaptor.h nghostdbus.h) Modified: libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_ngpsd "nghost2 gpsd plugin" OFF) if(enable_ngpsd) + pkg_check_modules(dbus REQUIRED dbus-1) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log ${dbus_INCLUDE_DIRS}) Modified: libnghost/src/plugins/actionevents/test/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/test/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/test/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_test "nghost2 test plugin" OFF) if(enable_test) + find_package(Qt4 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log) set(test_headers test.h) Modified: libnghost/src/plugins/actionevents/time/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/time/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/time/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_time "nghost2 time plugin" OFF) if(enable_time) + find_package(SDL REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log ${SDL_INCLUDE_DIR}) Modified: libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_voicesynth "nghost2 voicesynth plugin" OFF) if(enable_voicesynth) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log Modified: libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt =================================================================== --- libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_nweather "nghost2 nweather client plugin" OFF) if(enable_nweather) install(FILES weather.conf DESTINATION ${sysconfdir}/nghost) @@ -2,3 +3,3 @@ install(PROGRAMS nweather.py weather.py - DESTINATION ${datadir}/bin) + DESTINATION bin) endif(enable_nweather) Modified: libnghost/src/plugins/db/mysql/CMakeLists.txt =================================================================== --- libnghost/src/plugins/db/mysql/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/db/mysql/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_mysql "nghost2 mysql database plugin" OFF) if(enable_mysql) + find_package(MYSQL REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${MYSQL_INCLUDE_DIR}) set(mysql_database_headers mysqldatabase.h) Modified: libnghost/src/plugins/db/sqlite/CMakeLists.txt =================================================================== --- libnghost/src/plugins/db/sqlite/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/db/sqlite/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_sqlite3 "nghost2 sqlite3 database plugin" ON) if(enable_sqlite3) + pkg_check_modules(sqlite3 REQUIRED sqlite3) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${sqlite3_INCLUDE_DIRS}) set(sqlite_database_headers sqlitedatabase.h) Modified: libnghost/src/plugins/download/curl/CMakeLists.txt =================================================================== --- libnghost/src/plugins/download/curl/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/download/curl/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_curl "nghost2 curl download plugin" OFF) if(enable_curl) + find_package(CURL REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CURL_INCLUDE_DIRS}) set(curl_headers download.h) Modified: libnghost/src/plugins/interface/CMakeLists.txt =================================================================== --- libnghost/src/plugins/interface/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/interface/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,7 @@ +option(enable_plugin "nghost plugin interface library" ON) if(enable_plugin) + find_library(libtool_LIBRARY ltdl DOC "Libtool libraries") + find_path(libtool_INCLUDE_DIR ltdl.h DOC "Libtool headers") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostplugin.pc.in ${CMAKE_BINARY_DIR}/nghostplugin.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -17,19 +20,16 @@ add_library(nghostplugin-static STATIC ${plugin_sources}) add_dependencies(nghostplugin-static nghostlog nghostcore nghostgui2) set_target_properties(nghostplugin-static PROPERTIES OUTPUT_NAME - nghostplugin) - set_target_properties(nghostplugin PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostplugin-static PROPERTIES - CLEAN_DIRECT_OUTPUT 1) - set_property(TARGET nghostplugin APPEND PROPERTY PUBLIC_HEADER - ${plugin_headers}) - set_property(TARGET nghostplugin PROPERTY SOVERSION 0.0.0) + nghostplugin CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostplugin PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${plugin_headers} SOVERSION 0.0.0) target_link_libraries(nghostplugin-static nghostlog nghostcore nghostgui2 ${libtool_LIBRARY}) + target_link_libraries(nghostplugin ${libtool_LIBRARY}) install(TARGETS nghostplugin nghostplugin-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostplugin.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_plugin) Modified: libnghost/src/plugins/interface/nghostplugin.pc.in =================================================================== --- libnghost/src/plugins/interface/nghostplugin.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/interface/nghostplugin.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@/bin +libdir=@CMAKE_INSTALL_PREFIX@/lib +includedir=@CMAKE_INSTALL_PREFIX@/lib/nghost plugindir=@plugindir@ Name: nghostplugin Modified: libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_artgrabbern2o2k "nghost2 n2o2k artgrabber plugin" OFF) if(enable_artgrabbern2o2k) + pkg_check_modules(xmlpp REQUIRED libxml++-2.6) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${xmlpp_INCLUDE_DIRS}) Modified: libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_audiogstreamer "nghost2 multimedia audio plugin - gstreamer" ON) if(enable_audiogstreamer) + pkg_check_modules(gstreamer REQUIRED gstreamer-0.10>=0.10.12) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${gstreamer_INCLUDE_DIRS}) Modified: libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_videogstreamer "nghost2 multimedia video plugin - gstreamer" ON) if(enable_videogstreamer) + pkg_check_modules(gstreamer REQUIRED gstreamer-0.10>=0.10.12) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${gstreamer_INCLUDE_DIRS}) Modified: libnghost/src/plugins/media/video/ipc/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/ipc/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/ipc/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_videoipc "nghost2 multimedia video plugin - ipc" OFF) if(enable_videoipc) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core) Modified: libnghost/src/plugins/media/video/phonon/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/phonon/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/phonon/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,7 @@ +option(enable_videophonon "nghost2 multimedia video plugin - phonon" ON) if(enable_videophonon) + find_package(Qt4 REQUIRED) + set(QT_USE_PHONON TRUE) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core) set(videophonon_headers phononplayer.h) Modified: libnghost/src/plugins/media/video/phonon/phononplayer.h =================================================================== --- libnghost/src/plugins/media/video/phonon/phononplayer.h 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/phonon/phononplayer.h 2010-03-16 18:08:41 UTC (rev 2075) @@ -23,7 +23,7 @@ // nghost_plugin.h defined virtual std::string pluginName()const{return "phonon media player";} virtual std::string pluginAuthor()const{return "Richard \"KShots\" F. Ostrow Jr. and Kevron \"Tripzero\" Rees";} - virtual std::string pluginDescription()const{return "Media player utilizing the Qt-4.5 phonon libraries";} + virtual std::string pluginDescription()const{return "Media player utilizing the Qt-4.x phonon libraries";} virtual std::string pluginVersion()const{return "0.0.1";} // nghost_plugin_media.h defined Modified: libnghost/src/plugins/media/video/xine/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/xine/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/xine/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_videoxine "nghost2 multimedia video plugin - xine" OFF) if(enable_videoxine) + pkg_check_modules(xine REQUIRED libxine) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${xine_INCLUDE_DIRS}) Modified: libnghost/src/plugins/sample/CMakeLists.txt =================================================================== --- libnghost/src/plugins/sample/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/sample/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_sample "nghost2 sample plugin" OFF) if(enable_sample) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface) set(sample_headers sample.h) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |