Changeset 109


Ignore:
Timestamp:
Jun 15, 2009, 12:17:21 PM (10 years ago)
Author:
smurzch2
Message:

Define CS_OS* in the CMakeLists.txt

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r108 r109  
    88    if (OSCAM_SYSTEM_NAME MATCHES "Tuxbox")
    99        set (OSCamOperatingSystem "Tuxbox")
     10        set (CS_OS_HW "tuxbox")
     11        set (CS_OS_SYS "linux")
    1012    elseif (OSCAM_SYSTEM_NAME MATCHES "Fonera2")
    1113        set (OSCamOperatingSystem "Fonera2")
     14        set (CS_OS_HW "fonera2")
     15        set (CS_OS_SYS "linux")
    1216    elseif (OSCAM_SYSTEM_NAME MATCHES "Amino")
    1317        set (OSCamOperatingSystem "Amino")
     18        set (CS_OS_HW "amino")
     19        set (CS_OS_SYS "linux")
    1420    else (OSCAM_SYSTEM_NAME MATCHES "Tuxbox")
    1521        set (OSCamOperatingSystem "Unknown")
     22        set (CS_OS_HW "unknown")
     23        set (CS_OS_SYS "unknown")
    1624    endif (OSCAM_SYSTEM_NAME MATCHES "Tuxbox")
    1725else (CMAKE_CROSSCOMPILING)
    1826    if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    1927        set (OSCamOperatingSystem "Linux")
     28        set (CS_OS_HW "pc")
     29        set (CS_OS_SYS "linux")
    2030    elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    2131        set (OSCamOperatingSystem "Mac OS X")
     32        set (CS_OS_HW "mac")
     33        set (CS_OS_SYS "macosx")
    2234    else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    2335        set (OSCamOperatingSystem "Unknown")
     36        set (CS_OS_HW "unknown")
     37        set (CS_OS_SYS "unknown")
    2438    endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    2539endif (CMAKE_CROSSCOMPILING)
     
    5872set (CS_CONFDIR ${DEFAULT_CS_CONFDIR} CACHE STRING "Default path for the config files")
    5973add_definitions ("-DCS_CONFDIR=\"${CS_CONFDIR}\"")
     74
     75set (CS_OS_CPU ${CMAKE_SYSTEM_PROCESSOR})
     76set (CS_OSTYPE ${CS_OS_CPU}-${CS_OS_HW}-${CS_OS_SYS})
     77
     78add_definitions ("-DCS_OSTYPE=\"${CS_OSTYPE}\"")
     79add_definitions ("-DCS_OS_CPU=\"${CS_OS_CPU}\"")
     80add_definitions ("-DCS_OS_HW=\"${CS_OS_HW}\"")
     81add_definitions ("-DCS_OS_SYS=\"${CS_OS_SYS}\"")
    6082
    6183#----------------------- subdirectories ------------------------------
     
    123145message (STATUS "")
    124146message (STATUS "  operating system: ${OSCamOperatingSystem}")
     147message (STATUS "  system type: ${CS_OSTYPE}")
     148message (STATUS "  system: ${CS_OS_SYS}")
     149message (STATUS "  cpu: ${CS_OS_CPU}")
     150message (STATUS "  hw: ${CS_OS_HW}")
    125151message (STATUS "")
  • trunk/globals.h

    r95 r109  
    3838
    3939#include "oscam-config.h"
    40 #include "oscam-ostype.h"
    4140#include "oscam-types.h"
    4241#include "cscrypt/cscrypt.h"
  • trunk/toolchains/toolchain-mips-fonera2.cmake

    r102 r109  
    22set (CMAKE_SYSTEM_NAME Linux)
    33set (CMAKE_C_COMPILER mips-linux-gcc)
    4 
     4set (CMAKE_SYSTEM_PROCESSOR mips)
  • trunk/toolchains/toolchain-mips-tuxbox.cmake

    r102 r109  
    22set (CMAKE_SYSTEM_NAME Linux)
    33set (CMAKE_C_COMPILER mipsel-linux-gcc)
    4 
     4set (CMAKE_SYSTEM_PROCESSOR mips)
  • trunk/toolchains/toolchain-powerpc-tuxbox.cmake

    r102 r109  
    22set (CMAKE_SYSTEM_NAME Linux)
    33set (CMAKE_C_COMPILER powerpc-tuxbox-linux-gnu-gcc)
    4 
     4set (CMAKE_SYSTEM_PROCESSOR powerpc)
  • trunk/toolchains/toolchain-sh4-amino.cmake

    r104 r109  
    22set (CMAKE_SYSTEM_NAME Linux)
    33set (CMAKE_C_COMPILER sh4-linux-gnu-gcc)
    4 
     4set (CMAKE_SYSTEM_PROCESSOR sh4)
Note: See TracChangeset for help on using the changeset viewer.