aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ApiExtractor/CMakeLists.txt5
-rw-r--r--ApiExtractor/tests/CMakeLists.txt20
-rw-r--r--CMakeLists.txt4
-rw-r--r--generator/CMakeLists.txt11
-rw-r--r--generator/qtdoc/CMakeLists.txt6
-rw-r--r--generator/shiboken/CMakeLists.txt11
-rw-r--r--tests/test_generator/CMakeLists.txt9
7 files changed, 44 insertions, 22 deletions
diff --git a/ApiExtractor/CMakeLists.txt b/ApiExtractor/CMakeLists.txt
index ac3db08a3..8f0602918 100644
--- a/ApiExtractor/CMakeLists.txt
+++ b/ApiExtractor/CMakeLists.txt
@@ -86,14 +86,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/parser
${CMAKE_CURRENT_SOURCE_DIR}/parser/rpp
- ${QT_INCLUDE_DIR}
${APIEXTRACTOR_EXTRA_INCLUDES}
${Qt5Core_INCLUDE_DIRS}
${QtXml_INCLUDE_DIRS}
)
add_library(apiextractor STATIC ${apiextractor_SRC} ${apiextractor_RCCS_SRC})
-target_link_libraries(apiextractor ${APIEXTRACTOR_EXTRA_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY} ${QT_QTXML_LIBRARY})
+target_link_libraries(apiextractor
+ ${APIEXTRACTOR_EXTRA_LIBRARIES}
+ )
if (BUILD_TESTS)
enable_testing()
diff --git a/ApiExtractor/tests/CMakeLists.txt b/ApiExtractor/tests/CMakeLists.txt
index b31dcaf00..8aedcfd75 100644
--- a/ApiExtractor/tests/CMakeLists.txt
+++ b/ApiExtractor/tests/CMakeLists.txt
@@ -1,12 +1,26 @@
+find_package(Qt5Core)
+find_package(Qt5Gui)
+find_package(Qt5Test)
+find_package(Qt5Xml)
macro(declare_test testname)
# gone: qt4_automoc("${testname}.cpp")
add_executable(${testname} "${testname}.cpp")
- include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${apiextractor_SOURCE_DIR})
- target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} apiextractor)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${apiextractor_SOURCE_DIR}
+ ${Qt5Test_INCLUDE_DIRS}
+ )
+ target_link_libraries(${testname}
+ ${Qt5Xml_LIBRARIES}
+ ${Qt5Test_LIBRARIES}
+ ${Qt5Core_LIBRARIES}
+ ${Qt5Gui_LIBRARIES}
+ apiextractor)
add_test(${testname} ${testname})
if (INSTALL_TESTS)
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${testname} DESTINATION share/apiextractor${apiextractor_SUFFIX}/tests)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${testname}
+ DESTINATION share/apiextractor${apiextractor_SUFFIX}/tests)
endif()
endmacro(declare_test testname)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c998f69c..21c5373d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,14 @@
Include(icecc.cmake)
project(shiboken)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules/
${CMAKE_MODULE_PATH})
find_package(Qt5 REQUIRED COMPONENTS Core)
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${Qt5Core_DEFINITIONS})
set(shiboken_MAJOR_VERSION "1")
set(shiboken_MINOR_VERSION "2")
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index d18958c27..bee90563e 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -20,17 +20,18 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${apiextractor_SOURCE_DIR}
- ${QT_INCLUDE_DIR}
- ${QT_QTCORE_INCLUDE_DIR}
- ${QT_QTXML_INCLUDE_DIR})
+ ${Qt5Core_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ )
add_executable(shiboken ${shiboken_SRC})
add_dependencies(shiboken apiextractor)
set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
target_link_libraries(shiboken
apiextractor
- ${QT_QTCORE_LIBRARY}
- ${QT_QTXML_LIBRARY})
+ ${Qt5Core_LIBRARIES}
+ ${Qt5Xml_LIBRARIES}
+ )
configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
diff --git a/generator/qtdoc/CMakeLists.txt b/generator/qtdoc/CMakeLists.txt
index 541e7c6ee..1361ba8f1 100644
--- a/generator/qtdoc/CMakeLists.txt
+++ b/generator/qtdoc/CMakeLists.txt
@@ -5,15 +5,15 @@ qtdocgenerator.cpp
)
include_directories(${generators_SOURCE_DIR}
- ${QT_QTCORE_INCLUDE_DIR}
+ ${Qt5Core_INCLUDE_DIRS}
${APIEXTRACTOR_INCLUDE_DIR})
add_executable(docgenerator main.cpp)
set_target_properties(docgenerator PROPERTIES OUTPUT_NAME docgenerator${generator_SUFFIX})
-target_link_libraries(docgenerator ${QT_QTCORE_LIBRARY})
+target_link_libraries(docgenerator ${Qt5Core_LIBRARES})
add_library(qtdoc_generator SHARED ${qtdoc_generator_SRC})
-target_link_libraries(qtdoc_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner)
+target_link_libraries(qtdoc_generator ${APIEXTRACTOR_LIBRARY} ${Qt5Core_LIBRARES} genrunner)
set_property(TARGET qtdoc_generator PROPERTY PREFIX "")
install(TARGETS qtdoc_generator DESTINATION ${generator_plugin_DIR})
diff --git a/generator/shiboken/CMakeLists.txt b/generator/shiboken/CMakeLists.txt
index 57aac33ad..aa3405bd4 100644
--- a/generator/shiboken/CMakeLists.txt
+++ b/generator/shiboken/CMakeLists.txt
@@ -14,16 +14,17 @@ include_directories(${generators_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${APIEXTRACTOR_INCLUDE_DIR}
- ${QT_INCLUDE_DIR}
- ${QT_QTCORE_INCLUDE_DIR}
- ${QT_QTXML_INCLUDE_DIR})
+ ${Qt5Core_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ )
add_executable(shiboken ${shiboken_SRC})
set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
target_link_libraries(shiboken
${APIEXTRACTOR_LIBRARY}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTXML_LIBRARY})
+ ${Qt5Core_LIBRARIES}
+ ${Qt5Xml_LIBRARIES}
+ )
configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
diff --git a/tests/test_generator/CMakeLists.txt b/tests/test_generator/CMakeLists.txt
index 498d6624c..5f5099897 100644
--- a/tests/test_generator/CMakeLists.txt
+++ b/tests/test_generator/CMakeLists.txt
@@ -8,7 +8,7 @@ set_property(TARGET dummy_generator PROPERTY PREFIX "")
add_executable(dummygenerator main.cpp)
set(DUMMYGENERATOR_EXECUTABLE dummygenerator${generator_SUFFIX})
set_target_properties(dummygenerator PROPERTIES OUTPUT_NAME ${DUMMYGENERATOR_EXECUTABLE})
-target_link_libraries(dummygenerator ${QT_QTCORE_LIBRARY})
+target_link_libraries(dummygenerator ${Qt5Core_LIBRARIES})
configure_file(dummygentestconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/dummygentestconfig.h" @ONLY)
@@ -47,7 +47,12 @@ macro(declare_test testname)
qt4_automoc("${testname}.cpp")
add_executable(${testname} "${testname}.cpp")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
- target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY})
+ target_link_libraries(${testname}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${Qt5Test_LIBRARIES}
+ ${Qt5Core_LIBRARIES}
+ )
m_add_test(${testname})
endmacro(declare_test testname)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 00:28:04 +0000