Merge lp:~shnatsel/slingshot/update-cmake-modules into lp:~elementary-pantheon/slingshot/trunk

[Sergey "Shnatsel" Davidoff]

Update CMake modules to revision 14 of lp:~elementary-apps/+junk/cmake-modules

Update CMake modules to revision 14 of lp:~elementary-apps/+junk/cmake-modules

Does not break build and Slingshot appears to work as before.

This will fix a number of issues with translation, add support for comments intended for translators, and suppress C compiler warnings by default, among other things.

=== added file 'cmake/GObjectIntrospectionMacros.cmake'
--- cmake/GObjectIntrospectionMacros.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GObjectIntrospectionMacros.cmake	2014-07-21 11:30:12 +0000
@@ -0,0 +1,34 @@
+macro(add_target_gir TARGET_NAME GIR_NAME HEADER CFLAGS GRANITE_VERSION)
+    set(PACKAGES "")
+    foreach(PKG ${ARGN})
+        set(PACKAGES ${PACKAGES} --include=${PKG})
+    endforeach()
+    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
+    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
+            --quiet
+            --library ${TARGET_NAME} ${PACKAGES}
+            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
+            -L${CMAKE_CURRENT_BINARY_DIR}
+            --nsversion=${GRANITE_VERSION} ${HEADER})")
+    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
+endmacro()
+
+macro(add_target_gir_with_executable TARGET_NAME EXE_NAME GIR_NAME HEADER EXE_HEADER CFLAGS GRANITE_VERSION)
+    set(PACKAGES "")
+    foreach(PKG ${ARGN})
+        set(PACKAGES ${PACKAGES} --include=${PKG})
+    endforeach()
+    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
+    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
+            --quiet
+            --library ${TARGET_NAME} --program ${EXE_NAME} ${PACKAGES}
+            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
+            -L${CMAKE_CURRENT_BINARY_DIR}
+            -I${CMAKE_CURRENT_BINARY_DIR}
+            --nsversion=${GRANITE_VERSION} ${HEADER} ${EXE_HEADER})")
+    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
+endmacro()

=== modified file 'cmake/Translations.cmake' (properties changed: +x to -x)
--- cmake/Translations.cmake	2013-12-26 00:08:04 +0000
+++ cmake/Translations.cmake	2014-07-21 11:30:12 +0000
@@ -20,23 +20,47 @@
     add_custom_target (pot COMMENT “Building translation catalog.”)
     find_program (XGETTEXT_EXECUTABLE xgettext)
 
-
     set(C_SOURCE "")
+    set(VALA_SOURCE "")
+    set(GLADE_SOURCE "")
 
     foreach(FILES_INPUT ${ARGN})
-        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala)
+        foreach(VALA_C_FILE ${SOURCE_FILES})
+            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui)
+        foreach(GLADE_C_FILE ${SOURCE_FILES})
+            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_C_FILE})
         endforeach()
     endforeach()
 
-    add_custom_command (TARGET pot COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${VALA_SOURCE} ${C_SOURCE} --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2"
-        --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="N_" --keyword="Q_:1g" --from-code=UTF-8
-        )
+    set(BASE_XGETTEXT_COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
+        -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g" --from-code=UTF-8)
+
+   set(CONTINUE_FLAG "")
+
+    IF(NOT "${C_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${VALA_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${GLADE_SOURCE}" STREQUAL "")
+        add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
+    ENDIF()  
 endmacro()

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2013-12-26 00:08:04 +0000
+++ cmake/ValaPrecompile.cmake	2014-07-21 11:30:12 +0000
@@ -212,7 +212,7 @@
     # Workaround for a bug that would make valac run twice. This file is written
     # after the vala compiler generates C source code.
     set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
-        
+
     add_custom_command(
     OUTPUT
         ${OUTPUT_STAMP}
@@ -228,6 +228,8 @@
         "-d" ${DIRECTORY} 
         ${vala_pkg_opts} 
         ${ARGS_OPTIONS} 
+        "-g"
+        "--save-temps"
         ${in_files} 
         ${custom_vapi_arguments}
     COMMAND