[Orxonox-commit 3652] r8337 - in code/branches/kicklib2: . cmake contrib src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-26 18:33:00 +0200 (Tue, 26 Apr 2011)
New Revision: 8337

Modified:
   code/branches/kicklib2/CMakeLists.txt
   code/branches/kicklib2/cmake/LibraryConfigTardis.cmake
   code/branches/kicklib2/contrib/CMakeLists.txt
   code/branches/kicklib2/src/OrxonoxConfig.cmake
Log:
Defined CMake variable LINUX.

Modified: code/branches/kicklib2/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/CMakeLists.txt	2011-04-26 04:49:49 UTC (rev 8336)
+++ code/branches/kicklib2/CMakeLists.txt	2011-04-26 16:33:00 UTC (rev 8337)
@@ -23,6 +23,11 @@
  #    Configures some basics and controls the configuration scripts
  #
 
+# Defined LINUX
+IF(UNIX AND NOT APPLE)
+  SET(LINUX TRUE)
+ENDIF()
+
 IF(WIN32)
   IF(MSVC10)
     CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3 FATAL_ERROR)

Modified: code/branches/kicklib2/cmake/LibraryConfigTardis.cmake
===================================================================
--- code/branches/kicklib2/cmake/LibraryConfigTardis.cmake	2011-04-26 04:49:49 UTC (rev 8336)
+++ code/branches/kicklib2/cmake/LibraryConfigTardis.cmake	2011-04-26 16:33:00 UTC (rev 8337)
@@ -24,12 +24,10 @@
  #    Also sets the TARDIS variable.
  #
 
-IF(UNIX AND NOT APPLE)
-  IF(EXISTS /etc/hostname)
-    FILE(STRINGS /etc/hostname HOSTNAME LIMIT_COUNT 1)
-    IF(${HOSTNAME} MATCHES "^tardis-[a-z][0-9][0-9]$")
-      SET (TARDIS ON)
-    ENDIF()
+IF(LINUX AND EXISTS /etc/hostname)
+  FILE(STRINGS /etc/hostname HOSTNAME LIMIT_COUNT 1)
+  IF(${HOSTNAME} MATCHES "^tardis-[a-z][0-9][0-9]$")
+    SET (TARDIS ON)
   ENDIF()
 ENDIF()
 

Modified: code/branches/kicklib2/contrib/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/contrib/CMakeLists.txt	2011-04-26 04:49:49 UTC (rev 8336)
+++ code/branches/kicklib2/contrib/CMakeLists.txt	2011-04-26 16:33:00 UTC (rev 8337)
@@ -23,7 +23,7 @@
  #    Installs system specific files
  #
 
-IF(UNIX AND NOT APPLE)
+IF(LINUX)
   INSTALL(FILES orxonox.desktop     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
   #INSTALL(FILES orxonox.manpage.xml DESTINATION /usr/man)
   INSTALL(FILES orxonox.png         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)

Modified: code/branches/kicklib2/src/OrxonoxConfig.cmake
===================================================================
--- code/branches/kicklib2/src/OrxonoxConfig.cmake	2011-04-26 04:49:49 UTC (rev 8336)
+++ code/branches/kicklib2/src/OrxonoxConfig.cmake	2011-04-26 16:33:00 UTC (rev 8337)
@@ -52,11 +52,9 @@
 
 # Platforms
 SET(ORXONOX_PLATFORM_WINDOWS ${WIN32})
-SET(ORXONOX_PLATFORM_APPLE ${APPLE})
-SET(ORXONOX_PLATFORM_UNIX ${UNIX})
-IF(UNIX AND NOT APPLE)
-  SET(ORXONOX_PLATFORM_LINUX TRUE)
-ENDIF()
+SET(ORXONOX_PLATFORM_APPLE   ${APPLE})
+SET(ORXONOX_PLATFORM_UNIX    ${UNIX})
+SET(ORXONOX_PLATFORM_LINUX   ${LINUX})
 
 # Check __forceinline
 IF(MSVC)