From 72b6fb118b34d4facd645b789c54309477fa2df0 Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Tue, 31 Aug 2010 06:08:21 -0600 Subject: [PATCH 1/3] Update: #842 Initial file/folder move for single project build. --- code/{nel => }/CMakeLists.txt | 0 .../CMakeModules/ConfigureChecks.cmake | 0 .../CMakeModules/Find3dsMaxSDK.cmake | 0 code/{nel => }/CMakeModules/FindCEGUI.cmake | 0 code/{nel => }/CMakeModules/FindCppTest.cmake | 0 code/{nel => }/CMakeModules/FindDInput.cmake | 0 code/{nel => }/CMakeModules/FindDSound.cmake | 0 .../CMakeModules/FindDirectXSDK.cmake | 0 code/{nel => }/CMakeModules/FindEFXUtil.cmake | 0 code/{nel => }/CMakeModules/FindFMOD.cmake | 0 .../{nel => }/CMakeModules/FindFreeType.cmake | 0 code/{nel => }/CMakeModules/FindGTK2.cmake | 0 code/{nel => }/CMakeModules/FindJpeg.cmake | 0 .../{ryzom => }/CMakeModules/FindLibwww.cmake | 0 code/{ryzom => }/CMakeModules/FindMySQL.cmake | 0 code/{nel => }/CMakeModules/FindOgg.cmake | 0 code/{nel => }/CMakeModules/FindS3TC.cmake | 0 code/{nel => }/CMakeModules/FindSTLport.cmake | 0 code/{nel => }/CMakeModules/FindSquish.cmake | 0 code/{nel => }/CMakeModules/FindVorbis.cmake | 0 .../CMakeModules/FindXF86VidMode.cmake | 0 code/{nel => }/CMakeModules/FindXRandR.cmake | 0 code/{ryzom => }/CMakeModules/FindZLIB.cmake | 0 code/{nel => }/CMakeModules/PCHSupport.cmake | 0 code/{nel => }/CMakeModules/nel.cmake | 0 code/{nel => }/CMakePackaging.txt | 0 code/{nel => }/CTestConfig.cmake | 0 code/nelns/CMakeModules/FindCEGUI.cmake | 51 -- code/nelns/CMakeModules/FindCppUnit.cmake | 51 -- code/nelns/CMakeModules/FindFreeType.cmake | 50 -- code/nelns/CMakeModules/FindGTK2.cmake | 453 ------------------ code/nelns/CMakeModules/FindJpeg.cmake | 50 -- code/nelns/CMakeModules/FindMySQL.cmake | 51 -- code/nelns/CMakeModules/FindNeL3D.cmake | 48 -- code/nelns/CMakeModules/FindNeLMISC.cmake | 52 -- code/nelns/CMakeModules/FindNeLNET.cmake | 52 -- code/nelns/CMakeModules/nel.cmake | 202 -------- code/ryzom/CMakeModules/FindNeL.cmake | 162 ------- code/ryzom/CMakeModules/PCHSupport.cmake | 212 -------- code/ryzom/CMakeModules/nel.cmake | 176 ------- 40 files changed, 1610 deletions(-) rename code/{nel => }/CMakeLists.txt (100%) rename code/{ryzom => }/CMakeModules/ConfigureChecks.cmake (100%) rename code/{nel => }/CMakeModules/Find3dsMaxSDK.cmake (100%) rename code/{nel => }/CMakeModules/FindCEGUI.cmake (100%) rename code/{nel => }/CMakeModules/FindCppTest.cmake (100%) rename code/{nel => }/CMakeModules/FindDInput.cmake (100%) rename code/{nel => }/CMakeModules/FindDSound.cmake (100%) rename code/{nel => }/CMakeModules/FindDirectXSDK.cmake (100%) rename code/{nel => }/CMakeModules/FindEFXUtil.cmake (100%) rename code/{nel => }/CMakeModules/FindFMOD.cmake (100%) rename code/{nel => }/CMakeModules/FindFreeType.cmake (100%) rename code/{nel => }/CMakeModules/FindGTK2.cmake (100%) rename code/{nel => }/CMakeModules/FindJpeg.cmake (100%) rename code/{ryzom => }/CMakeModules/FindLibwww.cmake (100%) rename code/{ryzom => }/CMakeModules/FindMySQL.cmake (100%) rename code/{nel => }/CMakeModules/FindOgg.cmake (100%) rename code/{nel => }/CMakeModules/FindS3TC.cmake (100%) rename code/{nel => }/CMakeModules/FindSTLport.cmake (100%) rename code/{nel => }/CMakeModules/FindSquish.cmake (100%) rename code/{nel => }/CMakeModules/FindVorbis.cmake (100%) rename code/{nel => }/CMakeModules/FindXF86VidMode.cmake (100%) rename code/{nel => }/CMakeModules/FindXRandR.cmake (100%) rename code/{ryzom => }/CMakeModules/FindZLIB.cmake (100%) rename code/{nel => }/CMakeModules/PCHSupport.cmake (100%) rename code/{nel => }/CMakeModules/nel.cmake (100%) rename code/{nel => }/CMakePackaging.txt (100%) rename code/{nel => }/CTestConfig.cmake (100%) delete mode 100644 code/nelns/CMakeModules/FindCEGUI.cmake delete mode 100644 code/nelns/CMakeModules/FindCppUnit.cmake delete mode 100644 code/nelns/CMakeModules/FindFreeType.cmake delete mode 100644 code/nelns/CMakeModules/FindGTK2.cmake delete mode 100644 code/nelns/CMakeModules/FindJpeg.cmake delete mode 100644 code/nelns/CMakeModules/FindMySQL.cmake delete mode 100644 code/nelns/CMakeModules/FindNeL3D.cmake delete mode 100644 code/nelns/CMakeModules/FindNeLMISC.cmake delete mode 100644 code/nelns/CMakeModules/FindNeLNET.cmake delete mode 100644 code/nelns/CMakeModules/nel.cmake delete mode 100644 code/ryzom/CMakeModules/FindNeL.cmake delete mode 100644 code/ryzom/CMakeModules/PCHSupport.cmake delete mode 100644 code/ryzom/CMakeModules/nel.cmake diff --git a/code/nel/CMakeLists.txt b/code/CMakeLists.txt similarity index 100% rename from code/nel/CMakeLists.txt rename to code/CMakeLists.txt diff --git a/code/ryzom/CMakeModules/ConfigureChecks.cmake b/code/CMakeModules/ConfigureChecks.cmake similarity index 100% rename from code/ryzom/CMakeModules/ConfigureChecks.cmake rename to code/CMakeModules/ConfigureChecks.cmake diff --git a/code/nel/CMakeModules/Find3dsMaxSDK.cmake b/code/CMakeModules/Find3dsMaxSDK.cmake similarity index 100% rename from code/nel/CMakeModules/Find3dsMaxSDK.cmake rename to code/CMakeModules/Find3dsMaxSDK.cmake diff --git a/code/nel/CMakeModules/FindCEGUI.cmake b/code/CMakeModules/FindCEGUI.cmake similarity index 100% rename from code/nel/CMakeModules/FindCEGUI.cmake rename to code/CMakeModules/FindCEGUI.cmake diff --git a/code/nel/CMakeModules/FindCppTest.cmake b/code/CMakeModules/FindCppTest.cmake similarity index 100% rename from code/nel/CMakeModules/FindCppTest.cmake rename to code/CMakeModules/FindCppTest.cmake diff --git a/code/nel/CMakeModules/FindDInput.cmake b/code/CMakeModules/FindDInput.cmake similarity index 100% rename from code/nel/CMakeModules/FindDInput.cmake rename to code/CMakeModules/FindDInput.cmake diff --git a/code/nel/CMakeModules/FindDSound.cmake b/code/CMakeModules/FindDSound.cmake similarity index 100% rename from code/nel/CMakeModules/FindDSound.cmake rename to code/CMakeModules/FindDSound.cmake diff --git a/code/nel/CMakeModules/FindDirectXSDK.cmake b/code/CMakeModules/FindDirectXSDK.cmake similarity index 100% rename from code/nel/CMakeModules/FindDirectXSDK.cmake rename to code/CMakeModules/FindDirectXSDK.cmake diff --git a/code/nel/CMakeModules/FindEFXUtil.cmake b/code/CMakeModules/FindEFXUtil.cmake similarity index 100% rename from code/nel/CMakeModules/FindEFXUtil.cmake rename to code/CMakeModules/FindEFXUtil.cmake diff --git a/code/nel/CMakeModules/FindFMOD.cmake b/code/CMakeModules/FindFMOD.cmake similarity index 100% rename from code/nel/CMakeModules/FindFMOD.cmake rename to code/CMakeModules/FindFMOD.cmake diff --git a/code/nel/CMakeModules/FindFreeType.cmake b/code/CMakeModules/FindFreeType.cmake similarity index 100% rename from code/nel/CMakeModules/FindFreeType.cmake rename to code/CMakeModules/FindFreeType.cmake diff --git a/code/nel/CMakeModules/FindGTK2.cmake b/code/CMakeModules/FindGTK2.cmake similarity index 100% rename from code/nel/CMakeModules/FindGTK2.cmake rename to code/CMakeModules/FindGTK2.cmake diff --git a/code/nel/CMakeModules/FindJpeg.cmake b/code/CMakeModules/FindJpeg.cmake similarity index 100% rename from code/nel/CMakeModules/FindJpeg.cmake rename to code/CMakeModules/FindJpeg.cmake diff --git a/code/ryzom/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake similarity index 100% rename from code/ryzom/CMakeModules/FindLibwww.cmake rename to code/CMakeModules/FindLibwww.cmake diff --git a/code/ryzom/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake similarity index 100% rename from code/ryzom/CMakeModules/FindMySQL.cmake rename to code/CMakeModules/FindMySQL.cmake diff --git a/code/nel/CMakeModules/FindOgg.cmake b/code/CMakeModules/FindOgg.cmake similarity index 100% rename from code/nel/CMakeModules/FindOgg.cmake rename to code/CMakeModules/FindOgg.cmake diff --git a/code/nel/CMakeModules/FindS3TC.cmake b/code/CMakeModules/FindS3TC.cmake similarity index 100% rename from code/nel/CMakeModules/FindS3TC.cmake rename to code/CMakeModules/FindS3TC.cmake diff --git a/code/nel/CMakeModules/FindSTLport.cmake b/code/CMakeModules/FindSTLport.cmake similarity index 100% rename from code/nel/CMakeModules/FindSTLport.cmake rename to code/CMakeModules/FindSTLport.cmake diff --git a/code/nel/CMakeModules/FindSquish.cmake b/code/CMakeModules/FindSquish.cmake similarity index 100% rename from code/nel/CMakeModules/FindSquish.cmake rename to code/CMakeModules/FindSquish.cmake diff --git a/code/nel/CMakeModules/FindVorbis.cmake b/code/CMakeModules/FindVorbis.cmake similarity index 100% rename from code/nel/CMakeModules/FindVorbis.cmake rename to code/CMakeModules/FindVorbis.cmake diff --git a/code/nel/CMakeModules/FindXF86VidMode.cmake b/code/CMakeModules/FindXF86VidMode.cmake similarity index 100% rename from code/nel/CMakeModules/FindXF86VidMode.cmake rename to code/CMakeModules/FindXF86VidMode.cmake diff --git a/code/nel/CMakeModules/FindXRandR.cmake b/code/CMakeModules/FindXRandR.cmake similarity index 100% rename from code/nel/CMakeModules/FindXRandR.cmake rename to code/CMakeModules/FindXRandR.cmake diff --git a/code/ryzom/CMakeModules/FindZLIB.cmake b/code/CMakeModules/FindZLIB.cmake similarity index 100% rename from code/ryzom/CMakeModules/FindZLIB.cmake rename to code/CMakeModules/FindZLIB.cmake diff --git a/code/nel/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake similarity index 100% rename from code/nel/CMakeModules/PCHSupport.cmake rename to code/CMakeModules/PCHSupport.cmake diff --git a/code/nel/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake similarity index 100% rename from code/nel/CMakeModules/nel.cmake rename to code/CMakeModules/nel.cmake diff --git a/code/nel/CMakePackaging.txt b/code/CMakePackaging.txt similarity index 100% rename from code/nel/CMakePackaging.txt rename to code/CMakePackaging.txt diff --git a/code/nel/CTestConfig.cmake b/code/CTestConfig.cmake similarity index 100% rename from code/nel/CTestConfig.cmake rename to code/CTestConfig.cmake diff --git a/code/nelns/CMakeModules/FindCEGUI.cmake b/code/nelns/CMakeModules/FindCEGUI.cmake deleted file mode 100644 index e4e4a0668..000000000 --- a/code/nelns/CMakeModules/FindCEGUI.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Locate CEGUI library -# This module defines -# CEGUI_LIBRARY, the library to link against -# CEGUI_FOUND, if false, do not try to link to CEGUI -# CEGUI_INCLUDE_DIRS, where to find headers. - -IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - # in cache already - SET(CEGUI_FIND_QUIETLY TRUE) -ENDIF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - - -FIND_PATH(CEGUI_INCLUDE_DIRS - CEGUI - PATHS - $ENV{CEGUI_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES cegui CEGUI -) - -FIND_LIBRARY(CEGUI_LIBRARY - NAMES CEGUIBase - PATHS - $ENV{CEGUI_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - SET(CEGUI_FOUND "YES") - SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI") - IF(NOT CEGUI_FIND_QUIETLY) - MESSAGE(STATUS "Found CEGUI: ${CEGUI_LIBRARY}") - ENDIF(NOT CEGUI_FIND_QUIETLY) -ELSE(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) - IF(NOT CEGUI_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find CEGUI!") - ENDIF(NOT CEGUI_FIND_QUIETLY) -ENDIF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) diff --git a/code/nelns/CMakeModules/FindCppUnit.cmake b/code/nelns/CMakeModules/FindCppUnit.cmake deleted file mode 100644 index 5f2197c1b..000000000 --- a/code/nelns/CMakeModules/FindCppUnit.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# -# Find the CppUnit includes and library -# -# This module defines -# CPPUNIT_INCLUDE_DIR, where to find tiff.h, etc. -# CPPUNIT_LIBRARY, where to find the CppUnit library. -# CPPUNIT_FOUND, If false, do not try to use CppUnit. - -# also defined, but not for general use are -IF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - # in cache already - SET(CPPUNIT_FIND_QUIETLY TRUE) -ENDIF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - -FIND_PATH(CPPUNIT_INCLUDE_DIR - cppunit/TestCase.h - PATHS - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES cppunit -) - -FIND_LIBRARY(CPPUNIT_LIBRARY - cppunit - PATHS - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - SET(CPPUNIT_FOUND "YES") - IF(NOT CPPUNIT_FIND_QUIETLY) - MESSAGE(STATUS "Found CppUnit: ${CPPUNIT_LIBRARY}") - ENDIF(NOT CPPUNIT_FIND_QUIETLY) -ELSE(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - IF(NOT CPPUNIT_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find CppUnit!") - ENDIF(NOT CPPUNIT_FIND_QUIETLY) -ENDIF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - diff --git a/code/nelns/CMakeModules/FindFreeType.cmake b/code/nelns/CMakeModules/FindFreeType.cmake deleted file mode 100644 index 557419ba3..000000000 --- a/code/nelns/CMakeModules/FindFreeType.cmake +++ /dev/null @@ -1,50 +0,0 @@ -# - Locate FreeType library -# This module defines -# FREETYPE_LIBRARY, the library to link against -# FREETYPE_FOUND, if false, do not try to link to FREETYPE -# FREETYPE_INCLUDE_DIRS, where to find headers. - -IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - # in cache already - SET(FREETYPE_FIND_QUIETLY TRUE) -ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - - -FIND_PATH(FREETYPE_INCLUDE_DIRS - freetype - PATHS - $ENV{FREETYPE_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES freetype freetype2 -) - -FIND_LIBRARY(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 - PATHS - $ENV{FREETYPE_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - SET(FREETYPE_FOUND "YES") - IF(NOT FREETYPE_FIND_QUIETLY) - MESSAGE(STATUS "Found FreeType: ${FREETYPE_LIBRARY}") - ENDIF(NOT FREETYPE_FIND_QUIETLY) -ELSE(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - IF(NOT FREETYPE_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find FreeType!") - ENDIF(NOT FREETYPE_FIND_QUIETLY) -ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) diff --git a/code/nelns/CMakeModules/FindGTK2.cmake b/code/nelns/CMakeModules/FindGTK2.cmake deleted file mode 100644 index 8d7b39b9d..000000000 --- a/code/nelns/CMakeModules/FindGTK2.cmake +++ /dev/null @@ -1,453 +0,0 @@ -# - Try to find GTK2 -# Once done this will define -# -# GTK2_FOUND - System has Boost -# GTK2_INCLUDE_DIRS - GTK2 include directory -# GTK2_LIBRARIES - Link these to use GTK2 -# GTK2_LIBRARY_DIRS - The path to where the GTK2 library files are. -# GTK2_DEFINITIONS - Compiler switches required for using GTK2 -# -# Copyright (c) 2007 Andreas Schneider -# -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - -set(GTK2_DEBUG ON) - -macro(GTK2_DEBUG_MESSAGE _message) - if (GTK2_DEBUG) - message(STATUS "(DEBUG) ${_message}") - endif (GTK2_DEBUG) -endmacro(GTK2_DEBUG_MESSAGE _message) - -if (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) - # in cache already - set(GTK2_FOUND TRUE) -else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) - if (UNIX) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - include(UsePkgConfig) - - pkgconfig(gtk+-2.0 _GTK2IncDir _GTK2LinkDir _GTK2LinkFlags _GTK2Cflags) - - find_path(GTK2_GTK_INCLUDE_DIR - NAMES - gtk/gtk.h - PATHS - $ENV{GTK2_HOME} - ${_GTK2IncDir} - /usr/include/gtk-2.0 - /usr/local/include/gtk-2.0 - /opt/include/gtk-2.0 - /opt/gnome/include/gtk-2.0 - /sw/include/gtk-2.0 - ) - gtk2_debug_message("GTK2_GTK_INCLUDE_DIR is ${GTK2_GTK_INCLUDE_DIR}") - - # Some Linux distributions (e.g. Red Hat) have glibconfig.h - # and glib.h in different directories, so we need to look - # for both. - # - Atanas Georgiev - pkgconfig(glib-2.0 _GLIB2IncDir _GLIB2LinkDir _GLIB2LinkFlags _GLIB2Cflags) - pkgconfig(gmodule-2.0 _GMODULE2IncDir _GMODULE2LinkDir _GMODULE2LinkFlags _GMODULE2Cflags) - - find_path(GTK2_GLIBCONFIG_INCLUDE_DIR - NAMES - glibconfig.h - PATHS - ${_GLIB2IncDir} - ${_GMODULE2IncDir} - /opt/gnome/lib64/glib-2.0/include - /opt/gnome/lib/glib-2.0/include - /opt/lib/glib-2.0/include - /usr/lib64/glib-2.0/include - /usr/lib/glib-2.0/include - /sw/lib/glib-2.0/include - ) - gtk2_debug_message("GTK2_GLIBCONFIG_INCLUDE_DIR is ${GTK2_GLIBCONFIG_INCLUDE_DIR}") - - find_path(GTK2_GLIB_INCLUDE_DIR - NAMES - glib.h - PATHS - ${_GLIB2IncDir} - ${_GMODULE2IncDir} - /opt/include/glib-2.0 - /opt/gnome/include/glib-2.0 - /usr/include/glib-2.0 - /sw/include/glib-2.0 - ) - gtk2_debug_message("GTK2_GLIB_INCLUDE_DIR is ${GTK2_GLIB_INCLUDE_DIR}") - - pkgconfig(gdk-2.0 _GDK2IncDir _GDK2LinkDir _GDK2LinkFlags _GDK2Cflags) - - find_path(GTK2_GDK_INCLUDE_DIR - NAMES - gdkconfig.h - PATHS - ${_GDK2IncDir} - /opt/gnome/lib/gtk-2.0/include - /opt/gnome/lib64/gtk-2.0/include - /opt/lib/gtk-2.0/include - /usr/lib/gtk-2.0/include - /usr/lib64/gtk-2.0/include - /sw/lib/gtk-2.0/include - ) - gtk2_debug_message("GTK2_GDK_INCLUDE_DIR is ${GTK2_GDK_INCLUDE_DIR}") - - find_path(GTK2_GTKGL_INCLUDE_DIR - NAMES - gtkgl/gtkglarea.h - PATHS - ${_GLIB2IncDir} - /usr/include - /usr/include/gtkgl-2.0 - /usr/local/include - /usr/openwin/share/include - /opt/gnome/include - /opt/include - /sw/include - ) - gtk2_debug_message("GTK2_GTKGL_INCLUDE_DIR is ${GTK2_GTKGL_INCLUDE_DIR}") - - pkgconfig(libglade-2.0 _GLADEIncDir _GLADELinkDir _GLADELinkFlags _GLADECflags) - - find_path(GTK2_GLADE_INCLUDE_DIR - NAMES - glade/glade.h - PATHS - ${_GLADEIncDir} - /opt/gnome/include/libglade-2.0 - /usr/include/libglade-2.0 - /opt/include/libglade-2.0 - /sw/include/libglade-2.0 - ) - gtk2_debug_message("GTK2_GLADE_INCLUDE_DIR is ${GTK2_GLADE_INCLUDE_DIR}") - - pkgconfig(pango _PANGOIncDir _PANGOLinkDir _PANGOLinkFlags _PANGOCflags) - - find_path(GTK2_PANGO_INCLUDE_DIR - NAMES - pango/pango.h - PATHS - ${_PANGOIncDir} - /usr/include/pango-1.0 - /opt/gnome/include/pango-1.0 - /opt/include/pango-1.0 - /sw/include/pango-1.0 - ) - gtk2_debug_message("GTK2_PANGO_INCLUDE_DIR is ${GTK2_PANGO_INCLUDE_DIR}") - - pkgconfig(cairo _CAIROIncDir _CAIROLinkDir _CAIROLinkFlags _CAIROCflags) - - find_path(GTK2_CAIRO_INCLUDE_DIR - NAMES - cairo.h - PATHS - ${_CAIROIncDir} - /opt/gnome/include/cairo - /usr/include - /usr/include/cairo - /opt/include - /opt/include/cairo - /sw/include - /sw/include/cairo - ) - gtk2_debug_message("GTK2_CAIRO_INCLUDE_DIR is ${GTK2_CAIRO_INCLUDE_DIR}") - - pkgconfig(atk _ATKIncDir _ATKLinkDir _ATKLinkFlags _ATKCflags) - - find_path(GTK2_ATK_INCLUDE_DIR - NAMES - atk/atk.h - PATHS - ${_ATKIncDir} - /opt/gnome/include/atk-1.0 - /usr/include/atk-1.0 - /opt/include/atk-1.0 - /sw/include/atk-1.0 - ) - gtk2_debug_message("GTK2_ATK_INCLUDE_DIR is ${GTK2_ATK_INCLUDE_DIR}") - - find_library(GTK2_GTK_LIBRARY - NAMES - gtk-x11-2.0 - PATHS - ${_GTK2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GTK_LIBRARY is ${GTK2_GTK_LIBRARY}") - - find_library(GTK2_GDK_LIBRARY - NAMES - gdk-x11-2.0 - PATHS - ${_GDK2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GDK_LIBRARY is ${GTK2_GDK_LIBRARY}") - - find_library(GTK2_GDK_PIXBUF_LIBRARY - NAMES - gdk_pixbuf-2.0 - PATHS - ${_GDK2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GDK_PIXBUF_LIBRARY is ${GTK2_GDK_PIXBUF_LIBRARY}") - - find_library(GTK2_GMODULE_LIBRARY - NAMES - gmodule-2.0 - PATHS - ${_GMODULE2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GMODULE_LIBRARY is ${GTK2_GMODULE_LIBRARY}") - - find_library(GTK2_GTHREAD_LIBRARY - NAMES - gthread-2.0 - PATHS - ${_GTK2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GTHREAD_LIBRARY is ${GTK2_GTHREAD_LIBRARY}") - - find_library(GTK2_GOBJECT_LIBRARY - NAMES - gobject-2.0 - PATHS - ${_GTK2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GOBJECT_LIBRARY is ${GTK2_GOBJECT_LIBRARY}") - - find_library(GTK2_GLIB_LIBRARY - NAMES - glib-2.0 - PATHS - ${_GLIB2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GLIB_LIBRARY is ${GTK2_GLIB_LIBRARY}") - - find_library(GTK2_GTKGL_LIBRARY - NAMES - gtkgl-2.0 - PATHS - ${_GTK2LinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GTKGL_LIBRARY is ${GTK2_GTKGL_LIBRARY}") - - find_library(GTK2_GLADE_LIBRARY - NAMES - glade-2.0 - PATHS - ${_GLADELinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_GLADE_LIBRARY is ${GTK2_GLADE_LIBRARY}") - - find_library(GTK2_PANGO_LIBRARY - NAMES - pango-1.0 - PATHS - ${_PANGOLinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_PANGO_LIBRARY is ${GTK2_PANGO_LIBRARY}") - - find_library(GTK2_CAIRO_LIBRARY - NAMES - pangocairo-1.0 - PATHS - ${_CAIROLinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_PANGO_LIBRARY is ${GTK2_CAIRO_LIBRARY}") - - find_library(GTK2_ATK_LIBRARY - NAMES - atk-1.0 - PATHS - ${_ATKinkDir} - /usr/lib - /usr/local/lib - /usr/openwin/lib - /usr/X11R6/lib - /opt/gnome/lib - /opt/lib - /sw/lib - ) - gtk2_debug_message("GTK2_ATK_LIBRARY is ${GTK2_ATK_LIBRARY}") - - set(GTK2_INCLUDE_DIRS - ${GTK2_GTK_INCLUDE_DIR} - ${GTK2_GLIBCONFIG_INCLUDE_DIR} - ${GTK2_GLIB_INCLUDE_DIR} - ${GTK2_GDK_INCLUDE_DIR} - ${GTK2_GLADE_INCLUDE_DIR} - ${GTK2_PANGO_INCLUDE_DIR} - ${GTK2_CAIRO_INCLUDE_DIR} - ${GTK2_ATK_INCLUDE_DIR} - ) - - if (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR) - if (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR) - if (GTK2_GMODULE_LIBRARY) - if (GTK2_GTHREAD_LIBRARY) - if (GTK2_GOBJECT_LIBRARY) - if (GTK2_GLADE_LIBRARY AND GTK2_GLADE_INCLUDE_DIR) - if (GTK2_PANGO_LIBRARY AND GTK2_PANGO_INCLUDE_DIR) - if (GTK2_CAIRO_LIBRARY AND GTK2_CAIRO_INCLUDE_DIR) - if (GTK2_ATK_LIBRARY AND GTK2_ATK_INCLUDE_DIR) - - # set GTK2 libraries - set (GTK2_LIBRARIES - ${GTK2_GTK_LIBRARY} - ${GTK2_GDK_LIBRARY} - ${GTK2_GDK_PIXBUF_LIBRARY} - ${GTK2_GMODULE_LIBRARY} - ${GTK2_GTHREAD_LIBRARY} - ${GTK2_GOBJECT_LIBRARY} - ${GTK2_GLADE_LIBRARY} - ${GTK2_PANGO_LIBRARY} - ${GTK2_CAIRO_LIBRARY} - ${GTK2_ATK_LIBRARY} - ) - - # check for gtkgl support - if (GTK2_GTKGL_LIBRARY AND GTK2_GTKGL_INCLUDE_DIR) - set(GTK2_GTKGL_FOUND TRUE) - - set(GTK2_INCLUDE_DIRS - ${GTK2_INCLUDE_DIR} - ${GTK2_GTKGL_INCLUDE_DIR} - ) - - set(GTK2_LIBRARIES - ${GTK2_LIBRARIES} - ${GTK2_GTKGL_LIBRARY} - ) - endif (GTK2_GTKGL_LIBRARY AND GTK2_GTKGL_INCLUDE_DIR) - - else (GTK2_ATK_LIBRARY AND GTK2_ATK_INCLUDE_DIR) - message(SEND_ERROR "Could not find ATK") - endif (GTK2_ATK_LIBRARY AND GTK2_ATK_INCLUDE_DIR) - else (GTK2_CAIRO_LIBRARY AND GTK2_CAIRO_INCLUDE_DIR) - message(SEND_ERROR "Could not find CAIRO") - endif (GTK2_CAIRO_LIBRARY AND GTK2_CAIRO_INCLUDE_DIR) - else (GTK2_PANGO_LIBRARY AND GTK2_PANGO_INCLUDE_DIR) - message(SEND_ERROR "Could not find PANGO") - endif (GTK2_PANGO_LIBRARY AND GTK2_PANGO_INCLUDE_DIR) - else (GTK2_GLADE_LIBRARY AND GTK2_GLADE_INCLUDE_DIR) - message(SEND_ERROR "Could not find GLADE") - endif (GTK2_GLADE_LIBRARY AND GTK2_GLADE_INCLUDE_DIR) - else (GTK2_GOBJECT_LIBRARY) - message(SEND_ERROR "Could not find GOBJECT") - endif (GTK2_GOBJECT_LIBRARY) - else (GTK2_GTHREAD_LIBRARY) - message(SEND_ERROR "Could not find GTHREAD") - endif (GTK2_GTHREAD_LIBRARY) - else (GTK2_GMODULE_LIBRARY) - message(SEND_ERROR "Could not find GMODULE") - endif (GTK2_GMODULE_LIBRARY) - else (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR) - message(SEND_ERROR "Could not find GDK (GDK_PIXBUF)") - endif (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR) - else (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR) - message(SEND_ERROR "Could not find GTK2-X11") - endif (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR) - - - if (GTK2_INCLUDE_DIRS AND GTK2_LIBRARIES) - set(GTK2_FOUND TRUE) - endif (GTK2_INCLUDE_DIRS AND GTK2_LIBRARIES) - - if (GTK2_FOUND) - if (NOT GTK2_FIND_QUIETLY) - message(STATUS "Found GTK2: ${GTK2_LIBRARIES}") - endif (NOT GTK2_FIND_QUIETLY) - else (GTK2_FOUND) - if (GTK2_FIND_REQUIRED) - message(FATAL_ERROR "Could not find GTK2") - endif (GTK2_FIND_REQUIRED) - endif (GTK2_FOUND) - - # show the GTK2_INCLUDE_DIRS and GTK2_LIBRARIES variables only in the advanced view - mark_as_advanced(GTK2_INCLUDE_DIRS GTK2_LIBRARIES) - - endif (UNIX) -endif (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) - diff --git a/code/nelns/CMakeModules/FindJpeg.cmake b/code/nelns/CMakeModules/FindJpeg.cmake deleted file mode 100644 index a6efba192..000000000 --- a/code/nelns/CMakeModules/FindJpeg.cmake +++ /dev/null @@ -1,50 +0,0 @@ -# - Locate Jpeg library -# This module defines -# JPEG_LIBRARY, the library to link against -# JPEG_FOUND, if false, do not try to link to JPEG -# JPEG_INCLUDE_DIR, where to find headers. - -IF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - # in cache already - SET(JPEG_FIND_QUIETLY TRUE) -ENDIF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - - -FIND_PATH(JPEG_INCLUDE_DIR - jpeglib.h - PATHS - $ENV{JPEG_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES jpeg -) - -FIND_LIBRARY(JPEG_LIBRARY - NAMES jpeg libjpeg - PATHS - $ENV{JPEG_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - SET(JPEG_FOUND "YES") - IF(NOT JPEG_FIND_QUIETLY) - MESSAGE(STATUS "Found Jpeg: ${JPEG_LIBRARY}") - ENDIF(NOT JPEG_FIND_QUIETLY) -ELSE(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) - IF(NOT JPEG_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find Jpeg!") - ENDIF(NOT JPEG_FIND_QUIETLY) -ENDIF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR) diff --git a/code/nelns/CMakeModules/FindMySQL.cmake b/code/nelns/CMakeModules/FindMySQL.cmake deleted file mode 100644 index 956d00a30..000000000 --- a/code/nelns/CMakeModules/FindMySQL.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find MySQL -# Find the MySQL includes and client library -# This module defines -# MYSQL_INCLUDE_DIR, where to find mysql.h -# MYSQL_LIBRARIES, the libraries needed to use MySQL. -# MYSQL_FOUND, If false, do not try to use MySQL. -# -# Copyright (c) 2006, Jaroslaw Staniek, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -IF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) - SET(MYSQL_FOUND TRUE) - -ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) - - FIND_PATH(MYSQL_INCLUDE_DIR mysql.h - /usr/include/mysql - /usr/local/include/mysql - /opt/local/include/mysql5/mysql - $ENV{ProgramFiles}/MySQL/*/include - $ENV{SystemDrive}/MySQL/*/include) - - IF(WIN32 AND MSVC) - FIND_LIBRARY(MYSQL_LIBRARIES NAMES libmysql mysqlclient - PATHS - $ENV{ProgramFiles}/MySQL/*/lib/opt - $ENV{SystemDrive}/MySQL/*/lib/opt) - ELSE(WIN32 AND MSVC) - FIND_LIBRARY(MYSQL_LIBRARIES NAMES mysqlclient - PATHS - /usr/lib - /usr/local/lib - /usr/lib/mysql - /usr/local/lib/mysql - /opt/local/lib/mysql5/mysql - ) - ENDIF(WIN32 AND MSVC) - - IF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) - SET(MYSQL_FOUND TRUE) - MESSAGE(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}") - ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) - SET(MYSQL_FOUND FALSE) - MESSAGE(STATUS "MySQL not found.") - ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) - - MARK_AS_ADVANCED(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES) - -ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) diff --git a/code/nelns/CMakeModules/FindNeL3D.cmake b/code/nelns/CMakeModules/FindNeL3D.cmake deleted file mode 100644 index 94829a19d..000000000 --- a/code/nelns/CMakeModules/FindNeL3D.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL 3D library -# This module defines -# NEL3D_LIBRARY, the library to link against -# NEL3D_FOUND, if false, do not try to link to NEL3D -# NEL3D_INCLUDE_DIRS, where to find headers. - -IF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - # in cache already - SET(NEL3D_FIND_QUIETLY TRUE) -ENDIF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - -FIND_PATH(NEL3D_INCLUDE_DIRS - nel/3d/u_driver.h - PATHS - $ENV{NEL3D_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NEL3D_LIBRARY - NAMES nel3d - PATHS - $ENV{NEL3D_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - SET(NEL3D_FOUND "YES") - IF(NOT NEL3D_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL 3D: ${NEL3D_LIBRARY}") - ENDIF(NOT NEL3D_FIND_QUIETLY) -ELSE(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - IF(NOT NEL3D_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL 3D!") - ENDIF(NOT NEL3D_FIND_QUIETLY) -ENDIF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) diff --git a/code/nelns/CMakeModules/FindNeLMISC.cmake b/code/nelns/CMakeModules/FindNeLMISC.cmake deleted file mode 100644 index b591312f4..000000000 --- a/code/nelns/CMakeModules/FindNeLMISC.cmake +++ /dev/null @@ -1,52 +0,0 @@ -# - Locate NeL MISC library -# This module defines -# NELMISC_LIBRARY, the library to link against -# NELMISC_FOUND, if false, do not try to link to NELMISC -# NELMISC_INCLUDE_DIRS, where to find headers. - -IF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - # in cache already - SET(NELMISC_FIND_QUIETLY TRUE) -ENDIF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - -FIND_PATH(NELMISC_INCLUDE_DIRS - nel/misc/types_nl.h - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/include - $ENV{ProgramFiles}/NeL/include - $ENV{NELMISC_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELMISC_LIBRARY - NAMES nelmisc nelmisc_r nelmisc_d - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/lib - $ENV{ProgramFiles}/NeL/lib - $ENV{NELMISC_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - SET(NELMISC_FOUND "YES") - IF(NOT NELMISC_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL MISC: ${NELMISC_LIBRARY}") - ENDIF(NOT NELMISC_FIND_QUIETLY) -ELSE(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - IF(NOT NELMISC_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL MISC!") - ENDIF(NOT NELMISC_FIND_QUIETLY) -ENDIF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) diff --git a/code/nelns/CMakeModules/FindNeLNET.cmake b/code/nelns/CMakeModules/FindNeLNET.cmake deleted file mode 100644 index 843825b73..000000000 --- a/code/nelns/CMakeModules/FindNeLNET.cmake +++ /dev/null @@ -1,52 +0,0 @@ -# - Locate NeL NET library -# This module defines -# NELNET_LIBRARY, the library to link against -# NELNET_FOUND, if false, do not try to link to NELNET -# NELNET_INCLUDE_DIRS, where to find headers. - -IF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - # in cache already - SET(NELNET_FIND_QUIETLY TRUE) -ENDIF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - -FIND_PATH(NELNET_INCLUDE_DIRS - nel/net/service.h - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/include - $ENV{ProgramFiles}/NeL/include - $ENV{NELNET_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELNET_LIBRARY - NAMES nelnet nelnet_r nelnet_d - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/lib - $ENV{ProgramFiles}/NeL/lib - $ENV{NELNET_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - SET(NELNET_FOUND "YES") - IF(NOT NELNET_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL NET: ${NELNET_LIBRARY}") - ENDIF(NOT NELNET_FIND_QUIETLY) -ELSE(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - IF(NOT NELNET_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL NET!") - ENDIF(NOT NELNET_FIND_QUIETLY) -ENDIF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) diff --git a/code/nelns/CMakeModules/nel.cmake b/code/nelns/CMakeModules/nel.cmake deleted file mode 100644 index 7995cbabd..000000000 --- a/code/nelns/CMakeModules/nel.cmake +++ /dev/null @@ -1,202 +0,0 @@ -### -# Build Library Name -# -# Arguments: name - undecorated library name -# Sets: LIBNAME - decorated library name -### -MACRO(DECORATE_NEL_LIB name) - - IF(WIN32) - IF(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG") - SET(LIBNAME "${name}") - ELSE(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG") - IF(NL_BUILD_MODE MATCHES "NL_DEBUG") - SET(LIBNAME "${name}") - ELSE(NL_BUILD_MODE MATCHES "NL_DEBUG") - SET(LIBNAME "${name}") - ENDIF(NL_BUILD_MODE MATCHES "NL_DEBUG") - ENDIF(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG") - ELSE(WIN32) - SET(LIBNAME "${name}") - ENDIF(WIN32) - -ENDMACRO(DECORATE_NEL_LIB) - -### -# Checks build vs. source location. Prevents In-Source builds. -### -MACRO(CHECK_OUT_OF_SOURCE) - IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - MESSAGE(FATAL_ERROR " - -CMake generation for this project is not allowed within the source directory! -Remove the CMakeCache.txt file and try again from another folder, e.g.: - - rm CMakeCache.txt - mkdir cmake - cd cmake - cmake -G \"Unix Makefiles\" .. - ") - ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - -ENDMACRO(CHECK_OUT_OF_SOURCE) - -MACRO(NL_SETUP_DEFAULT_OPTIONS) - ### - # Features - ### - OPTION(WITH_LOGGING "With Logging" ON ) - OPTION(WITH_COVERAGE "With Code Coverage Support" OFF) - - ### - # Core libraries - ### - - ### - # Drivers Support - ### - - ### - # Optional support - ### - OPTION(WITH_GTK "With GTK Support" OFF) - OPTION(WITH_QT "With QT Support" OFF) - -ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) - -MACRO(NL_SETUP_BUILD) - - #----------------------------------------------------------------------------- - # Setup the buildmode variables. - # - # None = NL_RELEASE_DEBUG - # Debug = NL_DEBUG - # Release = NL_RELEASE - # RelWithDebInfo = NL_RELEASE_DEBUG - # MinSizeRel = NL_RELEASE_DEBUG - - # None = NL_RELEASE - # Debug = NL_DEBUG - # Release = NL_RELEASE, NL_NO_DEBUG - # RelWithDebInfo = NL_RELEASE - # MinSizeRel = NL_RELEASE, NL_NO_DEBUG - - IF(CMAKE_BUILD_TYPE MATCHES "Debug") - SET(NL_BUILD_MODE "NL_DEBUG") - ELSE(CMAKE_BUILD_TYPE MATCHES "Debug") - IF(CMAKE_BUILD_TYPE MATCHES "Release") - SET(NL_BUILD_MODE "NL_RELEASE") - ELSE(CMAKE_BUILD_TYPE MATCHES "Release") - SET(NL_BUILD_MODE "NL_RELEASE") - # enforce release mode if it's neither Debug nor Release - SET(CMAKE_BUILD_TYPE "Release") - ENDIF(CMAKE_BUILD_TYPE MATCHES "Release") - ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug") - - IF(WIN32) - SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-") - SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF") - SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF") - ELSE(WIN32) - SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused") - IF(WITH_COVERAGE) - SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}") - ENDIF(WITH_COVERAGE) - SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++") - IF(NOT APPLE) - SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lrt") - ENDIF(NOT APPLE) - SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g") - SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6") - SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ") - SET(NL_NONE_CFLAGS "-DNL_RELEASE -g -finline-functions -O2 ") - ENDIF(WIN32) - - # Determine host CPU - IF(UNIX AND NOT WIN32) - FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) - IF(CMAKE_UNAME) - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR) - SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)") - IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - ADD_DEFINITIONS(-DHAVE_X86_64) - ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") - ADD_DEFINITIONS(-DHAVE_IA64) - ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - ADD_DEFINITIONS(-DHAVE_X86) - ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - ELSE(CMAKE_UNAME) # Assume that if uname is not found that we're x86. - ADD_DEFINITIONS(-DHAVE_X86) - ENDIF(CMAKE_UNAME) - ENDIF(UNIX AND NOT WIN32) - -ENDMACRO(NL_SETUP_BUILD) - -MACRO(NL_SETUP_BUILD_FLAGS) - ## None - #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ") - #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## Debug - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## Release - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## RelWithDebInfo - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## MinSizeRel - SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") -ENDMACRO(NL_SETUP_BUILD_FLAGS) - -MACRO(NL_SETUP_PREFIX_PATHS) - ## Allow override of install_prefix/etc path. - IF(NOT NL_ETC_PREFIX) - IF(WIN32) - SET(NL_ETC_PREFIX "../etc/nel" CACHE PATH "Installation path for configurations") - ELSE(WIN32) - SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc/nel" CACHE PATH "Installation path for configurations") - ENDIF(WIN32) - ENDIF(NOT NL_ETC_PREFIX) - - ## Allow override of install_prefix/share path. - IF(NOT NL_SHARE_PREFIX) - IF(WIN32) - SET(NL_SHARE_PREFIX "../share/nel" CACHE PATH "Installation path for data.") - ELSE(WIN32) - SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share/nel" CACHE PATH "Installation path for data.") - ENDIF(WIN32) - ENDIF(NOT NL_SHARE_PREFIX) - - ## Allow override of install_prefix/sbin path. - IF(NOT NL_SBIN_PREFIX) - IF(WIN32) - SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.") - ELSE(WIN32) - SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.") - ENDIF(WIN32) - ENDIF(NOT NL_SBIN_PREFIX) - - ## Allow override of install_prefix/bin path. - IF(NOT NL_BIN_PREFIX) - IF(WIN32) - SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.") - ELSE(WIN32) - SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.") - ENDIF(WIN32) - ENDIF(NOT NL_BIN_PREFIX) - - ## Allow override of install_prefix/var/log path. - IF(NOT NL_LOG_PREFIX) - IF(WIN32) - SET(NL_LOG_PREFIX "../var/log" CACHE PATH "Installation path for tools and applications.") - ELSE(WIN32) - SET(NL_LOG_PREFIX "${CMAKE_INSTALL_PREFIX}/var/log" CACHE PATH "Installation path for tools and applications.") - ENDIF(WIN32) - ENDIF(NOT NL_LOG_PREFIX) -ENDMACRO(NL_SETUP_PREFIX_PATHS) diff --git a/code/ryzom/CMakeModules/FindNeL.cmake b/code/ryzom/CMakeModules/FindNeL.cmake deleted file mode 100644 index 3e3f9d2ef..000000000 --- a/code/ryzom/CMakeModules/FindNeL.cmake +++ /dev/null @@ -1,162 +0,0 @@ -# - Locate NeL 3D library -# This module defines -# NEL3D_LIBRARY, the library to link against -# NEL_FOUND, if false, do not try to link to NEL3D -# NEL_INCLUDE_DIR, where to find headers. - -IF(NELMISC_LIBRARY AND NEL_INCLUDE_DIR) - # in cache already - SET(NEL_FIND_QUIETLY TRUE) -ENDIF(NELMISC_LIBRARY AND NEL_INCLUDE_DIR) - -# Assume we find NeL and correct it along the way. -SET(NEL_FOUND "YES") - -# determine the components to retrieve. -IF(NOT NeL_FIND_COMPONENTS) - # We must always have nelmisc. - SET(NeL_FIND_COMPONENTS nelmisc) -ELSE(NOT NeL_FIND_COMPONENTS) - # Make sure we have nelmisc in the list. - LIST(FIND NeL_FIND_COMPONENTS nelmisc TMP_FIND_NELMISC) - IF(TMP_FIND_NELMISC EQUAL -1) - LIST(APPEND NeL_FIND_COMPONENTS nelmisc) - ENDIF(TMP_FIND_NELMISC EQUAL -1) -ENDIF(NOT NeL_FIND_COMPONENTS) - -# Find the path to the NeL includes. -FIND_PATH(NEL_INCLUDE_DIR nel/misc/types_nl.h - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/include - $ENV{ProgramFiles}/NeL/include - $ENV{NEL_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include) - -# Make sure we found the include files. -IF(NOT NEL_INCLUDE_DIR) - SET(NEL_FOUND "NO") -ENDIF(NOT NEL_INCLUDE_DIR) - -# A utility macro to wrap NeL finds... -MACRO(FIND_NEL_LIBRARY MYLIBRARY) - FIND_LIBRARY(${MYLIBRARY} - NAMES ${ARGN} - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/lib - $ENV{ProgramFiles}/NeL/lib - $ENV{NEL_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64) -ENDMACRO(FIND_NEL_LIBRARY MYLIBRARY) - - -# Find the library for each required library. -FOREACH(NL_F_COMPONENT ${NeL_FIND_COMPONENTS}) - # Check for NeL Misc - IF(NL_F_COMPONENT STREQUAL "nelmisc") - FIND_NEL_LIBRARY(NELMISC_LIBRARY nelmisc nelmisc_r) - IF(WIN32) - FIND_NEL_LIBRARY(NELMISC_LIBRARY_DEBUG nelmisc_d) - ENDIF(WIN32) - IF(NOT NELMISC_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NELMISC_LIBRARY) - - # Check for NeL 3D - ELSEIF(NL_F_COMPONENT STREQUAL "nel3d") - FIND_NEL_LIBRARY(NEL3D_LIBRARY nel3d nel3d_r) - IF(WIN32) - FIND_NEL_LIBRARY(NEL3D_LIBRARY_DEBUG nel3d_d) - ENDIF(WIN32) - IF(NOT NEL3D_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NEL3D_LIBRARY) - - # Check for NeL Georges - ELSEIF(NL_F_COMPONENT STREQUAL "nelgeorges") - FIND_NEL_LIBRARY(NELGEORGES_LIBRARY nelgeorges nelgeorges_r) - IF(WIN32) - FIND_NEL_LIBRARY(NELGEORGES_LIBRARY_DEBUG nelgeorges_d) - ENDIF(WIN32) - IF(NOT NELGEORGES_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NELGEORGES_LIBRARY) - - # Check for NeL Net - ELSEIF(NL_F_COMPONENT STREQUAL "nelnet") - FIND_NEL_LIBRARY(NELNET_LIBRARY nelnet nelnet_r) - IF(WIN32) - FIND_NEL_LIBRARY(NELNET_LIBRARY_DEBUG nelnet_d) - ENDIF(WIN32) - IF(NOT NELNET_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NELNET_LIBRARY) - - # Check for NeL PACS - ELSEIF(NL_F_COMPONENT STREQUAL "nelpacs") - FIND_NEL_LIBRARY(NELPACS_LIBRARY nelpacs nelpacs_r) - IF(WIN32) - FIND_NEL_LIBRARY(NELPACS_LIBRARY_DEBUG nelpacs_d) - ENDIF(WIN32) - IF(NOT NELPACS_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NELPACS_LIBRARY) - - # Check for NeL Ligoscape - ELSEIF(NL_F_COMPONENT STREQUAL "nelligo") - FIND_NEL_LIBRARY(NELLIGO_LIBRARY nelligo nelligo_r) - IF(WIN32) - FIND_NEL_LIBRARY(NELLIGO_LIBRARY_DEBUG nelligo_d) - ENDIF(WIN32) - IF(NOT NELLIGO_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NELLIGO_LIBRARY) - - # Check for NeL Sound Lowlevel - ELSEIF(NL_F_COMPONENT STREQUAL "nelsnd_lowlevel") - FIND_NEL_LIBRARY(NELSNDDRV_LIBRARY nelsnd_lowlevel nelsnd_lowlevel_r) - IF(WIN32) - FIND_NEL_LIBRARY(NELSNDDRV_LIBRARY_DEBUG nelsnd_lowlevel_d) - ENDIF(WIN32) - IF(NOT NELSNDDRV_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NELSNDDRV_LIBRARY) - - # Check for NeL Sound - ELSEIF(NL_F_COMPONENT STREQUAL "nelsound") - FIND_NEL_LIBRARY(NELSOUND_LIBRARY nelsound nelsound_r) - IF(WIN32) - FIND_NEL_LIBRARY(NELSOUND_LIBRARY_DEBUG nelsound_d) - ENDIF(WIN32) - IF(NOT NELSOUND_LIBRARY) - SET(NEL_FOUND "NO") - ENDIF(NOT NELSOUND_LIBRARY) - - # Output an error message if an unknown component is requested. - ELSE(NL_F_COMPONENT STREQUAL "nelmisc") - MESSAGE(ERROR " Unknown component ${NL_F_COMPONENT}!!") - SET(NEL_FOUND "NO") - ENDIF(NL_F_COMPONENT STREQUAL "nelmisc") -ENDFOREACH(NL_F_COMPONENT ${NeL_FIND_COMPONENTS}) - -IF(NEL_FOUND STREQUAL "YES") - IF(NOT NEL_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL: ${NELMISC_LIBRARY}") - ENDIF(NOT NEL_FIND_QUIETLY) -ELSE(NEL_FOUND STREQUAL "YES") - IF(NOT NEL_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL!") - ENDIF(NOT NEL_FIND_QUIETLY) -ENDIF(NEL_FOUND STREQUAL "YES") diff --git a/code/ryzom/CMakeModules/PCHSupport.cmake b/code/ryzom/CMakeModules/PCHSupport.cmake deleted file mode 100644 index dcfcc753a..000000000 --- a/code/ryzom/CMakeModules/PCHSupport.cmake +++ /dev/null @@ -1,212 +0,0 @@ -# - Try to find precompiled headers support for GCC 3.4 and 4.x (and MSVC) -# Once done this will define: -# -# Variable: -# PCHSupport_FOUND -# -# ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp -# ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use -# ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp - -IF(CMAKE_COMPILER_IS_GNUCXX) - - EXEC_PROGRAM( - ${CMAKE_CXX_COMPILER} - ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion - OUTPUT_VARIABLE gcc_compiler_version) - - IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") - SET(PCHSupport_FOUND TRUE) - ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") - IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") - SET(PCHSupport_FOUND TRUE) - ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]") - ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") - - SET(_PCH_include_prefix "-I") - -ELSE(CMAKE_COMPILER_IS_GNUCXX) - - IF(WIN32) - SET(PCHSupport_FOUND TRUE) # for experimental msvc support - SET(_PCH_include_prefix "/I") - ELSE(WIN32) - SET(PCHSupport_FOUND FALSE) - ENDIF(WIN32) - -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags) - - STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name) - SET(${_out_compile_flags} ${${_flags_var_name}} ) - - IF(CMAKE_COMPILER_IS_GNUCXX) - - GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE) - IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32) - LIST(APPEND ${_out_compile_flags} "-fPIC") - ENDIF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32) - - ELSE(CMAKE_COMPILER_IS_GNUCXX) - ## TODO ... ? or does it work out of the box - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - - GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES ) - FOREACH(item ${DIRINC}) - LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}${item}") - ENDFOREACH(item) - - GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) - GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS) - LIST(APPEND ${_out_compile_flags} ${_directory_flags}) - LIST(APPEND ${_out_compile_flags} ${_global_definitions}) - LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS}) - - SEPARATE_ARGUMENTS(${_out_compile_flags}) - -ENDMACRO(_PCH_GET_COMPILE_FLAGS) - -MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) - - IF(CMAKE_COMPILER_IS_GNUCXX) - IF(CMAKE_CXX_COMPILER_ARG1) - # remove leading space in compiler argument - STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1}) - - SET(${out_command} - ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} -c ${_input} - ) - ELSE(CMAKE_CXX_COMPILER_ARG1) - SET(${out_command} - ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} -c ${_input} - ) - ENDIF(CMAKE_CXX_COMPILER_ARG1) - ELSE(CMAKE_COMPILER_IS_GNUCXX) - - # nothing to do because std*.cpp are already added to target - - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -ENDMACRO(_PCH_GET_COMPILE_COMMAND ) - - - -MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path) - - FILE(TO_NATIVE_PATH ${_pch_path} _native_pch_path) - - IF(CMAKE_COMPILER_IS_GNUCXX) - # for use with distcc and gcc >4.0.1 if preprocessed files are accessible - # on all remote machines set - # PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess - SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS}-include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} -Winvalid-pch") - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - -ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS ) - -MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output) - GET_FILENAME_COMPONENT(_name ${_input} NAME) - SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch") -ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input) - - -MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use ) - - # to do: test whether compiler flags match between target _targetName - # and _pch_output_to_use - GET_FILENAME_COMPONENT(_name ${_input} NAME) - - _PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use}) - - SET_TARGET_PROPERTIES(${_targetName} - PROPERTIES - COMPILE_FLAGS ${_target_cflags} - ) - - ADD_CUSTOM_TARGET(pch_Generate_${_targetName} - DEPENDS ${_pch_output_to_use} - ) - - ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} ) - -ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET) - -MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp) - - SET(_PCH_current_target ${_targetName}) - - IF(NOT CMAKE_BUILD_TYPE) - MESSAGE(FATAL_ERROR - "This is the ADD_PRECOMPILED_HEADER macro. " - "You must set CMAKE_BUILD_TYPE!" - ) - ENDIF(NOT CMAKE_BUILD_TYPE) - - GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_inputh} _output) - - GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE) - - # always build static library because it doesn't need linking - ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_inputcpp}) - - _PCH_GET_COMPILE_FLAGS(_compile_FLAGS) - - SET_SOURCE_FILES_PROPERTIES(${_inputh} PROPERTIES GENERATED 1) - - _PCH_GET_COMPILE_COMMAND(_command ${_inputh} ${_output}) - - ADD_CUSTOM_COMMAND( - OUTPUT ${_output} - COMMAND ${_command} - DEPENDS ${_inputh} ${_targetName}_pch_dephelp - ) - - ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_inputh} ${_output}) - -ENDMACRO(ADD_PRECOMPILED_HEADER) - -MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp) - - if(CMAKE_GENERATOR MATCHES Visual*) - # Auto include the precompile (useful for moc processing, since the use of - # precompiled is specified at the target level - # and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt) - - GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS) - if (${oldProps} MATCHES NOTFOUND) - SET(oldProps "") - endif(${oldProps} MATCHES NOTFOUND) - - SET(newProperties "${oldProps} /Yu\"${_inputh}\" /FI\"${_inputh}\"") - SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}") - - #also inlude ${oldProps} to have the same compile options - SET_SOURCE_FILES_PROPERTIES(${_inputcpp} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_inputh}\"") - - else(CMAKE_GENERATOR MATCHES Visual*) - - if (CMAKE_GENERATOR MATCHES Xcode) - # For Xcode, cmake needs my patch to process - # GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties - - GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS) - if (${oldProps} MATCHES NOTFOUND) - SET(oldProps "") - endif(${oldProps} MATCHES NOTFOUND) - - # When buiding out of the tree, precompiled may not be located - # Use full path instead. - GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE) - - SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}") - SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES") - - else (CMAKE_GENERATOR MATCHES Xcode) - - #Fallback to the "old" precompiled suppport - ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp}) - endif(CMAKE_GENERATOR MATCHES Xcode) - endif(CMAKE_GENERATOR MATCHES Visual*) - -ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER) diff --git a/code/ryzom/CMakeModules/nel.cmake b/code/ryzom/CMakeModules/nel.cmake deleted file mode 100644 index 80050b7cd..000000000 --- a/code/ryzom/CMakeModules/nel.cmake +++ /dev/null @@ -1,176 +0,0 @@ -### -# Checks build vs. source location. Prevents In-Source builds. -### -MACRO(CHECK_OUT_OF_SOURCE) - IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - MESSAGE(FATAL_ERROR " - -CMake generation for this project is not allowed within the source directory! -Remove the CMakeCache.txt file and try again from another folder, e.g.: - - rm CMakeCache.txt - mkdir cmake - cd cmake - cmake -G \"Unix Makefiles\" .. - ") - ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - -ENDMACRO(CHECK_OUT_OF_SOURCE) - -MACRO(NL_SETUP_DEFAULT_OPTIONS) - ### - # Build options - ### - - OPTION(WITH_CLIENT "Build Ryzom Core Client" ON ) - OPTION(WITH_TOOLS "Build Ryzom Core Tools" ON ) - OPTION(WITH_SERVER "Build Ryzom Core Services" ON ) - OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" ON ) - OPTION(FINAL_VERSION "Build in Final Version mode" ON ) - - ### - # Features - ### - OPTION(WITH_LOGGING "With Logging" ON ) - OPTION(WITH_COVERAGE "With Code Coverage Support" OFF) - OPTION(WITH_PCH "With Precompiled Headers" ON ) - - ### - # Optional support - ### - OPTION(WITH_SOUND "Build Sound Support" OFF) - OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF) -ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) - - -MACRO(NL_SETUP_BUILD) - - #----------------------------------------------------------------------------- - # Setup the buildmode variables. - # - # None = NL_RELEASE - # Debug = NL_DEBUG - # Release = NL_RELEASE, NL_NO_DEBUG - # RelWithDebInfo = NL_RELEASE - # MinSizeRel = NL_RELEASE, NL_NO_DEBUG - - IF(CMAKE_BUILD_TYPE MATCHES "Debug") - SET(NL_BUILD_MODE "NL_DEBUG") - ELSE(CMAKE_BUILD_TYPE MATCHES "Debug") - IF(CMAKE_BUILD_TYPE MATCHES "Release") - SET(NL_BUILD_MODE "NL_RELEASE") - ELSE(CMAKE_BUILD_TYPE MATCHES "Release") - SET(NL_BUILD_MODE "NL_RELEASE") - # enforce release mode if it's neither Debug nor Release - SET(CMAKE_BUILD_TYPE "Release") - ENDIF(CMAKE_BUILD_TYPE MATCHES "Release") - ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug") - - IF(WIN32) - SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-") - SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF") - SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF") - ELSE(WIN32) - SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused -fno-strict-aliasing") - IF(WITH_COVERAGE) - SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}") - ENDIF(WITH_COVERAGE) - SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++") - IF(NOT APPLE) - SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lrt") - ENDIF(NOT APPLE) - SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g") - SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6 -g") - SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ") - SET(NL_NONE_CFLAGS "-DNL_RELEASE -g -finline-functions -O2 ") - ENDIF(WIN32) - - # Determine host CPU - IF(UNIX AND NOT WIN32) - FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) - IF(CMAKE_UNAME) - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR) - SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)") - IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - ADD_DEFINITIONS(-DHAVE_X86_64) - ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") - ADD_DEFINITIONS(-DHAVE_IA64) - ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - ADD_DEFINITIONS(-DHAVE_X86) - ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - ELSE(CMAKE_UNAME) # Assume that if uname is not found that we're x86. - ADD_DEFINITIONS(-DHAVE_X86) - ENDIF(CMAKE_UNAME) - ENDIF(UNIX AND NOT WIN32) - -ENDMACRO(NL_SETUP_BUILD) - -MACRO(NL_SETUP_BUILD_FLAGS) - ## None - #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ") - #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NL_NONE_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## Debug - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${NL_DEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## Release - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${NL_RELEASE_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## RelWithDebInfo - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - - ## MinSizeRel - SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ") -ENDMACRO(NL_SETUP_BUILD_FLAGS) - -MACRO(RYZOM_SETUP_PREFIX_PATHS) - ## Allow override of install_prefix path. - IF(NOT RYZOM_PREFIX) - IF(WIN32) - SET(RYZOM_PREFIX "." CACHE PATH "Installation path") - ELSE(WIN32) - SET(RYZOM_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Installation path") - ENDIF(WIN32) - ENDIF(NOT RYZOM_PREFIX) - - ## Allow override of install_prefix/etc path. - IF(NOT RYZOM_ETC_PREFIX) - IF(WIN32) - SET(RYZOM_ETC_PREFIX "." CACHE PATH "Installation path for configurations") - ELSE(WIN32) - SET(RYZOM_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc/ryzom" CACHE PATH "Installation path for configurations") - ENDIF(WIN32) - ENDIF(NOT RYZOM_ETC_PREFIX) - - ## Allow override of install_prefix/share path. - IF(NOT RYZOM_SHARE_PREFIX) - IF(WIN32) - SET(RYZOM_SHARE_PREFIX "." CACHE PATH "Installation path for data.") - ELSE(WIN32) - SET(RYZOM_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share/ryzom" CACHE PATH "Installation path for data.") - ENDIF(WIN32) - ENDIF(NOT RYZOM_SHARE_PREFIX) - - ## Allow override of install_prefix/sbin path. - IF(NOT RYZOM_SBIN_PREFIX) - IF(WIN32) - SET(RYZOM_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.") - ELSE(WIN32) - SET(RYZOM_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.") - ENDIF(WIN32) - ENDIF(NOT RYZOM_SBIN_PREFIX) - - ## Allow override of install_prefix/bin path. - IF(NOT RYZOM_BIN_PREFIX) - IF(WIN32) - SET(RYZOM_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.") - ELSE(WIN32) - SET(RYZOM_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for client and tools.") - ENDIF(WIN32) - ENDIF(NOT RYZOM_BIN_PREFIX) - -ENDMACRO(RYZOM_SETUP_PREFIX_PATHS) From d8ffaa120f6ecb622ce2a0c1f213bf4ff36af86c Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Thu, 2 Sep 2010 13:53:33 -0600 Subject: [PATCH 2/3] Update: #842 Added "NeL" before NeL project labels, moved some files, fixed Qt builds, fixed libwww find on Windows. --- code/CMakeLists.txt | 132 +--- code/CMakeModules/FindLibwww.cmake | 11 +- code/CMakeModules/nel.cmake | 44 +- code/COPYING | 661 ++++++++++++++++++ code/README | 32 + code/nel/CMakeLists.txt | 109 +++ code/nel/samples/3d/cegui/CMakeLists.txt | 2 +- .../samples/3d/cluster_viewer/CMakeLists.txt | 2 +- code/nel/samples/3d/font/CMakeLists.txt | 2 +- .../samples/3d/shape_viewer/CMakeLists.txt | 2 +- code/nel/samples/georges/CMakeLists.txt | 2 +- code/nel/samples/misc/command/CMakeLists.txt | 2 +- .../samples/misc/configfile/CMakeLists.txt | 2 +- code/nel/samples/misc/debug/CMakeLists.txt | 2 +- code/nel/samples/misc/i18n/CMakeLists.txt | 2 +- code/nel/samples/misc/log/CMakeLists.txt | 2 +- code/nel/samples/misc/strings/CMakeLists.txt | 2 +- code/nel/samples/net/chat/CMakeLists.txt | 4 +- .../net/class_transport/CMakeLists.txt | 4 +- .../samples/net/login_system/CMakeLists.txt | 4 +- code/nel/samples/net/udp/CMakeLists.txt | 4 +- code/nel/tools/3d/tile_edit_qt/CMakeLists.txt | 6 +- code/nel/tools/CMakeLists.txt | 2 +- code/nel/tools/misc/CMakeLists.txt | 5 +- .../tools/misc/words_dic_qt/CMakeLists.txt | 2 +- code/ryzom/CMakeLists.txt | 112 +-- code/ryzom/client/CMakeLists.txt | 4 +- code/ryzom/client/src/CMakeLists.txt | 34 +- .../client/src/client_sheets/CMakeLists.txt | 23 +- .../ryzom/client/src/seven_zip/CMakeLists.txt | 19 +- .../common/src/game_share/CMakeLists.txt | 23 +- .../server/src/admin_modules/CMakeLists.txt | 14 +- code/ryzom/server/src/ai_share/CMakeLists.txt | 20 +- .../src/gameplay_module_lib/CMakeLists.txt | 23 +- code/ryzom/server/src/pd_lib/CMakeLists.txt | 25 +- .../src/pd_reference_builder/CMakeLists.txt | 22 +- .../server/src/server_share/CMakeLists.txt | 20 +- .../client/client_patcher/CMakeLists.txt | 12 +- code/ryzom/tools/sheets_packer/CMakeLists.txt | 26 +- 39 files changed, 976 insertions(+), 443 deletions(-) create mode 100644 code/COPYING create mode 100644 code/README create mode 100644 code/nel/CMakeLists.txt diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 3f1dc485b..06acc5258 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -38,17 +38,17 @@ INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL) CHECK_OUT_OF_SOURCE() IF(WIN32) - SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}") + SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/include;${CMAKE_INCLUDE_PATH}") # Stupid hack for FindOpenAL.cmake - SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}") + SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty;${CMAKE_INCLUDE_PATH}") + SET(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/lib;${CMAKE_LIBRARY_PATH}") IF(NOT DEFINED ENV{QTDIR}) SET(ENV{QTDIR} "c:/qt/4.5.0") ENDIF(NOT DEFINED ENV{QTDIR}) ENDIF(WIN32) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(NeL CXX C) +PROJECT(RyzomCore CXX C) SET(NL_VERSION_MAJOR 0) SET(NL_VERSION_MINOR 7) SET(NL_VERSION_PATCH 0) @@ -63,6 +63,8 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) # Set default config options # NL_SETUP_DEFAULT_OPTIONS() +NL_SETUP_NEL_DEFAULT_OPTIONS() +NL_SETUP_RYZOM_DEFAULT_OPTIONS() NL_SETUP_PREFIX_PATHS() #----------------------------------------------------------------------------- @@ -80,107 +82,6 @@ FIND_PACKAGE(Jpeg) NL_SETUP_BUILD() -IF(WITH_STATIC_DRIVERS) - IF(WIN32) - ADD_DEFINITIONS(/DNL_STATIC) - ELSE(WIN32) - ADD_DEFINITIONS(-DNL_STATIC) - ENDIF(WIN32) -ENDIF(WITH_STATIC_DRIVERS) - -# On Windows we need to find DirectInput for NLMISC. -# This is how we get events. -IF(WIN32) - FIND_PACKAGE(DirectXSDK) - - # On Win32 we can also build the MAX plugins. - IF(WITH_MAXPLUGIN) - FIND_PACKAGE(3dsMaxSDK) - ENDIF(WITH_MAXPLUGIN) -ENDIF(WIN32) - -IF(WITH_3D) - FIND_PACKAGE(FreeType) - - IF(WITH_DRIVER_OPENGL) - FIND_PACKAGE(OpenGL) - IF(NOT WIN32) - IF(APPLE) - FIND_LIBRARY(CARBON NAMES Carbon) - FIND_LIBRARY(COCOA NAMES Cocoa) - ELSE(APPLE) - FIND_PACKAGE(X11) - FIND_PACKAGE(XF86VidMode) - FIND_PACKAGE(XRandR) - ENDIF(APPLE) - ENDIF(NOT WIN32) - ENDIF(WITH_DRIVER_OPENGL) - - IF(WITH_CEGUI) - FIND_PACKAGE(CEGUI) - ENDIF(WITH_CEGUI) - -ENDIF(WITH_3D) - -IF(WITH_SOUND) - FIND_PACKAGE(Ogg) - FIND_PACKAGE(Vorbis) - - IF(WITH_DRIVER_OPENAL) - FIND_PACKAGE(OpenAL) - ENDIF(WITH_DRIVER_OPENAL) - - IF(WITH_DRIVER_FMOD) - FIND_PACKAGE(FMOD) - ENDIF(WITH_DRIVER_FMOD) -ENDIF(WITH_SOUND) - -IF(WITH_GTK) - FIND_PACKAGE(GTK2) -ENDIF(WITH_GTK) - -IF(WITH_QT) - FIND_PACKAGE(Qt4 REQUIRED) -ENDIF(WITH_QT) - -IF(WITH_TESTS) - FIND_PACKAGE(CppTest) - - - ENABLE_TESTING() - ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html) - IF(BUILD_DASHBOARD) - INCLUDE(Dart) - SET(SVNCOMMAND svn) - SET(SVNSOURCEDIR http://dev.ryzom.com/svn/trunk/nel) - SET(GENERATELOGS svn2cl) - ENDIF(BUILD_DASHBOARD) -ENDIF(WITH_TESTS) - -IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) - SET(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) - SET(libdir "${CMAKE_INSTALL_PREFIX}/lib") - SET(includedir "${CMAKE_INSTALL_PREFIX}/include") - SET(enable_ligo ${WITH_LIGO}) - SET(enable_logic ${WITH_LOGIC}) - SET(enable_georges ${WITH_GEORGES}) - SET(enable_net ${WITH_NET}) - SET(enable_3d ${WITH_3D}) - SET(enable_pacs ${WITH_PACS}) - SET(enable_sound ${WITH_SOUND}) - CONFIGURE_FILE(nel-config.in nel-config) - - INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/nel-config DESTINATION bin) -ENDIF(UNIX) - -IF(WIN32) - INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake) - SET(WINSOCK2_LIB ws2_32.lib) -ENDIF(WIN32) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src) - NL_SETUP_BUILD_FLAGS() INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/PCHSupport.cmake) @@ -189,19 +90,18 @@ IF(FINAL_VERSION) ADD_DEFINITIONS(-DFINAL_VERSION=1) ENDIF(FINAL_VERSION) -ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(include) +IF(WITH_QT) + FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml REQUIRED) +ENDIF(WITH_QT) -IF(WITH_SAMPLES) - ADD_SUBDIRECTORY(samples) -ENDIF(WITH_SAMPLES) +IF(WITH_NEL) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include) + ADD_SUBDIRECTORY(nel) +ENDIF(WITH_NEL) -IF(WITH_TOOLS) - IF(WIN32) - FIND_PACKAGE(S3TC) - ENDIF(WIN32) - ADD_SUBDIRECTORY(tools) -ENDIF(WITH_TOOLS) +IF(WITH_RYZOM) + ADD_SUBDIRECTORY(ryzom) +ENDIF(WITH_RYZOM) # To build the documention, you will have to enable it # and then do the equivalent of "make DoxygenDoc". diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake index 32319fd7d..d715fa139 100644 --- a/code/CMakeModules/FindLibwww.cmake +++ b/code/CMakeModules/FindLibwww.cmake @@ -85,14 +85,9 @@ FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip) # combine all the libraries into one variable SET(LIBWWW_LIBRARY - ${LIBMD5_LIBRARY} ${LIBWWWAPP_LIBRARY} - ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} - ${LIBWWWFTP_LIBRARY} ${LIBWWWGOPHER_LIBRARY} ${LIBWWWHTML_LIBRARY} - ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} - ${LIBWWWMUX_LIBRARY} ${LIBWWWNEWS_LIBRARY} - ${LIBWWWSTREAM_LIBRARY} ${LIBWWWTELNET_LIBRARY} - ${LIBWWWZIP_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWFILE_LIBRARY} - ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ${LIBWWWXML_LIBRARY} + ${LIBWWWAPP_LIBRARY} ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWHTML_LIBRARY} + ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY} + ${LIBWWWSTREAM_LIBRARY} ${LIBWWWCACHE_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} ) IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 6535e5739..3125ddb78 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -165,6 +165,21 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS) ENDIF(WIN32) OPTION(WITH_STATIC_DRIVERS "With static drivers." OFF) + + ### + # Optional support + ### + OPTION(WITH_GTK "With GTK Support" OFF) + OPTION(WITH_QT "With QT Support" OFF) + OPTION(WITH_STLPORT "With STLport support." OFF) + OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF) + + OPTION(WITH_NEL "Build NeL (nearly always required)." ON ) + OPTION(WITH_NELNS "Build NeL Network Services." ON ) + OPTION(WITH_RYZOM "Build Ryzom Core." ON ) +ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) + +MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) ### # Core libraries ### @@ -189,16 +204,25 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS) ### # Optional support ### - OPTION(WITH_CEGUI "Build CEGUI Renderer" OFF) - OPTION(WITH_TOOLS "Build NeL Tools" ON ) - OPTION(WITH_MAXPLUGIN "Build NeL 3dsMax Plugin" OFF) - OPTION(WITH_SAMPLES "Build NeL Samples" ON ) - OPTION(WITH_TESTS "Build NeL Unit Tests" ON ) - OPTION(WITH_GTK "With GTK Support" OFF) - OPTION(WITH_QT "With QT Support" OFF) - OPTION(WITH_STLPORT "With STLport support." OFF) - OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF) -ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) + OPTION(WITH_NEL_CEGUI "Build CEGUI Renderer" OFF) + OPTION(WITH_NEL_TOOLS "Build NeL Tools" ON ) + OPTION(WITH_NEL_MAXPLUGIN "Build NeL 3dsMax Plugin" OFF) + OPTION(WITH_NEL_SAMPLES "Build NeL Samples" ON ) + OPTION(WITH_NEL_TESTS "Build NeL Unit Tests" ON ) + +ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) + +MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) + ### + # Core libraries + ### + OPTION(WITH_RYZOM_CLIENT "Build Ryzom Core Client" ON ) + OPTION(WITH_RYZOM_TOOLS "Build Ryzom Core Tools" ON ) + OPTION(WITH_RYZOM_SERVER "Build Ryzom Core Services" ON ) + OPTION(WITH_RYZOM_SOUND "Enable Ryzom Core Sound" ON ) + + OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" ON ) +ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) MACRO(NL_SETUP_BUILD) diff --git a/code/COPYING b/code/COPYING new file mode 100644 index 000000000..dba13ed2d --- /dev/null +++ b/code/COPYING @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/code/README b/code/README new file mode 100644 index 000000000..e880666e5 --- /dev/null +++ b/code/README @@ -0,0 +1,32 @@ +Introduction +------------ + +NeL is a software platform for creating and running massively multi-user +entertainment in a 3D environment over the Internet. + +The NeL library is further divided into specific modules: network, ai, 3d +and misc. If you want to use any of these, you also need to use the misc +part of the library, but ai, 3d and network are totally independant from +each other so you can use only the parts you really need in your project. + +If you want know more about the library content and functionalities, you +should take a look on the documents present in the doc directory. + +NeL is currently developped and tested under GNU/Linux and Windows +environments. + + +License +------- + +NeL is a Free Software project under the GNU Affero General Public License, +which means all its code is available for everyone to download, examine, +use, modify, and distribute, subject to the usual restrictions attached +to any GPL software. If you are not familiar with the AGPL, see the COPYING +file for for more details on license terms and other legal issues. + + +Installation +------------ + +Please check the dev.ryzom.com for more information \ No newline at end of file diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt new file mode 100644 index 000000000..7eeb3a8d9 --- /dev/null +++ b/code/nel/CMakeLists.txt @@ -0,0 +1,109 @@ +PROJECT(NeL CXX C) + +IF(WITH_STATIC_DRIVERS) + IF(WIN32) + ADD_DEFINITIONS(/DNL_STATIC) + ELSE(WIN32) + ADD_DEFINITIONS(-DNL_STATIC) + ENDIF(WIN32) +ENDIF(WITH_STATIC_DRIVERS) + +# On Windows we need to find DirectInput for NLMISC. +# This is how we get events. +IF(WIN32) + FIND_PACKAGE(DirectXSDK) + + # On Win32 we can also build the MAX plugins. + IF(WITH_MAXPLUGIN) + FIND_PACKAGE(3dsMaxSDK) + ENDIF(WITH_MAXPLUGIN) +ENDIF(WIN32) + +IF(WITH_3D) + FIND_PACKAGE(FreeType) + + IF(WITH_DRIVER_OPENGL) + FIND_PACKAGE(OpenGL) + IF(NOT WIN32) + IF(APPLE) + FIND_LIBRARY(CARBON NAMES Carbon) + FIND_LIBRARY(COCOA NAMES Cocoa) + ELSE(APPLE) + FIND_PACKAGE(X11) + FIND_PACKAGE(XF86VidMode) + FIND_PACKAGE(XRandR) + ENDIF(APPLE) + ENDIF(NOT WIN32) + ENDIF(WITH_DRIVER_OPENGL) + + IF(WITH_CEGUI) + FIND_PACKAGE(CEGUI) + ENDIF(WITH_CEGUI) + +ENDIF(WITH_3D) + +IF(WITH_SOUND) + FIND_PACKAGE(Ogg) + FIND_PACKAGE(Vorbis) + + IF(WITH_DRIVER_OPENAL) + FIND_PACKAGE(OpenAL) + ENDIF(WITH_DRIVER_OPENAL) + + IF(WITH_DRIVER_FMOD) + FIND_PACKAGE(FMOD) + ENDIF(WITH_DRIVER_FMOD) +ENDIF(WITH_SOUND) + +IF(WITH_GTK) + FIND_PACKAGE(GTK2) +ENDIF(WITH_GTK) + +IF(WITH_NEL_TESTS) + FIND_PACKAGE(CppTest) + + ENABLE_TESTING() + ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html) + IF(BUILD_DASHBOARD) + INCLUDE(Dart) + SET(SVNCOMMAND svn) + SET(SVNSOURCEDIR http://dev.ryzom.com/svn/trunk/nel) + SET(GENERATELOGS svn2cl) + ENDIF(BUILD_DASHBOARD) +ENDIF(WITH_NEL_TESTS) + +IF(UNIX) + SET(prefix ${CMAKE_INSTALL_PREFIX}) + SET(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) + SET(libdir "${CMAKE_INSTALL_PREFIX}/lib") + SET(includedir "${CMAKE_INSTALL_PREFIX}/include") + SET(enable_ligo ${WITH_LIGO}) + SET(enable_logic ${WITH_LOGIC}) + SET(enable_georges ${WITH_GEORGES}) + SET(enable_net ${WITH_NET}) + SET(enable_3d ${WITH_3D}) + SET(enable_pacs ${WITH_PACS}) + SET(enable_sound ${WITH_SOUND}) + CONFIGURE_FILE(nel-config.in nel-config) + + INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/nel-config DESTINATION bin) +ENDIF(UNIX) + +IF(WIN32) + INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake) + SET(WINSOCK2_LIB ws2_32.lib) +ENDIF(WIN32) + +ADD_SUBDIRECTORY(include) +ADD_SUBDIRECTORY(src) + +IF(WITH_NEL_SAMPLES) + ADD_SUBDIRECTORY(samples) +ENDIF(WITH_NEL_SAMPLES) + +IF(WITH_NEL_TOOLS) + IF(WIN32) + FIND_PACKAGE(S3TC) + ENDIF(WIN32) + ADD_SUBDIRECTORY(tools) +ENDIF(WITH_NEL_TOOLS) \ No newline at end of file diff --git a/code/nel/samples/3d/cegui/CMakeLists.txt b/code/nel/samples/3d/cegui/CMakeLists.txt index 6e8a19a3f..ba04f4229 100644 --- a/code/nel/samples/3d/cegui/CMakeLists.txt +++ b/code/nel/samples/3d/cegui/CMakeLists.txt @@ -11,7 +11,7 @@ IF(WIN32) LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, 3D: NeL CEGUI Demo") + PROJECT_LABEL "NeL, Samples, 3D: NeL CEGUI Demo") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt index 16208dd28..384659264 100644 --- a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt @@ -7,7 +7,7 @@ ADD_DEFINITIONS(-DCV_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_clusterview/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_clusterview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) NL_ADD_RUNTIME_FLAGS(nl_sample_clusterview) -NL_DEFAULT_PROPS(nl_sample_clusterview "Samples, 3D: Cluster Viewer") +NL_DEFAULT_PROPS(nl_sample_clusterview "NeL, Samples, 3D: Cluster Viewer") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/font/CMakeLists.txt b/code/nel/samples/3d/font/CMakeLists.txt index 503fa3e7a..2346ca734 100644 --- a/code/nel/samples/3d/font/CMakeLists.txt +++ b/code/nel/samples/3d/font/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_font/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_font ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) -NL_DEFAULT_PROPS(nl_sample_font "Samples, 3D: Font") +NL_DEFAULT_PROPS(nl_sample_font "NeL, Samples, 3D: Font") NL_ADD_RUNTIME_FLAGS(nl_sample_font) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/3d/shape_viewer/CMakeLists.txt b/code/nel/samples/3d/shape_viewer/CMakeLists.txt index e0544ef1e..91e008cba 100644 --- a/code/nel/samples/3d/shape_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/shape_viewer/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_shapeview WIN32 ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_shapeview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) -NL_DEFAULT_PROPS(nl_sample_shapeview "Samples, 3D: Font") +NL_DEFAULT_PROPS(nl_sample_shapeview "NeL, Samples, 3D: Font") NL_ADD_RUNTIME_FLAGS(nl_sample_shapeview) IF(WIN32) diff --git a/code/nel/samples/georges/CMakeLists.txt b/code/nel/samples/georges/CMakeLists.txt index abbeb60af..1feb7301e 100644 --- a/code/nel/samples/georges/CMakeLists.txt +++ b/code/nel/samples/georges/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DGF_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_georges/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_georges ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelgeorges nelmisc) -NL_DEFAULT_PROPS(nl_sample_georges "Samples: Georges") +NL_DEFAULT_PROPS(nl_sample_georges "NeL, Samples: Georges") NL_ADD_RUNTIME_FLAGS(nl_sample_georges) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/command/CMakeLists.txt b/code/nel/samples/misc/command/CMakeLists.txt index 8f830d199..cffdbbff7 100644 --- a/code/nel/samples/misc/command/CMakeLists.txt +++ b/code/nel/samples/misc/command/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(nl_sample_command ${SRC}) TARGET_LINK_LIBRARIES(nl_sample_command ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_command "Samples, Misc: Commands") +NL_DEFAULT_PROPS(nl_sample_command "NeL, Samples, Misc: Commands") NL_ADD_RUNTIME_FLAGS(nl_sample_command) INSTALL(TARGETS nl_sample_command RUNTIME DESTINATION bin COMPONENT samplesmisc) diff --git a/code/nel/samples/misc/configfile/CMakeLists.txt b/code/nel/samples/misc/configfile/CMakeLists.txt index b7b0232fa..7924d41a0 100644 --- a/code/nel/samples/misc/configfile/CMakeLists.txt +++ b/code/nel/samples/misc/configfile/CMakeLists.txt @@ -5,7 +5,7 @@ ADD_EXECUTABLE(nl_sample_configfile ${SRC}) ADD_DEFINITIONS(-DNL_SAMPLE_CFG="\\"${NL_SHARE_PREFIX}/nl_sample_configfile/\\"") TARGET_LINK_LIBRARIES(nl_sample_configfile ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_configfile "Samples, Misc: Config Files") +NL_DEFAULT_PROPS(nl_sample_configfile "NeL, Samples, Misc: Config Files") NL_ADD_RUNTIME_FLAGS(nl_sample_configfile) INSTALL(TARGETS nl_sample_configfile RUNTIME DESTINATION bin COMPONENT samplesmisc) diff --git a/code/nel/samples/misc/debug/CMakeLists.txt b/code/nel/samples/misc/debug/CMakeLists.txt index 4b0569045..843209cd7 100644 --- a/code/nel/samples/misc/debug/CMakeLists.txt +++ b/code/nel/samples/misc/debug/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_debug ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_debug ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_debug "Samples, Misc: Debugging") +NL_DEFAULT_PROPS(nl_sample_debug "NeL, Samples, Misc: Debugging") NL_ADD_RUNTIME_FLAGS(nl_sample_debug) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/i18n/CMakeLists.txt b/code/nel/samples/misc/i18n/CMakeLists.txt index 9fc44db13..44059fe3c 100644 --- a/code/nel/samples/misc/i18n/CMakeLists.txt +++ b/code/nel/samples/misc/i18n/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DNL_LANG_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_i18n/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_i18n ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_i18n "Samples, Misc: I18N") +NL_DEFAULT_PROPS(nl_sample_i18n "NeL, Samples, Misc: I18N") NL_ADD_RUNTIME_FLAGS(nl_sample_i18n) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/log/CMakeLists.txt b/code/nel/samples/misc/log/CMakeLists.txt index 7f7085c83..547b2f268 100644 --- a/code/nel/samples/misc/log/CMakeLists.txt +++ b/code/nel/samples/misc/log/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_log ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_log ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_log "Samples, Misc: Logging") +NL_DEFAULT_PROPS(nl_sample_log "NeL, Samples, Misc: Logging") NL_ADD_RUNTIME_FLAGS(nl_sample_log) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/misc/strings/CMakeLists.txt b/code/nel/samples/misc/strings/CMakeLists.txt index c0942fc2d..6c2b3295d 100644 --- a/code/nel/samples/misc/strings/CMakeLists.txt +++ b/code/nel/samples/misc/strings/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_strings ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_strings ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(nl_sample_strings "Samples, Misc: Strings") +NL_DEFAULT_PROPS(nl_sample_strings "NeL, Samples, Misc: Strings") NL_ADD_RUNTIME_FLAGS(nl_sample_strings) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/chat/CMakeLists.txt b/code/nel/samples/net/chat/CMakeLists.txt index b9e79d9d0..c0a5e670a 100644 --- a/code/nel/samples/net/chat/CMakeLists.txt +++ b/code/nel/samples/net/chat/CMakeLists.txt @@ -15,12 +15,12 @@ IF(WIN32) LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:CONSOLE" - PROJECT_LABEL "Samples, Net, Chat: Chat Client") + PROJECT_LABEL "NeL, Samples, Net, Chat: Chat Client") SET_TARGET_PROPERTIES(nl_sample_chatserver PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Chat: Chat Server") + PROJECT_LABEL "NeL, Samples, Net, Chat: Chat Server") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/class_transport/CMakeLists.txt b/code/nel/samples/net/class_transport/CMakeLists.txt index f8f67522e..a8203b411 100644 --- a/code/nel/samples/net/class_transport/CMakeLists.txt +++ b/code/nel/samples/net/class_transport/CMakeLists.txt @@ -12,12 +12,12 @@ IF(WIN32) LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Class Transport: AI Service") + PROJECT_LABEL "NeL, Samples, Net, Class Transport: AI Service") SET_TARGET_PROPERTIES(nl_sample_ct_gd_service PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Class Transport: GD Service") + PROJECT_LABEL "NeL, Samples, Net, Class Transport: GD Service") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/login_system/CMakeLists.txt b/code/nel/samples/net/login_system/CMakeLists.txt index e10000242..e9013bc15 100644 --- a/code/nel/samples/net/login_system/CMakeLists.txt +++ b/code/nel/samples/net/login_system/CMakeLists.txt @@ -11,12 +11,12 @@ IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_ls_client PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Samples, Net, Login Service: LS Client") + PROJECT_LABEL "NeL, Samples, Net, Login Service: LS Client") SET_TARGET_PROPERTIES(nl_sample_ls_fes PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples, Net, Login Service: LS Frontend") + PROJECT_LABEL "NeL, Samples, Net, Login Service: LS Frontend") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/net/udp/CMakeLists.txt b/code/nel/samples/net/udp/CMakeLists.txt index 8b0511728..f0cb89c6e 100644 --- a/code/nel/samples/net/udp/CMakeLists.txt +++ b/code/nel/samples/net/udp/CMakeLists.txt @@ -13,8 +13,8 @@ ENDIF(WITH_3D) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_udpclient ${PLATFORM_LINKFLAGS} nelmisc nelnet nel3d) TARGET_LINK_LIBRARIES(nl_sample_udpserver ${PLATFORM_LINKFLAGS} nelmisc nelnet) -NL_DEFAULT_PROPS(nl_sample_udpclient "Samples, Net, UDP: UDP Client") -NL_DEFAULT_PROPS(nl_sample_udpserver "Samples, Net, UDP: UDP Server") +NL_DEFAULT_PROPS(nl_sample_udpclient "NeL, Samples, Net, UDP: UDP Client") +NL_DEFAULT_PROPS(nl_sample_udpserver "NeL, Samples, Net, UDP: UDP Server") NL_ADD_RUNTIME_FLAGS(nl_sample_udpclient) NL_ADD_RUNTIME_FLAGS(nl_sample_udpserver) diff --git a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt index c7425ebb2..0becf5f5b 100644 --- a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt +++ b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/3d/tile_edit_qt/ ) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools/3d/tile_edit_qt/ ) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) INCLUDE( ${QT_USE_FILE} ) FILE(GLOB TILE_EDIT_SRC *.cpp pic/*.c pic/*.cpp) @@ -7,10 +7,6 @@ SET(TILE_EDIT_HDR items_edit_dlg.h tile_browser_dlg.h tile_edit_dlg.h tile_rotat SET(TILE_EDIT_UIS tile_widget_qt.ui tile_rotation_qt.ui tile_edit_qt.ui tile_browser_qt.ui items_edit_qt.ui) SET(TILE_EDIT_RCS tile_edit_qt.qrc) - -SET( QT_USE_QT3SUPPORT TRUE) -SET( QT_USE_QTXML TRUE) - QT4_ADD_RESOURCES( TILE_EDIT_RC_SRCS ${TILE_EDIT_RCS} ) QT4_WRAP_UI( TILE_EDIT_UI_HDRS ${TILE_EDIT_UIS} ) QT4_WRAP_CPP( TILE_EDIT_MOC_SRCS ${TILE_EDIT_HDR}) diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt index 6385953c0..f32cfaab3 100644 --- a/code/nel/tools/CMakeLists.txt +++ b/code/nel/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -SUBDIRS(misc) +ADD_SUBDIRECTORY(misc) IF(WITH_3D) SUBDIRS(3d) diff --git a/code/nel/tools/misc/CMakeLists.txt b/code/nel/tools/misc/CMakeLists.txt index 33e075c1a..3e4410e86 100644 --- a/code/nel/tools/misc/CMakeLists.txt +++ b/code/nel/tools/misc/CMakeLists.txt @@ -1,4 +1,7 @@ -SUBDIRS(bnp_make disp_sheet_id make_sheet_id xml_packer) +ADD_SUBDIRECTORY(bnp_make) +ADD_SUBDIRECTORY(disp_sheet_id) +ADD_SUBDIRECTORY(make_sheet_id) +ADD_SUBDIRECTORY(xml_packer) IF(WITH_QT) ADD_SUBDIRECTORY(words_dic_qt) diff --git a/code/nel/tools/misc/words_dic_qt/CMakeLists.txt b/code/nel/tools/misc/words_dic_qt/CMakeLists.txt index d2a98f837..b697e9f50 100644 --- a/code/nel/tools/misc/words_dic_qt/CMakeLists.txt +++ b/code/nel/tools/misc/words_dic_qt/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/tools/misc/words_dic_qt/ ) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools/misc/words_dic_qt/ ) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ) INCLUDE( ${QT_USE_FILE} ) FILE(GLOB WORDS_DIC_SRC *.cpp) diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index 9cf6558d6..dc89aa7c6 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -1,82 +1,6 @@ -#----------------------------------------------------------------------------- -# -# Ryzom -# Author: Spiderweb -# -# Notes: -# * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path -# * Changing NeL prefix: add -DNEL_PREFIX_PATH:PATH=/my/nel/install -# -#----------------------------------------------------------------------------- - -#----------------------------------------------------------------------------- -# Load some macros. -SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}") -INCLUDE(CMakeModules/nel.cmake) -INCLUDE(CMakeModules/ConfigureChecks.cmake) - -#----------------------------------------------------------------------------- -# Force out of source builds. -CHECK_OUT_OF_SOURCE() - -IF(WIN32) - SET(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}") -ENDIF(WIN32) - -IF(NOT NL_USING_MASTER_PROJECT) - IF(DEFINED NEL_PREFIX_PATH) - SET(CMAKE_INCLUDE_PATH "${NEL_PREFIX_PATH}/include;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${NEL_PREFIX_PATH}/lib;${CMAKE_LIBRARY_PATH}") - ELSE(DEFINED NEL_PREFIX_PATH) - SET(NEL_PREFIX_PATH "" CACHE FILEPATH "NeL Installation Location") - ENDIF(DEFINED NEL_PREFIX_PATH) -ELSE(NOT NL_USING_MASTER_PROJECT) - SET(CMAKE_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/nel/include;${CMAKE_INCLUDE_PATH}") - SET(CMAKE_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib;${CMAKE_LIBRARY_PATH}") -ENDIF(NOT NL_USING_MASTER_PROJECT) - -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - -PROJECT(Ryzom CXX C) -SET(NL_VERSION_MAJOR 0) -SET(NL_VERSION_MINOR 7) -SET(NL_VERSION_PATCH 0) -SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}") - -#----------------------------------------------------------------------------- -# Redirect output files -SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) -SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) - -#----------------------------------------------------------------------------- -# Set CMake 2.6 Policies. -IF(COMMAND cmake_policy) - # Works around warnings libraries linked against that don't - # have absolute paths (e.g. -lpthreads) - cmake_policy(SET CMP0003 NEW) - - # Works around warnings about escaped quotes in ADD_DEFINITIONS - # statements - cmake_policy(SET CMP0005 OLD) -ENDIF(COMMAND cmake_policy) - -#----------------------------------------------------------------------------- -# Set default config options - -NL_SETUP_DEFAULT_OPTIONS() -RYZOM_SETUP_PREFIX_PATHS() - -#----------------------------------------------------------------------------- -# Override default options -#SET(WITH_COVERAGE ON ) -SET(WITH_3D ON ) - #----------------------------------------------------------------------------- #Platform specifics -FIND_PACKAGE(Threads REQUIRED) -FIND_PACKAGE(LibXml2 REQUIRED) IF(WITH_LUA51) FIND_PACKAGE(Lua51 REQUIRED) ELSE(WITH_LUA51) @@ -89,45 +13,25 @@ IF(NOT WIN32 AND NOT APPLE) FIND_PACKAGE(X11) ENDIF(NOT WIN32 AND NOT APPLE) -NL_SETUP_BUILD() - -NL_CONFIGURE_CHECKS() - -FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED) - - -IF(WIN32) - INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake) - SET(WINSOCK2_LIB ws2_32.lib) -ENDIF(WIN32) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common ) -NL_SETUP_BUILD_FLAGS() - -INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/PCHSupport.cmake) - -IF(FINAL_VERSION) - ADD_DEFINITIONS(-DFINAL_VERSION=1) -ENDIF(FINAL_VERSION) - # config.h configuration and use by projects -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ADD_DEFINITIONS(-DHAVE_CONFIG_H) ADD_SUBDIRECTORY(common) -IF(WITH_CLIENT) +IF(WITH_RYZOM_CLIENT) ADD_SUBDIRECTORY(client) -ENDIF(WITH_CLIENT) +ENDIF(WITH_RYZOM_CLIENT) -IF(WITH_TOOLS) +IF(WITH_RYZOM_TOOLS) ADD_SUBDIRECTORY(tools) -ENDIF(WITH_TOOLS) +ENDIF(WITH_RYZOM_TOOLS) -IF(WITH_SERVER) +IF(WITH_RYZOM_SERVER) FIND_PACKAGE(MySQL REQUIRED) ADD_SUBDIRECTORY(server) -ENDIF(WITH_SERVER) +ENDIF(WITH_RYZOM_SERVER) diff --git a/code/ryzom/client/CMakeLists.txt b/code/ryzom/client/CMakeLists.txt index 14475021e..466291933 100644 --- a/code/ryzom/client/CMakeLists.txt +++ b/code/ryzom/client/CMakeLists.txt @@ -8,7 +8,7 @@ ENDIF(UNIX AND NOT APPLE) IF(RYZOM_SHARE_PREFIX) CONFIGURE_FILE(client_default.cfg.in "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg") - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION ${RYZOM_ETC_PREFIX}) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION etc/ryzom) ELSE(RYZOM_SHARE_PREFIX) - INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX}) + INSTALL(FILES client_default.cfg DESTINATION etc/ryzom) ENDIF(RYZOM_SHARE_PREFIX) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 5728d34c0..76f89b494 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -1,6 +1,6 @@ # These are Windows/MFC apps IF(WIN32) - ADD_SUBDIRECTORY(bug_report) +# ADD_SUBDIRECTORY(bug_report) SET(SEVENZIP_LIBRARY "ryzom_sevenzip") ENDIF(WIN32) @@ -29,9 +29,9 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.h) # On Unix we'll need to include config.h -IF(UNIX) - INCLUDE(${CMAKE_BINARY_DIR}) -ENDIF(UNIX) +#IF(UNIX) +# INCLUDE(${CMAKE_BINARY_DIR}) +#ENDIF(UNIX) # on Mac, create a .App Bundle if(APPLE) @@ -64,28 +64,27 @@ ENDIF(APPLE) INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} - ${NEL_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS} - ${LIBXML2_LIBRARIES} - ${NELMISC_LIBRARY} + nelmisc + nelnet + nelligo + nelgeorges + nel3d + nelsound + nelsnd_lowlevel + ryzom_clientsheets ryzom_gameshare - ${NELNET_LIBRARY} - ${NELLIGO_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NEL3D_LIBRARY} + nelpacs ${LUA_LIBRARIES} ${CURL_LIBRARIES} - ${NELSOUND_LIBRARY} - ${NELSNDDRV_LIBRARY} - ryzom_clientsheets - ${NELPACS_LIBRARY} ${LIBWWW_LIBRARY} ${SEVENZIP_LIBRARY} + ${LIBXML2_LIBRARIES} luabind # TODO: find luabind and expat cleanly using a find script expat) @@ -95,8 +94,11 @@ ENDIF(NOT APPLE AND NOT WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client") +NL_ADD_RUNTIME_FLAGS(ryzom_client) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF(WITH_PCH) -INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) +INSTALL(TARGETS ryzom_client RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/client/src/client_sheets/CMakeLists.txt b/code/ryzom/client/src/client_sheets/CMakeLists.txt index 52648361b..cc02e3c64 100644 --- a/code/ryzom/client/src/client_sheets/CMakeLists.txt +++ b/code/ryzom/client/src/client_sheets/CMakeLists.txt @@ -3,26 +3,11 @@ FILE(GLOB PRIV_H *.h) SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) +NL_TARGET_LIB(ryzom_clientsheets ${SRC} ${PRIV_H}) -IF(NOT WIN32) - ADD_LIBRARY(ryzom_clientsheets SHARED ${SRC}) -ELSE(NOT WIN32) - ADD_LIBRARY(ryzom_clientsheets STATIC ${SRC}) -ENDIF(NOT WIN32) - -INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(ryzom_clientsheets ryzom_gameshare ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_clientsheets - PROJECT_LABEL "Library: Client Sheets" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") -ENDIF(WIN32) +TARGET_LINK_LIBRARIES(ryzom_clientsheets ryzom_gameshare nelmisc) +NL_DEFAULT_PROPS(ryzom_clientsheets "Ryzom, Library: Client Sheets") +NL_ADD_LIB_SUFFIX(ryzom_clientsheets) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_clientsheets ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) diff --git a/code/ryzom/client/src/seven_zip/CMakeLists.txt b/code/ryzom/client/src/seven_zip/CMakeLists.txt index a1c6261fe..4c2d97307 100644 --- a/code/ryzom/client/src/seven_zip/CMakeLists.txt +++ b/code/ryzom/client/src/seven_zip/CMakeLists.txt @@ -9,24 +9,11 @@ ADD_EXECUTABLE(7zDec ${SRC}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS}) -IF(NOT WIN32) - ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC}) -ELSE(NOT WIN32) - ADD_LIBRARY(ryzom_sevenzip STATIC ${LIB_SRC}) -ENDIF(NOT WIN32) +NL_TARGET_LIB(ryzom_sevenzip ${LIB_SRC}) TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS}) -SET_TARGET_PROPERTIES(ryzom_sevenzip PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_sevenzip - PROJECT_LABEL "Library: Seven Zip" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") -ENDIF(WIN32) +NL_DEFAULT_PROPS(ryzom_sevenzip "Ryzom, Library: Seven Zip") +NL_ADD_LIB_SUFFIX(ryzom_sevenzip) ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY) diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt index 7c0f768ca..c55a8e1f9 100644 --- a/code/ryzom/common/src/game_share/CMakeLists.txt +++ b/code/ryzom/common/src/game_share/CMakeLists.txt @@ -7,27 +7,12 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp) LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h) -IF(WIN32) - ADD_LIBRARY(ryzom_gameshare STATIC ${SRC}) -ELSE(WIN32) - ADD_LIBRARY(ryzom_gameshare SHARED ${SRC}) -ENDIF(WIN32) +NL_TARGET_LIB(ryzom_gameshare ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(ryzom_gameshare - ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} - ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) -SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_gameshare - PROJECT_LABEL "Library: Game Share" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") -ENDIF(WIN32) +TARGET_LINK_LIBRARIES(ryzom_gameshare nelmisc nelnet nelligo nelgeorges ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) +NL_DEFAULT_PROPS(ryzom_gameshare "Ryzom, Library: Game Share") +NL_ADD_LIB_SUFFIX(ryzom_gameshare) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt index 87056bd6d..25ee5ede3 100644 --- a/code/ryzom/server/src/admin_modules/CMakeLists.txt +++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt @@ -2,18 +2,12 @@ FILE(GLOB SRC *.cpp *.h) ADD_LIBRARY(admin_modules STATIC ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(admin_modules ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(admin_modules nelmisc) SET_TARGET_PROPERTIES(admin_modules PROPERTIES VERSION ${NL_VERSION}) -IF(WIN32) - SET_TARGET_PROPERTIES(admin_modules - PROJECT_LABEL "Library: Admin Modules" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(admin_modules "Ryzom, Library: Service Admin Modules") +NL_ADD_LIB_SUFFIX(admin_modules) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/ai_share/CMakeLists.txt b/code/ryzom/server/src/ai_share/CMakeLists.txt index e9b043a07..28c8eba95 100644 --- a/code/ryzom/server/src/ai_share/CMakeLists.txt +++ b/code/ryzom/server/src/ai_share/CMakeLists.txt @@ -2,23 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_LIBRARY(ai_share STATIC ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare - server_share - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELPACS_LIBRARY}) -SET_TARGET_PROPERTIES(ai_share PROPERTIES VERSION ${NL_VERSION}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare server_share nelmisc nelnet nelgeorges nelpacs) -IF(WIN32) - SET_TARGET_PROPERTIES(ai_share - PROJECT_LABEL "Library: AI Share" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(ai_share "Ryzom, Library: AI Shared") +NL_ADD_LIB_SUFFIX(ai_share) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt b/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt index dd4824b2d..ef1a89ea7 100644 --- a/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt +++ b/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt @@ -1,25 +1,12 @@ FILE(GLOB SRC *.cpp *.h) -IF(WIN32) - ADD_LIBRARY(gameplay_module_lib STATIC ${SRC}) -ELSE(WIN32) - ADD_LIBRARY(gameplay_module_lib SHARED ${SRC}) -ENDIF(WIN32) +NL_TARGET_LIB(gameplay_module_lib ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(gameplay_module_lib ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(gameplay_module_lib PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(gameplay_module_lib nelmisc) -IF(WIN32) - SET_TARGET_PROPERTIES(gameplay_module_lib - PROJECT_LABEL "Library: Gameplay Module" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(gameplay_module_lib "Ryzom, Library: Gameplay Module") +NL_ADD_LIB_SUFFIX(gameplay_module_lib) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/pd_lib/CMakeLists.txt b/code/ryzom/server/src/pd_lib/CMakeLists.txt index 5269c047a..8afe31c4c 100644 --- a/code/ryzom/server/src/pd_lib/CMakeLists.txt +++ b/code/ryzom/server/src/pd_lib/CMakeLists.txt @@ -4,26 +4,13 @@ FILE(GLOB SRC *.cpp *.h) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.h) -IF(WIN32) - ADD_LIBRARY(pd_lib STATIC ${SRC}) -ELSE(WIN32) - ADD_LIBRARY(pd_lib SHARED ${SRC}) -ENDIF(WIN32) +NL_TARGET_LIB(pd_lib ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(pd_lib ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(pd_lib PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) - -IF(WIN32) - SET_TARGET_PROPERTIES(pd_lib - PROJECT_LABEL "Library: PD Lib" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(pd_lib nelmisc) + +NL_DEFAULT_PROPS(pd_lib "Ryzom, Library: PD Lib") +NL_ADD_LIB_SUFFIX(pd_lib) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt index b8a2c3e81..eb27698c5 100644 --- a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt +++ b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt @@ -2,19 +2,21 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(reference_builder_service ${SRC}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(reference_builder_service ryzom_gameshare +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(reference_builder_service + ryzom_gameshare pd_lib + nelmisc + nelnet + nelgeorges ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY}) -IF(WIN32) - SET_TARGET_PROPERTIES(pd_reference_builder PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: Reference Builder Service (RBS)") -ENDIF(WIN32) + ) + + +NL_DEFAULT_PROPS(reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)") +NL_ADD_RUNTIME_FLAGS(reference_builder_service) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS reference_builder_service RUNTIME DESTINATION sbin COMPONENT services) diff --git a/code/ryzom/server/src/server_share/CMakeLists.txt b/code/ryzom/server/src/server_share/CMakeLists.txt index b5009204d..574e2ae91 100644 --- a/code/ryzom/server/src/server_share/CMakeLists.txt +++ b/code/ryzom/server/src/server_share/CMakeLists.txt @@ -2,23 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_LIBRARY(server_share STATIC ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(server_share ${NELMISC_LIBRARY} - ${NELPACS_LIBRARY} - ${MYSQL_LIBRARIES} - ${ZLIB_LIBRARIES}) -SET_TARGET_PROPERTIES(server_share PROPERTIES - VERSION ${NL_VERSION} - SOVERSION ${NL_VERSION_MAJOR}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(server_share nelmisc nelpacs ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES}) -IF(WIN32) - SET_TARGET_PROPERTIES(server_share - PROJECT_LABEL "Library: Server Share" - DEBUG_POSTFIX "_d" - RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") -ENDIF(WIN32) +NL_DEFAULT_PROPS(server_share "Ryzom, Library: Service Shared") +NL_ADD_LIB_SUFFIX(server_share) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index 29ce59b88..fbb394d36 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -11,23 +11,25 @@ ADD_EXECUTABLE(ryzom_client_patcher ${SRC}) INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${LIBXML2_INCLUDE_DIR} - ${NEL_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/client/src + ${CMAKE_SOURCE_DIR}/ryzom/client/src ) TARGET_LINK_LIBRARIES(ryzom_client_patcher ${PLATFORM_LINKFLAGS} - ${NELMISC_LIBRARY} + nelmisc + nelnet ryzom_gameshare - ${NELNET_LIBRARY} ${CURL_LIBRARIES} ${SEVENZIP_LIBRARY}) ADD_DEFINITIONS(-DRZ_NO_CLIENT -DNL_USE_SEVENZIP) +NL_DEFAULT_PROPS(ryzom_client "Ryzom, Tools: Ryzom Client Patcher") +NL_ADD_RUNTIME_FLAGS(ryzom_client) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/client/src/stdpch.cpp) ENDIF(WITH_PCH) -INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications) +INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/tools/sheets_packer/CMakeLists.txt b/code/ryzom/tools/sheets_packer/CMakeLists.txt index abc3189da..ec520d869 100644 --- a/code/ryzom/tools/sheets_packer/CMakeLists.txt +++ b/code/ryzom/tools/sheets_packer/CMakeLists.txt @@ -1,24 +1,26 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(sheets_packer ${SRC} - ${CMAKE_SOURCE_DIR}/client/src/continent_manager_build.cpp - ${CMAKE_SOURCE_DIR}/client/src/continent_manager_build.h - ${CMAKE_SOURCE_DIR}/client/src/sheet_manager.cpp - ${CMAKE_SOURCE_DIR}/client/src/sheet_manager.h) + ${CMAKE_SOURCE_DIR}/ryzom/client/src/continent_manager_build.cpp + ${CMAKE_SOURCE_DIR}/ryzom/client/src/continent_manager_build.h + ${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.cpp + ${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.h) -INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} - ${NEL_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/client/src) -TARGET_LINK_LIBRARIES(sheets_packer ryzom_clientsheets +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/client/src) +TARGET_LINK_LIBRARIES(sheets_packer + ryzom_clientsheets ryzom_gameshare - ${NELMISC_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELNET_LIBRARY} - ${NELLIGO_LIBRARY} + nelmisc + nelgeorges + nelnet + nelligo ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(sheets_packer "Ryzom, Tools: Sheets Packer") +NL_ADD_RUNTIME_FLAGS(sheets_packer) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(sheets_packer ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF(WITH_PCH) From 50aee6c95147049889b8d064c384d717bc07fdee Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Fri, 3 Sep 2010 07:07:47 -0600 Subject: [PATCH 3/3] Changed: #842 Added more project prefixes to project labels (aka NeL, Ryzom), converted some more Ryzom projects to the new layout. --- .../samples/3d/shape_viewer/CMakeLists.txt | 2 +- code/nel/samples/pacs/CMakeLists.txt | 10 ++++---- code/nel/samples/sound_sources/CMakeLists.txt | 10 ++++---- code/nel/src/3d/CMakeLists.txt | 2 +- .../nel/src/3d/driver/direct3d/CMakeLists.txt | 2 +- code/nel/src/3d/driver/opengl/CMakeLists.txt | 2 +- code/nel/src/cegui/CMakeLists.txt | 2 +- code/nel/src/georges/CMakeLists.txt | 2 +- code/nel/src/ligo/CMakeLists.txt | 2 +- code/nel/src/logic/CMakeLists.txt | 2 +- code/nel/src/misc/CMakeLists.txt | 2 +- code/nel/src/net/CMakeLists.txt | 2 +- code/nel/src/pacs/CMakeLists.txt | 2 +- code/nel/src/sound/CMakeLists.txt | 2 +- code/nel/src/sound/driver/CMakeLists.txt | 2 +- .../src/sound/driver/dsound/CMakeLists.txt | 2 +- code/nel/src/sound/driver/fmod/CMakeLists.txt | 2 +- .../src/sound/driver/openal/CMakeLists.txt | 2 +- .../src/sound/driver/xaudio2/CMakeLists.txt | 2 +- code/nel/tools/3d/anim_builder/CMakeLists.txt | 2 +- .../3d/animation_set_builder/CMakeLists.txt | 2 +- .../tools/3d/build_clod_bank/CMakeLists.txt | 2 +- .../nel/tools/3d/build_clodtex/CMakeLists.txt | 2 +- .../tools/3d/build_coarse_mesh/CMakeLists.txt | 2 +- .../tools/3d/build_far_bank/CMakeLists.txt | 2 +- .../tools/3d/build_interface/CMakeLists.txt | 2 +- .../tools/3d/build_shadow_skin/CMakeLists.txt | 2 +- .../tools/3d/build_smallbank/CMakeLists.txt | 2 +- .../tools/3d/cluster_viewer/CMakeLists.txt | 2 +- code/nel/tools/3d/file_info/CMakeLists.txt | 2 +- .../nel/tools/3d/get_neighbors/CMakeLists.txt | 2 +- code/nel/tools/3d/ig_add/CMakeLists.txt | 2 +- code/nel/tools/3d/ig_info/CMakeLists.txt | 2 +- code/nel/tools/3d/ig_lighter/CMakeLists.txt | 2 +- .../nel/tools/3d/object_viewer/CMakeLists.txt | 2 +- .../tools/3d/object_viewer_exe/CMakeLists.txt | 2 +- .../nel/tools/3d/panoply_maker/CMakeLists.txt | 2 +- code/nel/tools/3d/tga_cut/CMakeLists.txt | 2 +- code/nel/tools/3d/tga_resize/CMakeLists.txt | 2 +- code/nel/tools/3d/tile_edit/CMakeLists.txt | 2 +- .../tools/3d/zone_check_bind/CMakeLists.txt | 2 +- .../tools/3d/zone_dependencies/CMakeLists.txt | 2 +- code/nel/tools/3d/zone_dump/CMakeLists.txt | 2 +- .../tools/3d/zone_ig_lighter/CMakeLists.txt | 2 +- code/nel/tools/3d/zone_lighter/CMakeLists.txt | 2 +- code/nel/tools/3d/zone_welder/CMakeLists.txt | 2 +- code/nel/tools/3d/zviewer/CMakeLists.txt | 2 +- .../tools/georges/georges2csv/CMakeLists.txt | 2 +- .../logic/logic_editor_dll/CMakeLists.txt | 2 +- .../logic/logic_editor_exe/CMakeLists.txt | 2 +- code/nel/tools/misc/bnp_make/CMakeLists.txt | 2 +- .../tools/misc/disp_sheet_id/CMakeLists.txt | 2 +- .../tools/misc/make_sheet_id/CMakeLists.txt | 2 +- code/nel/tools/misc/xml_packer/CMakeLists.txt | 2 +- .../tools/pacs/build_ig_boxes/CMakeLists.txt | 2 +- .../pacs/build_indoor_rbank/CMakeLists.txt | 2 +- .../nel/tools/pacs/build_rbank/CMakeLists.txt | 2 +- code/ryzom/server/CMakeLists.txt | 2 ++ .../server/src/ai_service/CMakeLists.txt | 23 ++++++++----------- .../server/src/backup_service/CMakeLists.txt | 21 ++++++++--------- .../dynamic_scenario_service/CMakeLists.txt | 21 ++++++++--------- .../src/entities_game_service/CMakeLists.txt | 20 ++++++++-------- .../src/frontend_service/CMakeLists.txt | 14 +++++------ .../client/client_patcher/CMakeLists.txt | 4 ++-- .../alias_synchronizer/CMakeLists.txt | 7 ++++-- .../leveldesign/csv_transform/CMakeLists.txt | 7 ++++-- .../leveldesign/prim_export/CMakeLists.txt | 14 +++++++---- .../tools/leveldesign/uni_conv/CMakeLists.txt | 7 ++++-- .../tools/make_alias_file/CMakeLists.txt | 7 ++++-- .../tools/make_anim_by_race/CMakeLists.txt | 7 ++++-- .../make_anim_melee_impact/CMakeLists.txt | 3 +++ code/ryzom/tools/patch_gen/CMakeLists.txt | 12 +++++++--- code/ryzom/tools/pd_parser/CMakeLists.txt | 7 ++++-- code/ryzom/tools/pdr_util/CMakeLists.txt | 7 ++++-- .../tools/skill_extractor/CMakeLists.txt | 7 ++++-- code/ryzom/tools/stats_scan/CMakeLists.txt | 7 ++++-- .../tools/translation_tools/CMakeLists.txt | 7 ++++-- 77 files changed, 183 insertions(+), 151 deletions(-) diff --git a/code/nel/samples/3d/shape_viewer/CMakeLists.txt b/code/nel/samples/3d/shape_viewer/CMakeLists.txt index 91e008cba..87945d310 100644 --- a/code/nel/samples/3d/shape_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/shape_viewer/CMakeLists.txt @@ -11,7 +11,7 @@ IF(WIN32) SET_TARGET_PROPERTIES(nl_sample_shapeview PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Samples, 3D: Shape Viewer") + PROJECT_LABEL "NeL, Samples, 3D: Shape Viewer") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/samples/pacs/CMakeLists.txt b/code/nel/samples/pacs/CMakeLists.txt index 53a080ab9..426a37017 100644 --- a/code/nel/samples/pacs/CMakeLists.txt +++ b/code/nel/samples/pacs/CMakeLists.txt @@ -7,12 +7,12 @@ ADD_DEFINITIONS(-DNL_PACS_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_pacs/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_pacs ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nelpacs nel3d) IF(WIN32) - SET_TARGET_PROPERTIES(nl_sample_pacs PROPERTIES - LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" - LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - LINK_FLAGS "/SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Samples: PACS") + SET_TARGET_PROPERTIES(nl_sample_pacs PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS") ENDIF(WIN32) + +NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS") +NL_ADD_RUNTIME_FLAGS(nl_sample_pacs) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS nl_sample_pacs RUNTIME DESTINATION bin COMPONENT samplespacs) diff --git a/code/nel/samples/sound_sources/CMakeLists.txt b/code/nel/samples/sound_sources/CMakeLists.txt index 405b25387..ccdefbf13 100644 --- a/code/nel/samples/sound_sources/CMakeLists.txt +++ b/code/nel/samples/sound_sources/CMakeLists.txt @@ -6,12 +6,10 @@ ADD_DEFINITIONS(-DNL_SOUND_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_sound/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nl_sample_sound_sources ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nelsound nelsnd_lowlevel) -IF(WIN32) - SET_TARGET_PROPERTIES(nl_sample_sound_sources PROPERTIES - LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" - LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Samples: Sound System") -ENDIF(WIN32) + +NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound System") +NL_ADD_RUNTIME_FLAGS(nl_sample_sound_sources) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS nl_sample_sound_sources RUNTIME DESTINATION bin COMPONENT samplessound) diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index 4ea6f3bae..4045006bd 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -666,7 +666,7 @@ NL_TARGET_LIB(nel3d ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY} ${JPEG_LIBRARY}) -NL_DEFAULT_PROPS(nel3d "Library: NeL 3D") +NL_DEFAULT_PROPS(nel3d "NeL, Library: 3D") NL_ADD_STATIC_VID_DRIVERS(nel3d) NL_ADD_LIB_SUFFIX(nel3d) diff --git a/code/nel/src/3d/driver/direct3d/CMakeLists.txt b/code/nel/src/3d/driver/direct3d/CMakeLists.txt index 0bf8aa40f..755a87d6c 100644 --- a/code/nel/src/3d/driver/direct3d/CMakeLists.txt +++ b/code/nel/src/3d/driver/direct3d/CMakeLists.txt @@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${DXSDK_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d ${LIBXML2_LIBRARIES} ${FREETYPE_LIB} ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY}) -NL_DEFAULT_PROPS(nel_drv_direct3d_win "Driver, Video: Direct3D") +NL_DEFAULT_PROPS(nel_drv_direct3d_win "NeL, Driver, Video: Direct3D") NL_ADD_RUNTIME_FLAGS(nel_drv_direct3d_win) NL_ADD_LIB_SUFFIX(nel_drv_direct3d_win) diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt index 46d98148b..2c2249b1b 100644 --- a/code/nel/src/3d/driver/opengl/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt @@ -14,7 +14,7 @@ NL_TARGET_DRIVER(${NLDRV_OGL_LIB} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES}) -NL_DEFAULT_PROPS(${NLDRV_OGL_LIB} "Driver, Video: OpenGL") +NL_DEFAULT_PROPS(${NLDRV_OGL_LIB} "NeL, Driver, Video: OpenGL") NL_ADD_LIB_SUFFIX(${NLDRV_OGL_LIB}) NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB}) diff --git a/code/nel/src/cegui/CMakeLists.txt b/code/nel/src/cegui/CMakeLists.txt index 1b521502f..571a117fb 100644 --- a/code/nel/src/cegui/CMakeLists.txt +++ b/code/nel/src/cegui/CMakeLists.txt @@ -7,7 +7,7 @@ TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY}) SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR} - PROJECT_LABEL "Library: NeL CEGUI Renderer") + PROJECT_LABEL "NeL, Library: CEGUI Renderer") IF(WIN32) SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 07bdeac61..d7c669efe 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -8,7 +8,7 @@ NL_TARGET_LIB(nelgeorges ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelgeorges nelmisc) -NL_DEFAULT_PROPS(nelgeorges "Library: NeL Georges") +NL_DEFAULT_PROPS(nelgeorges "NeL, Library: Georges") NL_ADD_LIB_SUFFIX(nelgeorges) diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 0ee8ac180..d92b773c6 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -4,7 +4,7 @@ NL_TARGET_LIB(nelligo ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc) -NL_DEFAULT_PROPS(nelligo "Library: NeL Ligo") +NL_DEFAULT_PROPS(nelligo "NeL, Library: Ligo") NL_ADD_LIB_SUFFIX(nelligo) diff --git a/code/nel/src/logic/CMakeLists.txt b/code/nel/src/logic/CMakeLists.txt index 0f01f0641..681c1d641 100644 --- a/code/nel/src/logic/CMakeLists.txt +++ b/code/nel/src/logic/CMakeLists.txt @@ -4,7 +4,7 @@ NL_TARGET_LIB(nellogic ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet) -NL_DEFAULT_PROPS(nellogic "Library: NeL Logic") +NL_DEFAULT_PROPS(nellogic "NeL, Library: Logic") NL_ADD_LIB_SUFFIX(nellogic) diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 63f9f4330..c33d0621c 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -23,7 +23,7 @@ ENDIF(WIN32) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file) TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB}) -NL_DEFAULT_PROPS(nelmisc "Library: NeL Misc") +NL_DEFAULT_PROPS(nelmisc "NeL, Library: Misc") NL_ADD_LIB_SUFFIX(nelmisc) diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt index fa6e35e05..5710d6d01 100644 --- a/code/nel/src/net/CMakeLists.txt +++ b/code/nel/src/net/CMakeLists.txt @@ -14,7 +14,7 @@ ENDIF(WITH_GTK) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelnet ${LIBXML2_LIBRARIES} nelmisc) -NL_DEFAULT_PROPS(nelnet "Library: NeL Net") +NL_DEFAULT_PROPS(nelnet "NeL, Library: Net") NL_ADD_LIB_SUFFIX(nelnet) diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt index 4f1c5e48d..928cfbcf7 100644 --- a/code/nel/src/pacs/CMakeLists.txt +++ b/code/nel/src/pacs/CMakeLists.txt @@ -4,7 +4,7 @@ NL_TARGET_LIB(nelpacs ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelpacs ${LIBXML2_LIBRARIES} nelmisc) -NL_DEFAULT_PROPS(nelpacs "Library: NeL PACS") +NL_DEFAULT_PROPS(nelpacs "NeL, Library: PACS") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) NL_ADD_LIB_SUFFIX(nelpacs) diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 1841005f6..fb2080f34 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -4,7 +4,7 @@ NL_TARGET_LIB(nelsound ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel) -NL_DEFAULT_PROPS(nelsound "Library: NeL Sound") +NL_DEFAULT_PROPS(nelsound "NeL, Library: Sound") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt index c720886e1..102abb7bd 100644 --- a/code/nel/src/sound/driver/CMakeLists.txt +++ b/code/nel/src/sound/driver/CMakeLists.txt @@ -4,7 +4,7 @@ nl_target_lib(nelsnd_lowlevel ${SRC}) INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY}) -nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel") +nl_default_props(nelsnd_lowlevel "NeL, Library: Sound Lowlevel") NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel) nl_add_lib_suffix(nelsnd_lowlevel) diff --git a/code/nel/src/sound/driver/dsound/CMakeLists.txt b/code/nel/src/sound/driver/dsound/CMakeLists.txt index acf3376f3..be30efd6c 100644 --- a/code/nel/src/sound/driver/dsound/CMakeLists.txt +++ b/code/nel/src/sound/driver/dsound/CMakeLists.txt @@ -5,7 +5,7 @@ NL_TARGET_DRIVER(nel_drv_dsound ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_dsound ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSDK_DSOUND_LIBRARY} ${DXSDK_GUID_LIBRARY}) -NL_DEFAULT_PROPS(nel_drv_dsound "Driver, Sound: DirectSound") +NL_DEFAULT_PROPS(nel_drv_dsound "NeL, Driver, Sound: DirectSound") NL_ADD_LIB_SUFFIX(nel_drv_dsound) NL_ADD_RUNTIME_FLAGS(nel_drv_dsound) diff --git a/code/nel/src/sound/driver/fmod/CMakeLists.txt b/code/nel/src/sound/driver/fmod/CMakeLists.txt index ec5427ebd..25095140d 100644 --- a/code/nel/src/sound/driver/fmod/CMakeLists.txt +++ b/code/nel/src/sound/driver/fmod/CMakeLists.txt @@ -5,7 +5,7 @@ NL_TARGET_DRIVER(nel_drv_fmod ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FMOD_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_fmod ${LIBXML2_LIBRARIES} ${FMOD_LIBRARY} nelsnd_lowlevel) -NL_DEFAULT_PROPS(nel_drv_fmod "Driver, Sound: FMOD") +NL_DEFAULT_PROPS(nel_drv_fmod "NeL, Driver, Sound: FMOD") NL_ADD_LIB_SUFFIX(nel_drv_fmod) NL_ADD_RUNTIME_FLAGS(nel_drv_fmod) diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/code/nel/src/sound/driver/openal/CMakeLists.txt index f1b76ad9d..a7e274b07 100644 --- a/code/nel/src/sound/driver/openal/CMakeLists.txt +++ b/code/nel/src/sound/driver/openal/CMakeLists.txt @@ -22,7 +22,7 @@ NL_TARGET_DRIVER(nel_drv_openal ${SRC}) INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_openal ${OPENAL_LIBRARY} nelmisc nelsnd_lowlevel) -NL_DEFAULT_PROPS(nel_drv_openal "Driver, Sound: OpenAL") +NL_DEFAULT_PROPS(nel_drv_openal "NeL, Driver, Sound: OpenAL") NL_ADD_LIB_SUFFIX(nel_drv_openal) NL_ADD_RUNTIME_FLAGS(nel_drv_openal) diff --git a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt index 7ed375902..a7900c954 100644 --- a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt +++ b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt @@ -31,7 +31,7 @@ NL_TARGET_DRIVER(nel_drv_xaudio2 ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_xaudio2 ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSDK_XAUDIO_LIBRARY} ${DXSDK_GUID_LIBRARY} ${VORBIS_LIBRARIES} ${OGG_LIBRARY}) -NL_DEFAULT_PROPS(nel_drv_xaudio2 "Driver, Sound: XAudio2") +NL_DEFAULT_PROPS(nel_drv_xaudio2 "NeL, Driver, Sound: XAudio2") NL_ADD_LIB_SUFFIX(nel_drv_xaudio2) NL_ADD_RUNTIME_FLAGS(nel_drv_xaudio2) diff --git a/code/nel/tools/3d/anim_builder/CMakeLists.txt b/code/nel/tools/3d/anim_builder/CMakeLists.txt index 17a1fd538..be945daed 100644 --- a/code/nel/tools/3d/anim_builder/CMakeLists.txt +++ b/code/nel/tools/3d/anim_builder/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(anim_builder ${SRC}) TARGET_LINK_LIBRARIES(anim_builder ${PLATFORM_LINKFLAGS} nelmisc nel3d) -NL_DEFAULT_PROPS(anim_builder "Tools, 3D: anim_builder") +NL_DEFAULT_PROPS(anim_builder "NeL, Tools, 3D: anim_builder") NL_ADD_RUNTIME_FLAGS(anim_builder) INSTALL(TARGETS anim_builder RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/animation_set_builder/CMakeLists.txt b/code/nel/tools/3d/animation_set_builder/CMakeLists.txt index 5b9d5482e..aab165ed7 100644 --- a/code/nel/tools/3d/animation_set_builder/CMakeLists.txt +++ b/code/nel/tools/3d/animation_set_builder/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(animation_set_builder ${SRC}) TARGET_LINK_LIBRARIES(animation_set_builder ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(animation_set_builder "Tools, 3D: anim_set_builder") +NL_DEFAULT_PROPS(animation_set_builder "NeL, Tools, 3D: anim_set_builder") NL_ADD_RUNTIME_FLAGS(animation_set_builder) INSTALL(TARGETS animation_set_builder RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/build_clod_bank/CMakeLists.txt b/code/nel/tools/3d/build_clod_bank/CMakeLists.txt index 42fa7079d..b0dceb61a 100644 --- a/code/nel/tools/3d/build_clod_bank/CMakeLists.txt +++ b/code/nel/tools/3d/build_clod_bank/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(build_clod_bank ${SRC}) TARGET_LINK_LIBRARIES(build_clod_bank ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(build_clod_bank "Tools, 3D: build_clod_bank") +NL_DEFAULT_PROPS(build_clod_bank "NeL, Tools, 3D: build_clod_bank") NL_ADD_RUNTIME_FLAGS(build_clod_bank) INSTALL(TARGETS build_clod_bank RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/build_clodtex/CMakeLists.txt b/code/nel/tools/3d/build_clodtex/CMakeLists.txt index f2729e365..377c0bb36 100644 --- a/code/nel/tools/3d/build_clodtex/CMakeLists.txt +++ b/code/nel/tools/3d/build_clodtex/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(build_clodtex ${SRC}) TARGET_LINK_LIBRARIES(build_clodtex ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(build_clodtex "Tools, 3D: build_clodtex") +NL_DEFAULT_PROPS(build_clodtex "NeL, Tools, 3D: build_clodtex") NL_ADD_RUNTIME_FLAGS(build_clodtex) INSTALL(TARGETS build_clodtex RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt b/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt index bea2f76b8..81a048eca 100644 --- a/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt +++ b/code/nel/tools/3d/build_coarse_mesh/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(build_coarse_mesh ${SRC}) TARGET_LINK_LIBRARIES(build_coarse_mesh ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(build_coarse_mesh "Tools, 3D: build_coarse_mesh") +NL_DEFAULT_PROPS(build_coarse_mesh "NeL, Tools, 3D: build_coarse_mesh") NL_ADD_RUNTIME_FLAGS(build_coarse_mesh) INSTALL(TARGETS build_coarse_mesh RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/build_far_bank/CMakeLists.txt b/code/nel/tools/3d/build_far_bank/CMakeLists.txt index c5d65b20b..ea1aaa9ce 100644 --- a/code/nel/tools/3d/build_far_bank/CMakeLists.txt +++ b/code/nel/tools/3d/build_far_bank/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(build_far_bank ${SRC}) TARGET_LINK_LIBRARIES(build_far_bank ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(build_far_bank "Tools, 3D: build_far_bank") +NL_DEFAULT_PROPS(build_far_bank "NeL, Tools, 3D: build_far_bank") NL_ADD_RUNTIME_FLAGS(build_far_bank) INSTALL(TARGETS build_far_bank RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/build_interface/CMakeLists.txt b/code/nel/tools/3d/build_interface/CMakeLists.txt index 291e89af6..59347625d 100644 --- a/code/nel/tools/3d/build_interface/CMakeLists.txt +++ b/code/nel/tools/3d/build_interface/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(build_interface ${SRC}) TARGET_LINK_LIBRARIES(build_interface ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(build_interface "Tools, 3D: build_interface") +NL_DEFAULT_PROPS(build_interface "NeL, Tools, 3D: build_interface") NL_ADD_RUNTIME_FLAGS(build_interface) INSTALL(TARGETS build_interface RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt b/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt index 7c7753289..9600199cc 100644 --- a/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt +++ b/code/nel/tools/3d/build_shadow_skin/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(build_shadow_skin ${SRC}) TARGET_LINK_LIBRARIES(build_shadow_skin ${PLATFORM_LINKFLAGS} nel3d) -NL_DEFAULT_PROPS(build_shadow_skin "Tools, 3D: build_shadow_skin") +NL_DEFAULT_PROPS(build_shadow_skin "NeL, Tools, 3D: build_shadow_skin") NL_ADD_RUNTIME_FLAGS(build_shadow_skin) INSTALL(TARGETS build_shadow_skin RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/build_smallbank/CMakeLists.txt b/code/nel/tools/3d/build_smallbank/CMakeLists.txt index 45f34cc17..e4b61037f 100644 --- a/code/nel/tools/3d/build_smallbank/CMakeLists.txt +++ b/code/nel/tools/3d/build_smallbank/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp) ADD_EXECUTABLE(build_smallbank ${SRC}) TARGET_LINK_LIBRARIES(build_smallbank ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(build_smallbank "Tools, 3D: build_smallbank") +NL_DEFAULT_PROPS(build_smallbank "NeL, Tools, 3D: build_smallbank") NL_ADD_RUNTIME_FLAGS(build_smallbank) INSTALL(TARGETS build_smallbank RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/cluster_viewer/CMakeLists.txt b/code/nel/tools/3d/cluster_viewer/CMakeLists.txt index 0eefd3a93..bbfd2f548 100644 --- a/code/nel/tools/3d/cluster_viewer/CMakeLists.txt +++ b/code/nel/tools/3d/cluster_viewer/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(cluster_viewer WIN32 ${SRC}) TARGET_LINK_LIBRARIES(cluster_viewer ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(cluster_viewer "Tools, 3D: Cluster Viewer") +NL_DEFAULT_PROPS(cluster_viewer "NeL, Tools, 3D: Cluster Viewer") NL_ADD_RUNTIME_FLAGS(cluster_viewer) INSTALL(TARGETS cluster_viewer RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/file_info/CMakeLists.txt b/code/nel/tools/3d/file_info/CMakeLists.txt index d3e533a75..f0784e7ae 100644 --- a/code/nel/tools/3d/file_info/CMakeLists.txt +++ b/code/nel/tools/3d/file_info/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(file_info ${SRC}) TARGET_LINK_LIBRARIES(file_info ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(file_info "Tools, 3D: file_info") +NL_DEFAULT_PROPS(file_info "NeL, Tools, 3D: file_info") NL_ADD_RUNTIME_FLAGS(file_info) INSTALL(TARGETS file_info RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/get_neighbors/CMakeLists.txt b/code/nel/tools/3d/get_neighbors/CMakeLists.txt index 489603b4a..595a4eae5 100644 --- a/code/nel/tools/3d/get_neighbors/CMakeLists.txt +++ b/code/nel/tools/3d/get_neighbors/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(get_neighbors ${SRC}) TARGET_LINK_LIBRARIES(get_neighbors ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(get_neighbors "Tools, 3D: get_neighbors") +NL_DEFAULT_PROPS(get_neighbors "NeL, Tools, 3D: get_neighbors") NL_ADD_RUNTIME_FLAGS(get_neighbors) INSTALL(TARGETS get_neighbors RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/ig_add/CMakeLists.txt b/code/nel/tools/3d/ig_add/CMakeLists.txt index a5556d78c..107d700b0 100644 --- a/code/nel/tools/3d/ig_add/CMakeLists.txt +++ b/code/nel/tools/3d/ig_add/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ig_add ${SRC}) TARGET_LINK_LIBRARIES(ig_add ${PLATFORM_LINKFLAGS} nel3d) -NL_DEFAULT_PROPS(ig_add "Tools, 3D: ig_add") +NL_DEFAULT_PROPS(ig_add "NeL, Tools, 3D: ig_add") NL_ADD_RUNTIME_FLAGS(ig_add) INSTALL(TARGETS ig_add RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/ig_info/CMakeLists.txt b/code/nel/tools/3d/ig_info/CMakeLists.txt index cc5a43a3e..4cccf9225 100644 --- a/code/nel/tools/3d/ig_info/CMakeLists.txt +++ b/code/nel/tools/3d/ig_info/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ig_info ${SRC}) TARGET_LINK_LIBRARIES(ig_info ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(ig_info "Tools, 3D: ig_info") +NL_DEFAULT_PROPS(ig_info "NeL, Tools, 3D: ig_info") NL_ADD_RUNTIME_FLAGS(ig_info) INSTALL(TARGETS ig_info RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/ig_lighter/CMakeLists.txt b/code/nel/tools/3d/ig_lighter/CMakeLists.txt index 9cd0d9476..efbdc16f4 100644 --- a/code/nel/tools/3d/ig_lighter/CMakeLists.txt +++ b/code/nel/tools/3d/ig_lighter/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h) ADD_EXECUTABLE(ig_lighter ${SRC}) TARGET_LINK_LIBRARIES(ig_lighter ${PLATFORM_LINKFLAGS} nel3d nelpacs) -NL_DEFAULT_PROPS(ig_lighter "Tools, 3D: ig_lighter") +NL_DEFAULT_PROPS(ig_lighter "NeL, Tools, 3D: ig_lighter") NL_ADD_RUNTIME_FLAGS(ig_lighter) INSTALL(TARGETS ig_lighter RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/object_viewer/CMakeLists.txt b/code/nel/tools/3d/object_viewer/CMakeLists.txt index 1268a92b8..3b24369a0 100644 --- a/code/nel/tools/3d/object_viewer/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer/CMakeLists.txt @@ -24,7 +24,7 @@ SET_TARGET_PROPERTIES(object_viewer_dll PROPERTIES LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - PROJECT_LABEL "Tools, 3D: Object Viewer DLL") + PROJECT_LABEL "NeL, Tools, 3D: Object Viewer DLL") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS) diff --git a/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt b/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt index 4f9c946f1..a171fbf64 100644 --- a/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_exe/CMakeLists.txt @@ -19,7 +19,7 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) SET_TARGET_PROPERTIES(object_viewer PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Tools, 3D: Object Viewer") + PROJECT_LABEL "NeL, Tools, 3D: Object Viewer") IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(object_viewer ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp) diff --git a/code/nel/tools/3d/panoply_maker/CMakeLists.txt b/code/nel/tools/3d/panoply_maker/CMakeLists.txt index b0d0c0f90..1728ebcee 100644 --- a/code/nel/tools/3d/panoply_maker/CMakeLists.txt +++ b/code/nel/tools/3d/panoply_maker/CMakeLists.txt @@ -10,7 +10,7 @@ IF(WIN32) SET_TARGET_PROPERTIES(panoply_maker PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Tools, 3D: panoply_maker") + PROJECT_LABEL "NeL, Tools, 3D: panoply_maker") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/tga_cut/CMakeLists.txt b/code/nel/tools/3d/tga_cut/CMakeLists.txt index 1392bb807..cac3fa006 100644 --- a/code/nel/tools/3d/tga_cut/CMakeLists.txt +++ b/code/nel/tools/3d/tga_cut/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(tga_cut ${SRC}) TARGET_LINK_LIBRARIES(tga_cut ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(tga_cut "Tools, 3D: tga_cut") +NL_DEFAULT_PROPS(tga_cut "NeL, Tools, 3D: tga_cut") NL_ADD_RUNTIME_FLAGS(tga_cut) INSTALL(TARGETS tga_cut RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/tga_resize/CMakeLists.txt b/code/nel/tools/3d/tga_resize/CMakeLists.txt index c79ebcd9c..1da938cb4 100644 --- a/code/nel/tools/3d/tga_resize/CMakeLists.txt +++ b/code/nel/tools/3d/tga_resize/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(tga_resize ${SRC}) TARGET_LINK_LIBRARIES(tga_resize ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(tga_resize "Tools, 3D: tga_resize") +NL_DEFAULT_PROPS(tga_resize "NeL, Tools, 3D: tga_resize") NL_ADD_RUNTIME_FLAGS(tga_resize) INSTALL(TARGETS tga_resize RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/tile_edit/CMakeLists.txt b/code/nel/tools/3d/tile_edit/CMakeLists.txt index 08bc21575..51b5a6899 100644 --- a/code/nel/tools/3d/tile_edit/CMakeLists.txt +++ b/code/nel/tools/3d/tile_edit/CMakeLists.txt @@ -17,7 +17,7 @@ IF(WIN32) LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" EXCLUDE_FROM_DEFAULT_BUILD 1 - PROJECT_LABEL "Tools, 3D: Tile Editor") + PROJECT_LABEL "NeL, Tools, 3D: Tile Editor") ENDIF(WIN32) #INSTALL(TARGETS tile_edit RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/zone_check_bind/CMakeLists.txt b/code/nel/tools/3d/zone_check_bind/CMakeLists.txt index 0976625c0..b7f89fff6 100644 --- a/code/nel/tools/3d/zone_check_bind/CMakeLists.txt +++ b/code/nel/tools/3d/zone_check_bind/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(zone_check_bind ${SRC}) TARGET_LINK_LIBRARIES(zone_check_bind ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(zone_check_bind "Tools, 3D: zone_check_bind") +NL_DEFAULT_PROPS(zone_check_bind "NeL, Tools, 3D: zone_check_bind") NL_ADD_RUNTIME_FLAGS(zone_check_bind) INSTALL(TARGETS zone_check_bind RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/zone_dependencies/CMakeLists.txt b/code/nel/tools/3d/zone_dependencies/CMakeLists.txt index 5f328f75c..eeb094166 100644 --- a/code/nel/tools/3d/zone_dependencies/CMakeLists.txt +++ b/code/nel/tools/3d/zone_dependencies/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h) ADD_EXECUTABLE(zone_dependencies ${SRC}) TARGET_LINK_LIBRARIES(zone_dependencies ${PLATFORM_LINKFLAGS} nel3d nelgeorges nelmisc) -NL_DEFAULT_PROPS(zone_dependencies "Tools, 3D: zone_dependencies") +NL_DEFAULT_PROPS(zone_dependencies "NeL, Tools, 3D: zone_dependencies") NL_ADD_RUNTIME_FLAGS(zone_dependencies) INSTALL(TARGETS zone_dependencies RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/zone_dump/CMakeLists.txt b/code/nel/tools/3d/zone_dump/CMakeLists.txt index 0fd841b45..a1f924ece 100644 --- a/code/nel/tools/3d/zone_dump/CMakeLists.txt +++ b/code/nel/tools/3d/zone_dump/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h) ADD_EXECUTABLE(zone_dump ${SRC}) TARGET_LINK_LIBRARIES(zone_dump ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(zone_dump "Tools, 3D: zone_dump") +NL_DEFAULT_PROPS(zone_dump "NeL, Tools, 3D: zone_dump") NL_ADD_RUNTIME_FLAGS(zone_dump) INSTALL(TARGETS zone_dump RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt index f98a96a4d..2a65cbb08 100644 --- a/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt +++ b/code/nel/tools/3d/zone_ig_lighter/CMakeLists.txt @@ -8,7 +8,7 @@ IF(WIN32) SET_TARGET_PROPERTIES(zone_ig_lighter PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Tools, 3D: zone_ig_lighter") + PROJECT_LABEL "NeL, Tools, 3D: zone_ig_lighter") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/tools/3d/zone_lighter/CMakeLists.txt b/code/nel/tools/3d/zone_lighter/CMakeLists.txt index 4549b1a4b..8da7d9e62 100644 --- a/code/nel/tools/3d/zone_lighter/CMakeLists.txt +++ b/code/nel/tools/3d/zone_lighter/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h) ADD_EXECUTABLE(zone_lighter ${SRC}) TARGET_LINK_LIBRARIES(zone_lighter ${PLATFORM_LINKFLAGS} nel3d nelgeorges nelmisc) -NL_DEFAULT_PROPS(zone_lighter "Tools, 3D: zone_lighter") +NL_DEFAULT_PROPS(zone_lighter "NeL, Tools, 3D: zone_lighter") NL_ADD_RUNTIME_FLAGS(zone_lighter) INSTALL(TARGETS zone_lighter RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/zone_welder/CMakeLists.txt b/code/nel/tools/3d/zone_welder/CMakeLists.txt index f0d773c2b..e89092b34 100644 --- a/code/nel/tools/3d/zone_welder/CMakeLists.txt +++ b/code/nel/tools/3d/zone_welder/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h) ADD_EXECUTABLE(zone_welder ${SRC}) TARGET_LINK_LIBRARIES(zone_welder ${PLATFORM_LINKFLAGS} nel3d nelmisc) -NL_DEFAULT_PROPS(zone_welder "Tools, 3D: zone_welder") +NL_DEFAULT_PROPS(zone_welder "NeL, Tools, 3D: zone_welder") NL_ADD_RUNTIME_FLAGS(zone_welder) INSTALL(TARGETS zone_welder RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/zviewer/CMakeLists.txt b/code/nel/tools/3d/zviewer/CMakeLists.txt index 9f033955b..fc60cc403 100644 --- a/code/nel/tools/3d/zviewer/CMakeLists.txt +++ b/code/nel/tools/3d/zviewer/CMakeLists.txt @@ -9,7 +9,7 @@ ENDIF(WIN32) ADD_DEFINITIONS(-DNL_ZVIEWER_CFG="\\"${NL_ETC_PREFIX}/\\"") TARGET_LINK_LIBRARIES(zviewer ${PLATFORM_LINKFLAGS} nel3d) -NL_DEFAULT_PROPS(zviewer "Tools, 3D: Zone Viewer") +NL_DEFAULT_PROPS(zviewer "NeL, Tools, 3D: Zone Viewer") NL_ADD_RUNTIME_FLAGS(zviewer) INSTALL(TARGETS zviewer RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/georges/georges2csv/CMakeLists.txt b/code/nel/tools/georges/georges2csv/CMakeLists.txt index 419430cc1..79ced2634 100644 --- a/code/nel/tools/georges/georges2csv/CMakeLists.txt +++ b/code/nel/tools/georges/georges2csv/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(georges2csv ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(georges2csv ${PLATFORM_LINKFLAGS} nelmisc nelgeorges) -NL_DEFAULT_PROPS(georges2csv "Tools, Georges: georges2csv") +NL_DEFAULT_PROPS(georges2csv "NeL, Tools, Georges: georges2csv") NL_ADD_RUNTIME_FLAGS(georges2csv) INSTALL(TARGETS georges2csv RUNTIME DESTINATION bin COMPONENT toolsgeorges) diff --git a/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt b/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt index 5a89f28b2..4b954ad53 100644 --- a/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt +++ b/code/nel/tools/logic/logic_editor_dll/CMakeLists.txt @@ -13,7 +13,7 @@ SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES SOVERSION ${NL_VERSION_MAJOR} DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - PROJECT_LABEL "Tools, Logic: Logic Editor DLL") + PROJECT_LABEL "NeL, Tools, Logic: Logic Editor DLL") IF(WIN32) SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES diff --git a/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt b/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt index 5f2a4779b..3c11fc5aa 100644 --- a/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt +++ b/code/nel/tools/logic/logic_editor_exe/CMakeLists.txt @@ -10,7 +10,7 @@ IF(WIN32) SET_TARGET_PROPERTIES(logic_editor PROPERTIES LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}" LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}" - PROJECT_LABEL "Tools, Logic: Logic Editor") + PROJECT_LABEL "NeL, Tools, Logic: Logic Editor") ENDIF(WIN32) IF(WITH_PCH) diff --git a/code/nel/tools/misc/bnp_make/CMakeLists.txt b/code/nel/tools/misc/bnp_make/CMakeLists.txt index 4fb766be3..dd52c2b80 100644 --- a/code/nel/tools/misc/bnp_make/CMakeLists.txt +++ b/code/nel/tools/misc/bnp_make/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(bnp_make ${SRC}) TARGET_LINK_LIBRARIES(bnp_make ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(bnp_make "Tools, Misc: bnp_make") +NL_DEFAULT_PROPS(bnp_make "NeL, Tools, Misc: bnp_make") NL_ADD_RUNTIME_FLAGS(bnp_make) INSTALL(TARGETS bnp_make RUNTIME DESTINATION bin COMPONENT toolsmisc) diff --git a/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt b/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt index 19b68510a..16b95a77a 100644 --- a/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt +++ b/code/nel/tools/misc/disp_sheet_id/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(disp_sheet_id ${SRC}) TARGET_LINK_LIBRARIES(disp_sheet_id ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(disp_sheet_id "Tools, Misc: disp_sheet_id") +NL_DEFAULT_PROPS(disp_sheet_id "NeL, Tools, Misc: disp_sheet_id") NL_ADD_RUNTIME_FLAGS(disp_sheet_id) INSTALL(TARGETS disp_sheet_id RUNTIME DESTINATION bin COMPONENT toolsmisc) diff --git a/code/nel/tools/misc/make_sheet_id/CMakeLists.txt b/code/nel/tools/misc/make_sheet_id/CMakeLists.txt index ecedba642..55996be34 100644 --- a/code/nel/tools/misc/make_sheet_id/CMakeLists.txt +++ b/code/nel/tools/misc/make_sheet_id/CMakeLists.txt @@ -5,7 +5,7 @@ ADD_EXECUTABLE(make_sheet_id ${SRC}) ADD_DEFINITIONS(-DNL_MK_SH_ID_CFG="\\"${NL_ETC_PREFIX}/\\"") TARGET_LINK_LIBRARIES(make_sheet_id ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(make_sheet_id "Tools, Misc: make_sheet_id") +NL_DEFAULT_PROPS(make_sheet_id "NeL, Tools, Misc: make_sheet_id") NL_ADD_RUNTIME_FLAGS(make_sheet_id) INSTALL(TARGETS make_sheet_id RUNTIME DESTINATION bin COMPONENT toolsmisc) diff --git a/code/nel/tools/misc/xml_packer/CMakeLists.txt b/code/nel/tools/misc/xml_packer/CMakeLists.txt index 69cf0c15d..888116fa4 100644 --- a/code/nel/tools/misc/xml_packer/CMakeLists.txt +++ b/code/nel/tools/misc/xml_packer/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(xml_packer ${SRC}) TARGET_LINK_LIBRARIES(xml_packer ${PLATFORM_LINKFLAGS} nelmisc) -NL_DEFAULT_PROPS(xml_packer "Tools, Misc: xml_packer") +NL_DEFAULT_PROPS(xml_packer "NeL, Tools, Misc: xml_packer") NL_ADD_RUNTIME_FLAGS(xml_packer) INSTALL(TARGETS xml_packer RUNTIME DESTINATION bin COMPONENT toolsmisc) diff --git a/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt b/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt index 91d8c8dab..54a8d5a4b 100644 --- a/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt +++ b/code/nel/tools/pacs/build_ig_boxes/CMakeLists.txt @@ -5,7 +5,7 @@ ADD_EXECUTABLE(build_ig_boxes ${SRC}) ADD_DEFINITIONS(-DNL_BIB_CFG="\\"${NL_ETC_PREFIX}/\\"") TARGET_LINK_LIBRARIES(build_ig_boxes ${PLATFORM_LINKFLAGS} nelpacs nel3d) -NL_DEFAULT_PROPS(build_ig_boxes "Tools, PACS: build_ig_boxes") +NL_DEFAULT_PROPS(build_ig_boxes "NeL, Tools, PACS: build_ig_boxes") NL_ADD_RUNTIME_FLAGS(build_ig_boxes) INSTALL(TARGETS build_ig_boxes RUNTIME DESTINATION bin COMPONENT toolspacs) diff --git a/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt index dd75005fa..e6388654f 100644 --- a/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt +++ b/code/nel/tools/pacs/build_indoor_rbank/CMakeLists.txt @@ -5,7 +5,7 @@ ADD_EXECUTABLE(build_indoor_rbank ${SRC}) ADD_DEFINITIONS(-DNL_BIRB_CFG="\\"${NL_ETC_PREFIX}/\\"") TARGET_LINK_LIBRARIES(build_indoor_rbank ${PLATFORM_LINKFLAGS} nelpacs) -NL_DEFAULT_PROPS(build_indoor_rbank "Tools, PACS: build_indoor_rbank") +NL_DEFAULT_PROPS(build_indoor_rbank "NeL, Tools, PACS: build_indoor_rbank") NL_ADD_RUNTIME_FLAGS(build_indoor_rbank) INSTALL(TARGETS build_indoor_rbank RUNTIME DESTINATION bin COMPONENT toolspacs) diff --git a/code/nel/tools/pacs/build_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_rbank/CMakeLists.txt index 7d74c68d4..f4dbc1251 100644 --- a/code/nel/tools/pacs/build_rbank/CMakeLists.txt +++ b/code/nel/tools/pacs/build_rbank/CMakeLists.txt @@ -7,7 +7,7 @@ ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"") INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(build_rbank ${PLATFORM_LINKFLAGS} nelpacs nel3d nelligo nelmisc) -NL_DEFAULT_PROPS(build_rbank "Tools, PACS: build_rbank") +NL_DEFAULT_PROPS(build_rbank "NeL, Tools, PACS: build_rbank") NL_ADD_RUNTIME_FLAGS(build_rbank) INSTALL(TARGETS build_rbank RUNTIME DESTINATION bin COMPONENT toolspacs) diff --git a/code/ryzom/server/CMakeLists.txt b/code/ryzom/server/CMakeLists.txt index 4b7537b55..8959deb1c 100644 --- a/code/ryzom/server/CMakeLists.txt +++ b/code/ryzom/server/CMakeLists.txt @@ -1 +1,3 @@ +SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + ADD_SUBDIRECTORY(src) diff --git a/code/ryzom/server/src/ai_service/CMakeLists.txt b/code/ryzom/server/src/ai_service/CMakeLists.txt index f8b05c7b3..bbf1a20be 100644 --- a/code/ryzom/server/src/ai_service/CMakeLists.txt +++ b/code/ryzom/server/src/ai_service/CMakeLists.txt @@ -12,12 +12,9 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ios_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ios_interface.h) -ADD_EXECUTABLE(ai_service ${SRC}) +ADD_EXECUTABLE(ai_service WIN32 ${SRC}) - - - -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ai_service admin_modules ryzom_gameshare server_share @@ -26,15 +23,13 @@ TARGET_LINK_LIBRARIES(ai_service admin_modules ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELLIGO_LIBRARY}) -IF(WIN32) - SET_TARGET_PROPERTIES(ai_service PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: AI Service (AIS)") -ENDIF(WIN32) + nelmisc + nelnet + nelgeorges + nelligo) + +NL_DEFAULT_PROPS(ai_service "Ryzom, Services: AI Service (AIS)") +NL_ADD_RUNTIME_FLAGS(ai_service) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/server/src/backup_service/CMakeLists.txt b/code/ryzom/server/src/backup_service/CMakeLists.txt index 515ec7735..d160ce43d 100644 --- a/code/ryzom/server/src/backup_service/CMakeLists.txt +++ b/code/ryzom/server/src/backup_service/CMakeLists.txt @@ -1,23 +1,22 @@ FILE(GLOB SRC *.cpp *.h) -ADD_EXECUTABLE(backup_service ${SRC}) +ADD_EXECUTABLE(backup_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(backup_service admin_modules ryzom_gameshare server_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELLIGO_LIBRARY}) -IF(WIN32) - SET_TARGET_PROPERTIES(backup_service PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: Backup Service (BS)") -ENDIF(WIN32) + nelmisc + nelnet + nelgeorges + nelligo) + +NL_DEFAULT_PROPS(backup_service "Ryzom, Services: Backup Service (BS)") +NL_ADD_RUNTIME_FLAGS(backup_service) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS backup_service RUNTIME DESTINATION sbin COMPONENT services) diff --git a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt index 081b37b50..60c0d15f7 100644 --- a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt +++ b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt @@ -2,9 +2,9 @@ FILE(GLOB SRC *.cpp *.h) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOURCE_DIR}/service.h) -ADD_EXECUTABLE(dynamic_scenario_service ${SRC}) +ADD_EXECUTABLE(dynamic_scenario_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(dynamic_scenario_service admin_modules ryzom_gameshare server_share @@ -12,15 +12,14 @@ TARGET_LINK_LIBRARIES(dynamic_scenario_service admin_modules ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELLIGO_LIBRARY}) -IF(WIN32) - SET_TARGET_PROPERTIES(dynamic_scenario_service PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: Dynamic Scenario Service (DSS)") -ENDIF(WIN32) + nelmisc + nelnet + nelgeorges + nelligo) + +NL_DEFAULT_PROPS(dynamic_scenario_service "Ryzom, Services: Dynamic Scenario Service (DSS)") +NL_ADD_RUNTIME_FLAGS(dynamic_scenario_service) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS dynamic_scenario_service RUNTIME DESTINATION sbin COMPONENT services) diff --git a/code/ryzom/server/src/entities_game_service/CMakeLists.txt b/code/ryzom/server/src/entities_game_service/CMakeLists.txt index 8a0648419..8f50890a2 100644 --- a/code/ryzom/server/src/entities_game_service/CMakeLists.txt +++ b/code/ryzom/server/src/entities_game_service/CMakeLists.txt @@ -40,9 +40,9 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.cpp ${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.h) -ADD_EXECUTABLE(entities_game_service ${SRC}) +ADD_EXECUTABLE(entities_game_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(entities_game_service admin_modules ryzom_gameshare server_share @@ -53,16 +53,14 @@ TARGET_LINK_LIBRARIES(entities_game_service admin_modules ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} - ${NELMISC_LIBRARY} - ${NELNET_LIBRARY} - ${NELGEORGES_LIBRARY} - ${NELLIGO_LIBRARY}) + nelmisc + nelnet + nelgeorges + nelligo) + +NL_DEFAULT_PROPS(entities_game_service "Ryzom, Services: Entities Game Service (EGS)") +NL_ADD_RUNTIME_FLAGS(entities_game_service) -IF(WIN32) - SET_TARGET_PROPERTIES(entities_game_service PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: Entities Game Service (EGS)") -ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(WITH_PCH) diff --git a/code/ryzom/server/src/frontend_service/CMakeLists.txt b/code/ryzom/server/src/frontend_service/CMakeLists.txt index 5fa67758e..bcbd38ea3 100644 --- a/code/ryzom/server/src/frontend_service/CMakeLists.txt +++ b/code/ryzom/server/src/frontend_service/CMakeLists.txt @@ -7,15 +7,13 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/pair_selector.cpp ${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.cpp ${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.h) -ADD_EXECUTABLE(frontend_service ${SRC}) +ADD_EXECUTABLE(frontend_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(frontend_service admin_modules ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY}) -IF(WIN32) - SET_TARGET_PROPERTIES(frontend_service PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: Frontend Service (FS)") -ENDIF(WIN32) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(frontend_service admin_modules ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges nelligo) + +NL_DEFAULT_PROPS(frontend_service "Ryzom, Services: Frontend Service (FS)") +NL_ADD_RUNTIME_FLAGS(frontend_service) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index fbb394d36..e4569da49 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -25,8 +25,8 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher ${PLATFORM_LINKFLAGS} ADD_DEFINITIONS(-DRZ_NO_CLIENT -DNL_USE_SEVENZIP) -NL_DEFAULT_PROPS(ryzom_client "Ryzom, Tools: Ryzom Client Patcher") -NL_ADD_RUNTIME_FLAGS(ryzom_client) +NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher") +NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/client/src/stdpch.cpp) diff --git a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt index 96103031b..f48fc5777 100644 --- a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(alias_synchronizer ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelligo) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(alias_synchronizer "Ryzom, Tools, Misc: Alias Synchronizer") +NL_ADD_RUNTIME_FLAGS(alias_synchronizer) + INSTALL(TARGETS alias_synchronizer RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt b/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt index 9d3c53239..d99581341 100644 --- a/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(csv_transform ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(csv_transform "Ryzom, Tools, Misc: CSV Transform") +NL_ADD_RUNTIME_FLAGS(csv_transform) + INSTALL(TARGETS csv_transform RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt b/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt index ef6ca5fab..e370f26ec 100644 --- a/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt @@ -2,13 +2,17 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(prim_export ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(prim_export ${NELMISC_LIBRARY} - ${NELLIGO_LIBRARY} - ${NEL3D_LIBRARY} - ${NELGEORGES_LIBRARY} +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(prim_export + nelmisc + nelligo + nel3d + nelgeorges ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(prim_export "Ryzom, Tools, World: Primitive Export") +NL_ADD_RUNTIME_FLAGS(prim_export) + INSTALL(TARGETS prim_export RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt b/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt index f8e8098d3..5ae137297 100644 --- a/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(uni_conv ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(uni_conv ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(uni_conv ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +NL_DEFAULT_PROPS(uni_conv "Ryzom, Tools, Misc: Unicode Conversion Tool") +NL_ADD_RUNTIME_FLAGS(uni_conv) INSTALL(TARGETS uni_conv RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/make_alias_file/CMakeLists.txt b/code/ryzom/tools/make_alias_file/CMakeLists.txt index 11a7c462e..e5b815f04 100644 --- a/code/ryzom/tools/make_alias_file/CMakeLists.txt +++ b/code/ryzom/tools/make_alias_file/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(make_alias_file ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelgeorges) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(make_alias_file "Ryzom, Tools, Misc: Make Alias File") +NL_ADD_RUNTIME_FLAGS(make_alias_file) + INSTALL(TARGETS make_alias_file RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt index e4275c26f..f5d2f7405 100644 --- a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt +++ b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(make_anim_by_race ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(make_anim_by_race "Ryzom, Tools, Misc: Make Anim By Race") +NL_ADD_RUNTIME_FLAGS(make_anim_by_race) + INSTALL(TARGETS make_anim_by_race RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt b/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt index b20f01b94..770fc15fc 100644 --- a/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt +++ b/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt @@ -6,4 +6,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(make_anim_melee_impact ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(make_anim_melee_impact "Ryzom, Tools, Misc: Make Anim Melee Impact") +NL_ADD_RUNTIME_FLAGS(make_anim_melee_impact) + INSTALL(TARGETS make_anim_melee_impact RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/patch_gen/CMakeLists.txt b/code/ryzom/tools/patch_gen/CMakeLists.txt index a73867a57..7998ea8cb 100644 --- a/code/ryzom/tools/patch_gen/CMakeLists.txt +++ b/code/ryzom/tools/patch_gen/CMakeLists.txt @@ -1,13 +1,19 @@ SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h) SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) ADD_EXECUTABLE(patch_gen ${MAIN_SRC}) -TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges) ADD_EXECUTABLE(patch_gen_service ${SERVICE_SRC}) -TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeogres) + +NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator") +NL_ADD_RUNTIME_FLAGS(patch_gen_service) + +NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator Service") +NL_ADD_RUNTIME_FLAGS(patch_gen) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/tools/pd_parser/CMakeLists.txt b/code/ryzom/tools/pd_parser/CMakeLists.txt index bf3591e62..5df6bcc51 100644 --- a/code/ryzom/tools/pd_parser/CMakeLists.txt +++ b/code/ryzom/tools/pd_parser/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(pd_parser ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(pd_parser "Ryzom, Tools: PD Parser") +NL_ADD_RUNTIME_FLAGS(pd_parser) + INSTALL(TARGETS pd_parser RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/pdr_util/CMakeLists.txt b/code/ryzom/tools/pdr_util/CMakeLists.txt index 67f40493a..b1d1e232a 100644 --- a/code/ryzom/tools/pdr_util/CMakeLists.txt +++ b/code/ryzom/tools/pdr_util/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(pdr_util ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(pdr_util "Ryzom, Tools: PDR Utility") +NL_ADD_RUNTIME_FLAGS(pdr_util) + INSTALL(TARGETS pdr_util RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/skill_extractor/CMakeLists.txt b/code/ryzom/tools/skill_extractor/CMakeLists.txt index b39730457..86992dd00 100644 --- a/code/ryzom/tools/skill_extractor/CMakeLists.txt +++ b/code/ryzom/tools/skill_extractor/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(skill_extractor ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(skill_extractor "Ryzom, Tools, Misc: Skill Extractor") +NL_ADD_RUNTIME_FLAGS(skill_extractor) + INSTALL(TARGETS skill_extractor RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/stats_scan/CMakeLists.txt b/code/ryzom/tools/stats_scan/CMakeLists.txt index 301531819..49a6a541c 100644 --- a/code/ryzom/tools/stats_scan/CMakeLists.txt +++ b/code/ryzom/tools/stats_scan/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(stats_scan ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(stats_scan "Ryzom, Tools, Misc: Stats Scan") +NL_ADD_RUNTIME_FLAGS(stats_scan) + INSTALL(TARGETS stats_scan RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/translation_tools/CMakeLists.txt b/code/ryzom/tools/translation_tools/CMakeLists.txt index dd9200d20..a156c5baa 100644 --- a/code/ryzom/tools/translation_tools/CMakeLists.txt +++ b/code/ryzom/tools/translation_tools/CMakeLists.txt @@ -2,8 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(translation_tools ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +NL_DEFAULT_PROPS(translation_tools "Ryzom, Tools, Misc: Translation Tools") +NL_ADD_RUNTIME_FLAGS(translation_tools) + INSTALL(TARGETS translation_tools RUNTIME DESTINATION bin COMPONENT tools)