Merge lp:~codygarver/pantheon-friends/cmake-cleanup into lp:pantheon-friends

[Cody Garver]

CMakeLists.txt: Clean up and strict dependency requirements

This needs testing, I don't have the require GTK so I can't confirm it works for sure.

[Rico Tzschichholz (ricotz)]

Actually valac 0.21.1 is required for having gtk 3.9.x support.

[lp:~codygarver/pantheon-friends/cmake-cleanup]

3. By Cody Garver on 2013-09-17

Bump valac to 0.21.1 as advised by Rico

[Cody Garver (codygarver)]

Corrected, thanks.

On Tue, Sep 17, 2013 at 12:36 AM, Rico Tzschichholz <email address hidden>wrote:

> Actually valac 0.21.1 is required for having gtk 3.9.x support.
> --
>
> https://code.launchpad.net/~codygarver/pantheon-friends/cmake-cleanup/+merge/185948
> Your team Developers of Friends is requested to review the proposed merge
> of lp:~codygarver/pantheon-friends/cmake-cleanup into lp:pantheon-friends.
>

--
Cody Garver

[David Gomes (davidgomes)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-16 14:37:45 +0000
+++ CMakeLists.txt	2013-09-17 06:03:41 +0000
@@ -1,56 +1,62 @@
-
-set (NAME friends)
-set (PACKAGES granite telepathy-glib)
-set (FILES src/Friends.vala src/main_window.vala src/Widget/contact_box.vala src/Widget/notification_button.vala src/Widget/request_box.vala src/Lib/telepathy_manager.vala)
- 
- 
-project (${NAME})
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.6)
 cmake_policy (VERSION 2.6)
- 
-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
- 
-set (CMAKE_INSTALL_PREFIX /usr)
- 
-enable_testing ()
- 
+project (friends C)
+
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) 
+
 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/friends")
-set (GETTEXT_PACKAGE "${NAME}")
+set (PKGDATADIR "${DATADIR}/${CMAKE_PROJECT_NAME}")
+set (GETTEXT_PACKAGE "${CMAKE_PROJECT_NAME}")
+set (EXEC_NAME "${CMAKE_PROJECT_NAME}")
+set (RELEASE_NAME "Isis")
 set (VERSION "0.1")
- 
-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
+set (VERSION_INFO "isis")
+set (CMAKE_C_FLAGS "-ggdb")
+set (PREFIX ${CMAKE_INSTALL_PREFIX})
+set (DOLLAR "$")
+
+enable_testing ()
+
 configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.cmake ${CMAKE_BINARY_DIR}/src/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
- 
-find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED ${PACKAGES})
- 
+
 add_definitions (${DEPS_CFLAGS})
 link_libraries (${DEPS_LIBRARIES})
 link_directories (${DEPS_LIBRARY_DIRS})
- 
+
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version (0.16.0 MINIMUM)
- 
+ensure_vala_version (0.21.1 MINIMUM)
+
+set (FRIENDS_DEPS
+    granite
+    gtk+-3.0>=3.9.14
+    telepathy-glib)
+
+find_package(PkgConfig)
+pkg_check_modules(DEPS REQUIRED ${FRIENDS_DEPS})
+
 include (ValaPrecompile)
-vala_precompile (VALA_C ${NAME}
-        ${FILES}
+vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
+    src/Friends.vala
+    src/main_window.vala
+    src/Lib/telepathy_manager.vala
+    src/Widget/contact_box.vala
+    src/Widget/notification_button.vala
+    src/Widget/request_box.vala
 PACKAGES
-        ${PACKAGES}
+    ${FRIENDS_DEPS}
 OPTIONS
-        ${VALAFLAGS}
+    --thread
 )
- 
+
 add_subdirectory (po)
- 
+
 include (GSettings)
 add_schema (data/org.pantheon.friends.gschema.xml)
- 
-add_executable (${NAME} ${VALA_C})
- 
-install (TARGETS ${NAME} RUNTIME DESTINATION bin)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${NAME}.desktop DESTINATION share/applications)
+
+add_executable (${CMAKE_PROJECT_NAME} ${VALA_C})
+
+install (TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION bin)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}.desktop DESTINATION ${DATADIR}/applications)