From: <svn...@op...> - 2009-03-18 11:31:03
|
Author: bellmich Date: Wed Mar 18 12:30:56 2009 New Revision: 990 URL: http://libsyncml.opensync.org/changeset/990 Log: added next version of Solaris detection Modified: trunk/CMakeLists.txt Modified: trunk/CMakeLists.txt ============================================================================== --- trunk/CMakeLists.txt Wed Mar 18 11:50:50 2009 (r989) +++ trunk/CMakeLists.txt Wed Mar 18 12:30:56 2009 (r990) @@ -127,9 +127,9 @@ ELSE (LIBSOUP24_FOUND) OPTION ( HAVE_LIBSOUP24 "building with libsoup 2.4" OFF ) OPTION ( HAVE_LIBSOUP22 "building with libsoup 2.2" ON ) - IF( CMAKE_C_PLATFORM_ID STREQUAL "SunOS" ) + IF( CMAKE_SYSTEM_NAME STREQUAL "SunOS" ) OPTION( HAVE_LIBSOUP22_SOLARIS "enable Solaris libsoup workarounds" ON ) - ENDIF( CMAKE_C_PLATFORM_ID STREQUAL "SunOS" ) + ENDIF( CMAKE_SYSTEM_NAME STREQUAL "SunOS" ) ENDIF (LIBSOUP24_FOUND) ELSE(LIBSOUP2_FOUND) SET( ENABLE_HTTP OFF ) @@ -241,15 +241,17 @@ # status output INCLUDE( ShowStatus ) MESSAGE( STATUS "==================================================" ) +MESSAGE( STATUS "Operating System ${CMAKE_SYSTEM_NAME}" ) +IF( CMAKE_SYSTEM_NAME STREQUAL "SunOS" ) + SHOW_STATUS( HAVE_LIBSOUP22_SOLARIS "libsoup 2.2 Solaris workaround" ) +ENDIF( CMAKE_SYSTEM_NAME STREQUAL "SunOS" ) +MESSAGE( STATUS "==================================================" ) SHOW_STATUS( ENABLE_TOOLS "building tools\t\t" ) SHOW_STATUS( ENABLE_TRACE "tracing tools\t\t" ) SHOW_STATUS( ENABLE_UNIT_TEST "unit tests\t\t\t" ) SHOW_STATUS( THREAD_SAFE_CHECK "check is thread safe\t\t" CHECK_VERSION ) SHOW_STATUS( ENABLE_WBXML "WAP Binary XML\t\t" LIBWBXML2_VERSION ) SHOW_STATUS( ENABLE_HTTP "http transports\t\t" LIBSOUP2_VERSION ) -IF( CMAKE_C_PLATFORM_ID STREQUAL "SunOS" ) - SHOW_STATUS( HAVE_LIBSOUP22_SOLARIS "libsoup 2.2 Solaris workaround" ) -ENDIF( CMAKE_C_PLATFORM_ID STREQUAL "SunOS" ) SHOW_STATUS( ENABLE_OBEX "obex transports\t\t" OPENOBEX_VERSION ) SHOW_STATUS( ENABLE_BLUETOOTH "obex over bluetooth transports" BLUEZ_VERSION ) SHOW_STATUS( ENABLE_BLUETOOTH_SDPLIB "bluetooth channel discovery\t" ) |