Changeset 109

Timestamp:

06/15/09 12:17:21 (14 years ago)

Author:

smurzch2

Message:

Define CS_OS* in the CMakeLists.txt

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• globals.h (modified) (1 diff)
• toolchains/toolchain-mips-fonera2.cmake (modified) (1 diff)
• toolchains/toolchain-mips-tuxbox.cmake (modified) (1 diff)
• toolchains/toolchain-powerpc-tuxbox.cmake (modified) (1 diff)
• toolchains/toolchain-sh4-amino.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -8 +8 @@
     if (OSCAM_SYSTEM_NAME MATCHES "Tuxbox")
         set (OSCamOperatingSystem "Tuxbox")
+        set (CS_OS_HW "tuxbox")
+        set (CS_OS_SYS "linux")
     elseif (OSCAM_SYSTEM_NAME MATCHES "Fonera2")
         set (OSCamOperatingSystem "Fonera2")
+        set (CS_OS_HW "fonera2")
+        set (CS_OS_SYS "linux")
     elseif (OSCAM_SYSTEM_NAME MATCHES "Amino")
         set (OSCamOperatingSystem "Amino")
+        set (CS_OS_HW "amino")
+        set (CS_OS_SYS "linux")
     else (OSCAM_SYSTEM_NAME MATCHES "Tuxbox")
         set (OSCamOperatingSystem "Unknown")
+        set (CS_OS_HW "unknown")
+        set (CS_OS_SYS "unknown")
     endif (OSCAM_SYSTEM_NAME MATCHES "Tuxbox")
 else (CMAKE_CROSSCOMPILING)
     if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         set (OSCamOperatingSystem "Linux")
+        set (CS_OS_HW "pc")
+        set (CS_OS_SYS "linux")
     elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         set (OSCamOperatingSystem "Mac OS X")
+        set (CS_OS_HW "mac")
+        set (CS_OS_SYS "macosx")
     else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         set (OSCamOperatingSystem "Unknown")
+        set (CS_OS_HW "unknown")
+        set (CS_OS_SYS "unknown")
     endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 endif (CMAKE_CROSSCOMPILING)
@@ -58 +72 @@
 set (CS_CONFDIR ${DEFAULT_CS_CONFDIR} CACHE STRING "Default path for the config files")
 add_definitions ("-DCS_CONFDIR=\"${CS_CONFDIR}\"")
+
+set (CS_OS_CPU ${CMAKE_SYSTEM_PROCESSOR})
+set (CS_OSTYPE ${CS_OS_CPU}-${CS_OS_HW}-${CS_OS_SYS})
+
+add_definitions ("-DCS_OSTYPE=\"${CS_OSTYPE}\"")
+add_definitions ("-DCS_OS_CPU=\"${CS_OS_CPU}\"")
+add_definitions ("-DCS_OS_HW=\"${CS_OS_HW}\"")
+add_definitions ("-DCS_OS_SYS=\"${CS_OS_SYS}\"")
 
 #----------------------- subdirectories ------------------------------
@@ -123 +145 @@
 message (STATUS "")
 message (STATUS "  operating system: ${OSCamOperatingSystem}")
+message (STATUS "  system type: ${CS_OSTYPE}")
+message (STATUS "  system: ${CS_OS_SYS}")
+message (STATUS "  cpu: ${CS_OS_CPU}")
+message (STATUS "  hw: ${CS_OS_HW}")
 message (STATUS "")

trunk/globals.h

@@ -38 +38 @@
 
 #include "oscam-config.h"
-#include "oscam-ostype.h"
 #include "oscam-types.h"
 #include "cscrypt/cscrypt.h"

trunk/toolchains/toolchain-mips-fonera2.cmake

@@ -2 +2 @@
 set (CMAKE_SYSTEM_NAME Linux)
 set (CMAKE_C_COMPILER mips-linux-gcc)
-
+set (CMAKE_SYSTEM_PROCESSOR mips)

trunk/toolchains/toolchain-mips-tuxbox.cmake

@@ -2 +2 @@
 set (CMAKE_SYSTEM_NAME Linux)
 set (CMAKE_C_COMPILER mipsel-linux-gcc)
-
+set (CMAKE_SYSTEM_PROCESSOR mips)

trunk/toolchains/toolchain-powerpc-tuxbox.cmake

@@ -2 +2 @@
 set (CMAKE_SYSTEM_NAME Linux)
 set (CMAKE_C_COMPILER powerpc-tuxbox-linux-gnu-gcc)
-
+set (CMAKE_SYSTEM_PROCESSOR powerpc)

trunk/toolchains/toolchain-sh4-amino.cmake

@@ -2 +2 @@
 set (CMAKE_SYSTEM_NAME Linux)
 set (CMAKE_C_COMPILER sh4-linux-gnu-gcc)
-
+set (CMAKE_SYSTEM_PROCESSOR sh4)