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

List:       kde-commits
Subject:    [smokegen/Qt5] /: FindQt5Transitional.cmake isn't supported by all platforms
From:       Arno Rehn <arno () arnorehn ! de>
Date:       2013-06-10 11:22:22
Message-ID: 20130610112222.9F248A605A () git ! kde ! org
[Download RAW message or body]

Git commit fa2ad6b14b2d6da2a9818cb4ac1e97f3e8e8534f by Arno Rehn.
Committed on 05/05/2013 at 18:44.
Pushed by arnorehn into branch 'Qt5'.

FindQt5Transitional.cmake isn't supported by all platforms

Revert "Reduced the changes needed for smokegen to work with Qt 5."

This reverts commit 231b91250064a1b595698686fd33a6d40a3df882.

M  +4    -2    CMakeLists.txt
M  +2    -1    deptool/CMakeLists.txt
M  +1    -0    generators/dump/CMakeLists.txt
M  +1    -0    generators/smoke/CMakeLists.txt
M  +1    -0    parser/CMakeLists.txt
M  +2    -1    smokeapi/CMakeLists.txt

http://commits.kde.org/smokegen/fa2ad6b14b2d6da2a9818cb4ac1e97f3e8e8534f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc1f369..956e099 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,8 @@
 project(smokegenerator)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
 =

-include(${CMAKE_ROOT}/Modules/FindQt5Transitional.cmake)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Xml REQUIRED)
 =

 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cma=
ke )
 set(SMOKE_VERSION_MAJOR 3)
@@ -39,6 +40,7 @@ set (CMAKE_SKIP_RPATH FALSE)
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
 =

 add_executable(smokegen ${generator_SRC})
+qt5_use_modules(smokegen Core Xml)
 target_link_libraries(smokegen ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} cp=
pparser)
 set_target_properties(smokegen PROPERTIES COMPILE_DEFINITIONS __GENERATOR_=
BUILDING ENABLE_EXPORTS TRUE)
 =

diff --git a/deptool/CMakeLists.txt b/deptool/CMakeLists.txt
index a0f3d91..e0150fc 100644
--- a/deptool/CMakeLists.txt
+++ b/deptool/CMakeLists.txt
@@ -1,9 +1,10 @@
 project(smokedeptool)
 =

-include(${CMAKE_ROOT}/Modules/FindQt5Transitional.cmake)
+find_package(Qt5Core REQUIRED)
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/..  ${QT_INCLUDES} )
 =

 add_executable(smokedeptool main.cpp)
+qt5_use_modules(smokedeptool Core)
 target_link_libraries(smokedeptool smokebase ${QT_QTCORE_LIBRARY})
 =

 if (WIN32)
diff --git a/generators/dump/CMakeLists.txt b/generators/dump/CMakeLists.txt
index 00f6591..5b85d02 100644
--- a/generators/dump/CMakeLists.txt
+++ b/generators/dump/CMakeLists.txt
@@ -4,6 +4,7 @@ set(generator_dump_SRC
     generator_dump.cpp)
 =

 add_library(generator_dump MODULE ${generator_dump_SRC})
+qt5_use_modules(generator_dump Core)
 target_link_libraries(generator_dump ${QT_QTCORE_LIBRARY} smokegen)
 set_target_properties(generator_dump PROPERTIES PREFIX "")
 =

diff --git a/generators/smoke/CMakeLists.txt b/generators/smoke/CMakeLists.=
txt
index a49573a..4c219fa 100644
--- a/generators/smoke/CMakeLists.txt
+++ b/generators/smoke/CMakeLists.txt
@@ -7,6 +7,7 @@ set(generator_smoke_SRC
     helpers.cpp)
 =

 add_library(generator_smoke MODULE ${generator_smoke_SRC})
+qt5_use_modules(generator_smoke Core Xml)
 target_link_libraries(generator_smoke ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBR=
ARY} smokegen)
 set_target_properties(generator_smoke PROPERTIES PREFIX "")
 =

diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index 9e61f97..0c57f19 100644
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -36,6 +36,7 @@ set(cppparser_LIB_SRCS
 =

 add_definitions(-D__CPPPARSER_BUILDING)
 add_library(cppparser SHARED ${cppparser_LIB_SRCS})
+qt5_use_modules(cppparser Core)
 target_link_libraries(cppparser ${QT_QTCORE_LIBRARY})
 =

 install(TARGETS cppparser LIBRARY DESTINATION ${LIB_INSTALL_DIR}
diff --git a/smokeapi/CMakeLists.txt b/smokeapi/CMakeLists.txt
index 975a34c..1b20808 100644
--- a/smokeapi/CMakeLists.txt
+++ b/smokeapi/CMakeLists.txt
@@ -1,9 +1,10 @@
 project(smokeapi)
 =

-include(${CMAKE_ROOT}/Modules/FindQt5Transitional.cmake)
+find_package(Qt5Core REQUIRED)
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${QT_INCLUDES} )
 =

 add_executable(smokeapi main.cpp)
+qt5_use_modules(smokeapi Core)
 =

 if (WIN32)
 	# Realign the stack, for compatibility with an older ABI.
[prev in list] [next in list] [prev in thread] [next in thread]