[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [attica] /: Change version number to 0.5.x rather than 0.4.x when building with Qt5
From:       David Faure <faure () kde ! org>
Date:       2013-04-30 22:35:52
Message-ID: 20130430223552.16A0FA603F () git ! kde ! org
[Download RAW message or body]

Git commit 9f9092ea564112817bebab195c6918686b67488a by David Faure.
Committed on 01/05/2013 at 00:35.
Pushed by dfaure into branch 'master'.

Change version number to 0.5.x rather than 0.4.x when building with Qt5

M  +23   -1    CMakeLists.txt
M  +0    -18   lib/CMakeLists.txt

http://commits.kde.org/attica/9f9092ea564112817bebab195c6918686b67488a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87c1ecd..ea84f19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,30 @@
 project(attica)
 cmake_minimum_required(VERSION 2.8)
 =

+option(QT4_BUILD "Force building with Qt4 even if Qt5 is found")
+if (NOT QT4_BUILD)
+  find_package(Qt5Core QUIET)
+endif()
+if (Qt5Core_FOUND)
+  message(STATUS "Building with Qt5 support")
+  find_package(ECM 0.0.6 REQUIRED NO_MODULE)
+  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+  find_package(Qt5Transitional REQUIRED Core Network)
+  include(GNUInstallDirs)
+  set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+else()
+  set(QT_MIN_VERSION "4.7.0")
+  find_package(Qt4 REQUIRED)
+  set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)"=
 )
+  set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STR=
ING "Library directory name" FORCE)
+endif()
+
 set(CMAKE_LIBATTICA_VERSION_MAJOR 0)
-set(CMAKE_LIBATTICA_VERSION_MINOR 4)
+if (Qt5Core_FOUND)
+  set(CMAKE_LIBATTICA_VERSION_MINOR 5)
+else()
+  set(CMAKE_LIBATTICA_VERSION_MINOR 4)
+endif()
 set(CMAKE_LIBATTICA_VERSION_PATCH 2)
 set(CMAKE_LIBATTICA_VERSION_STRING  "${CMAKE_LIBATTICA_VERSION_MAJOR}.${CM=
AKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH}")
 =

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 6b6f191..a8fc43d 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -5,24 +5,6 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
 =

 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${CMAKE_MODULE_PA=
TH})
 =

-option(QT4_BUILD "Force building with Qt4 even if Qt5 is found")
-if (NOT QT4_BUILD)
-  find_package(Qt5Core QUIET)
-endif()
-if (Qt5Core_FOUND)
-  message(STATUS "Building with Qt5 support")
-  find_package(ECM 0.0.6 REQUIRED NO_MODULE)
-  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
-  find_package(Qt5Transitional REQUIRED Core Network)
-  include(GNUInstallDirs)
-  set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-else()
-  set(QT_MIN_VERSION "4.7.0")
-  find_package(Qt4 REQUIRED)
-  set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)"=
 )
-  set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STR=
ING "Library directory name" FORCE)
-endif()
-
 include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} )
 =

 # mingw can't handle exported explicit template instantiations in a DLL
[prev in list] [next in list] [prev in thread] [next in thread]