Merge lp:~dktrkranz/granite/non-linux-build into lp:~elementary-pantheon/granite/granite

[Luca Falavigna]

This new patch fixes a mistake I did in my previous patch

[Victor Martinez (victored)]

I cannot test this on a non-linux system ATM, but the CMake-side implementation is reliable. Thanks for the quick fix!

review: Approve

[Devid Antonio Filoni (d.filoni)]

There is a typo on this patch:
 ${OS_TYPE)

review: Needs Fixing

[Victor Martinez (victored)]

Good catch Devid. I didn't see that ')' on line 21 (diff)

review: Needs Fixing

[lp:~dktrkranz/granite/non-linux-build]

466. By Luca Falavigna on 2012-11-23

Fix typo

[Luca Falavigna (dktrkranz)]

Thanks, fixed.

[lp:~dktrkranz/granite/non-linux-build]

467. By Luca Falavigna on 2012-11-23

Merge with trunk

[Victor Martinez (victored)]

review: Approve

=== modified file 'lib/Application.vala'
--- lib/Application.vala	2012-11-23 01:19:02 +0000
+++ lib/Application.vala	2012-11-23 08:52:30 +0000
@@ -69,7 +69,9 @@
 
             Granite.init ();
             // set program name
+#if LINUX
             prctl (15, exec_name, 0, 0, 0);
+#endif
             Environment.set_prgname (exec_name);
 
             Logger.initialize (program_name);
@@ -86,8 +88,10 @@
 
         }
 
+#if LINUX
         [CCode (cheader_filename = "sys/prctl.h", cname = "prctl")]
             protected extern static int prctl (int option, string arg2, ulong arg3, ulong arg4, ulong arg5);
+#endif
 
         /**
          * This method runs the application

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2012-11-23 01:19:02 +0000
+++ lib/CMakeLists.txt	2012-11-23 08:52:30 +0000
@@ -44,6 +44,12 @@
     ${DEPS_LIBRARY_DIRS}
 )
 link_directories(${LIB_PATHS})
+
+# Check whether OS type is Linux
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set (OS_TYPE --define=LINUX)
+endif ()
+
 #VALA stuff
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Widgets/)
@@ -96,6 +102,7 @@
     gee-1.0
 OPTIONS
     --thread
+    ${OS_TYPE}
 GENERATE_VAPI
     granite
 GENERATE_HEADER
@@ -148,4 +155,3 @@
 add_custom_command (TARGET valadocs COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/images -R -f)
 add_custom_command (TARGET valadocs COMMAND cp ${CMAKE_SOURCE_DIR}/doc/images/ ${CMAKE_CURRENT_BINARY_DIR}/images -R)
 add_custom_command (TARGET valadocs COMMAND VALADOC_HEADER=${CMAKE_CURRENT_SOURCE_DIR}/docs/header.html valadoc -o docs_vala ${CMAKE_CURRENT_SOURCE_DIR}/*/*.vala ${CMAKE_CURRENT_SOURCE_DIR}/*.vapi ${CMAKE_CURRENT_SOURCE_DIR}/*.vala --pkg=glib-2.0 --pkg=gio-2.0 --pkg=posix --pkg=gtk+-3.0 --pkg=gee-1.0 --pkg=gio-unix-2.0 --package-name=${PKGNAME} --package-version=${GRANITE_VERSION} --force --doclet=html)
-