[Orxonox-commit 6454] r11109 - code/trunk/cmake

[zifloria at orxonox.net]

Author: zifloria
Date: 2016-02-06 15:27:55 +0100 (Sat, 06 Feb 2016)
New Revision: 11109

Modified:
   code/trunk/cmake/LibraryConfigTardis.cmake
Log:
changed build settings for tardis to use the new paths on the new tardis system

Modified: code/trunk/cmake/LibraryConfigTardis.cmake
===================================================================
--- code/trunk/cmake/LibraryConfigTardis.cmake	2016-02-04 22:54:04 UTC (rev 11108)
+++ code/trunk/cmake/LibraryConfigTardis.cmake	2016-02-06 14:27:55 UTC (rev 11109)
@@ -39,10 +39,10 @@
 #  SET(CMAKE_C_COMPILER "gcc-4.1.1")
 #  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
 
-  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
-  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
-  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/ogre-1.6.1-sd")
-  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/ogre-1.6.1-sd/amd64-debian-linux5.0")
+#  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/cegui-0.6.2-sd")
+#  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/cegui-0.6.2-sd/amd64-debian-linux5.0")
+#  LIST(APPEND CMAKE_INCLUDE_PATH "/usr/pack/ogre-1.6.1-sd")
+#  LIST(APPEND CMAKE_LIBRARY_PATH "/usr/pack/ogre-1.6.1-sd/amd64-debian-linux5.0")
 
   #Solution to the problem that on the new tardis machines, we needed to run Orxonox with the command
   # bash && LD_LIBRARY_PATH=/usr/pack/libcg-1.5-sd/amd64-debian-linux3.1/lib/ ./run
@@ -57,7 +57,13 @@
   #SET(ENV{OPENALDIR}   "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
   #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
 
+  # New paths for the new tardis system. The ogre includes need to be at ../dependencies.
+  SET(OGRE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/ogre_src_v1-8-0/OgreMain/include/")
+  SET(OGRE_LIBRARY_OPTIMIZED "/usr/lib/x86_64-linux-gnu/libOgreMain.so.1.8.0")
+  SET(OGRE_PLUGIN_Plugin_ParticleFX_OPTIMIZED "/usr/lib/x86_64-linux-gnu/OGRE-1.8.0/Plugin_ParticleFX.so")
+  SET(OGRE_PLUGIN_RenderSystem_GL_OPTIMIZED "/usr/lib/x86_64-linux-gnu/OGRE-1.8.0/RenderSystem_GL.so")
 
+
   # Sandro fix: add flag that re-enables boost threads. This makes the combination
   #             of GCC version > 4.7 and older libboost work. See 
   # http://stackoverflow.com/questions/5389853/doesnt-compile-if-included-boost-thread-in-linux-ubuntu10-10