Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

deal with excessive include directories

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-30 12:39:35 +00:00
parent 297d732ace
commit 995b7998b0
32 changed files with 71 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -187,7 +187,6 @@ add_feature_info(accessibility WITH_ACCESSIBILITY "build accessibility support")
include(mkspecs/mkspecs.cmake)
add_definitions(
-DKATIE_TOOLS_SUFFIX="${KATIE_TOOLS_SUFFIX}"
-DQT_ASCII_CAST_WARNINGS
-DQT_POSIX_IPC
# -DQT_STRICT_ITERATORS
@ -212,11 +211,6 @@ endif()
# for 3rd party source used in test component
check_include_file(sys/time.h HAVE_SYS_TIME_H)
if(HAVE_SYS_TIME_H)
add_definitions(-DTIME_WITH_SYS_TIME=1 -DHAVE_SYS_TIME_H)
else()
add_definitions(-DTIME_WITH_SYS_TIME=0)
endif()
# used in qconfig.h
check_type_size(size_t QT_POINTER_SIZE)
@ -484,9 +478,6 @@ else()
message(WARNING "\nUsing pre-generated classes map")
endif()
# various sources use #include <shared/blah.h>
include_directories(${CMAKE_SOURCE_DIR}/src)
if(ENABLE_TESTING)
message(WARNING
"\nUnless it is intentionall you should not enable testing, deploying tests builds"

3
cmake/modules/KatieBuildMacros.cmake
View file

@ -162,6 +162,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
set(rscout "${rscpath}/ui_${rscname}.h")
set(targetresources ${targetresources} ${rscout})
make_directory(${rscpath})
include_directories(${rscpath})
add_custom_command(
COMMAND "${KATIE_UIC}" "${resource}" -o "${rscout}"
OUTPUT "${rscout}"
@ -170,6 +171,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
set(rscout "${rscpath}/qrc_${rscname}.cpp")
set(targetresources ${targetresources} ${rscout})
make_directory(${rscpath})
include_directories(${rscpath})
add_custom_command(
COMMAND "${KATIE_RCC}" "${resource}" -o "${rscout}" -name "${rscname}"
OUTPUT "${rscout}"
@ -190,6 +192,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
set(mocargs ${mocargs} -I${incdir})
endforeach()
make_directory(${rscpath})
include_directories(${rscpath})
add_custom_command(
COMMAND "${KATIE_MOC}" -nw "${resource}" -o "${rscout}" ${mocargs}
OUTPUT "${rscout}"

3
cmake/modules/KatieMacros.cmake
View file

@ -13,6 +13,7 @@ macro(KATIE_RESOURCES RESOURCES)
if("${rscext}" STREQUAL ".ui")
set(rscout "${rscpath}/ui_${rscname}.h")
make_directory(${rscpath})
include_directories(${rscpath})
add_custom_command(
COMMAND ${KATIE_UIC} "${resource}" -o "${rscout}"
OUTPUT "${rscout}"
@ -21,6 +22,7 @@ macro(KATIE_RESOURCES RESOURCES)
elseif("${rscext}" STREQUAL ".qrc")
set(rscout "${rscpath}/qrc_${rscname}.cpp")
make_directory(${rscpath})
include_directories(${rscpath})
add_custom_command(
COMMAND ${KATIE_RCC} "${resource}" -o "${rscout}" -name "${rscname}"
OUTPUT "${rscout}"
@ -43,6 +45,7 @@ macro(KATIE_RESOURCES RESOURCES)
set(mocargs ${mocargs} -I${incdir})
endforeach()
make_directory(${rscpath})
include_directories(${rscpath})
add_custom_command(
COMMAND ${KATIE_MOC} -nw "${resource}" -o "${rscout}" ${mocargs}
OUTPUT "${rscout}"

18
src/core/CMakeLists.txt
View file

@ -240,24 +240,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_CURRENT_SOURCE_DIR}/codecs
${CMAKE_CURRENT_SOURCE_DIR}/concurrent
${CMAKE_CURRENT_SOURCE_DIR}/global
${CMAKE_CURRENT_SOURCE_DIR}/io
${CMAKE_CURRENT_SOURCE_DIR}/json
${CMAKE_CURRENT_SOURCE_DIR}/kernel
${CMAKE_CURRENT_SOURCE_DIR}/plugin
${CMAKE_CURRENT_SOURCE_DIR}/thread
${CMAKE_CURRENT_SOURCE_DIR}/tools
${CMAKE_CURRENT_BINARY_DIR}/codecs
${CMAKE_CURRENT_BINARY_DIR}/concurrent
${CMAKE_CURRENT_BINARY_DIR}/global
${CMAKE_CURRENT_BINARY_DIR}/io
${CMAKE_CURRENT_BINARY_DIR}/json
${CMAKE_CURRENT_BINARY_DIR}/kernel
${CMAKE_CURRENT_BINARY_DIR}/plugin
${CMAKE_CURRENT_BINARY_DIR}/thread
${CMAKE_CURRENT_BINARY_DIR}/tools
${ZLIB_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIR}
)

1
src/core/tools/tools.cmake
View file

@ -49,7 +49,6 @@ set(CORE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/tools/qvector.h
${CMAKE_CURRENT_SOURCE_DIR}/tools/qcommandlineoption.h
${CMAKE_CURRENT_SOURCE_DIR}/tools/qcommandlineparser.h
${CMAKE_CURRENT_SOURCE_DIR}/tools/qiterator.h
${CMAKE_CURRENT_SOURCE_DIR}/tools/qpair.h
)

21
src/dbus/CMakeLists.txt
View file

@ -30,6 +30,16 @@ set(DBUS_PUBLIC_HEADERS
QDBusVariant
)
include_directories(
${CMAKE_BINARY_DIR}/include
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtXml
${CMAKE_BINARY_DIR}/privateinclude/QtXml
${DBUS_INCLUDES}
)
set(DBUS_HEADERS
${DBUS_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/qdbusargument.h
@ -96,17 +106,6 @@ set(DBUS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/qdbusvirtualobject.cpp
)
include_directories(
${CMAKE_BINARY_DIR}/include
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtXml
${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_CURRENT_SOURCE_DIR}
${DBUS_INCLUDES}
)
katie_generate_misc("${DBUS_HEADERS}" QtDBus)
katie_generate_public("${DBUS_PUBLIC_HEADERS}" QtDBus)
katie_generate_package(KtDBus "KtCore KtXml")

13
src/declarative/CMakeLists.txt
View file

@ -48,20 +48,7 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtScript
${CMAKE_BINARY_DIR}/include/QtDeclarative
${CMAKE_BINARY_DIR}/privateinclude/QtDeclarative
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/util
${CMAKE_CURRENT_SOURCE_DIR}/graphicsitems
${CMAKE_CURRENT_SOURCE_DIR}/qml
${CMAKE_CURRENT_SOURCE_DIR}/qml/parser
${CMAKE_CURRENT_SOURCE_DIR}/qml/rewriter
${CMAKE_CURRENT_BINARY_DIR}/util
${CMAKE_CURRENT_BINARY_DIR}/graphicsitems
${CMAKE_CURRENT_BINARY_DIR}/qml
${CMAKE_CURRENT_BINARY_DIR}/qml/parser
${CMAKE_CURRENT_BINARY_DIR}/qml/rewriter
${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src
${CMAKE_SOURCE_DIR}/src/gui/painting
${CMAKE_SOURCE_DIR}/src/core/tools
)
katie_generate_misc("${DECLARATIVE_HEADERS}" QtDeclarative)

8
src/declarative/qml/qdeclarativerewrite_p.h
View file

@ -53,10 +53,10 @@
// We mean it.
//
#include "rewriter/textwriter_p.h"
#include "parser/qdeclarativejslexer_p.h"
#include "parser/qdeclarativejsparser_p.h"
#include "parser/qdeclarativejsnodepool_p.h"
#include "textwriter_p.h"
#include "qdeclarativejslexer_p.h"
#include "qdeclarativejsparser_p.h"
#include "qdeclarativejsnodepool_p.h"
QT_BEGIN_NAMESPACE

10
src/designer/CMakeLists.txt
View file

@ -2,6 +2,7 @@ add_definitions(
${SHAREDGRADIENDEDITOR_DEFINITIONS}
${SHAREDPROPERTYBROWSER_DEFINITIONS}
-DQT_SCRIPT_LIB
-DKATIE_TOOLS_SUFFIX="${KATIE_TOOLS_SUFFIX}"
)
set(EXTRA_DESIGNER_LIBS KtCore KtGui KtXml KtUiTools)
@ -85,15 +86,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtUiTools
${CMAKE_BINARY_DIR}/include/QtDesigner
${CMAKE_BINARY_DIR}/privateinclude/QtDesigner
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/components
${CMAKE_CURRENT_SOURCE_DIR}/extension
${CMAKE_CURRENT_SOURCE_DIR}/sdk
${CMAKE_CURRENT_SOURCE_DIR}/shared
${CMAKE_CURRENT_BINARY_DIR}/components
${CMAKE_CURRENT_BINARY_DIR}/extension
${CMAKE_CURRENT_BINARY_DIR}/sdk
${CMAKE_CURRENT_BINARY_DIR}/shared
${SHAREDGRADIENDEDITOR_INCLUDES}
${SHAREDPROPERTYBROWSER_INCLUDES}
${SHAREDFINDWIDGET_INCLUDES}

22
src/designer/components/CMakeLists.txt
View file

@ -40,28 +40,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtDesigner
${CMAKE_BINARY_DIR}/include/QtDesignerComponents
${CMAKE_BINARY_DIR}/privateinclude/QtDesignerComponents
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/buddyeditor
${CMAKE_CURRENT_SOURCE_DIR}/formeditor
${CMAKE_CURRENT_SOURCE_DIR}/objectinspector
${CMAKE_CURRENT_SOURCE_DIR}/propertyeditor
${CMAKE_CURRENT_SOURCE_DIR}/signalsloteditor
${CMAKE_CURRENT_SOURCE_DIR}/tabordereditor
${CMAKE_CURRENT_SOURCE_DIR}/taskmenu
${CMAKE_CURRENT_SOURCE_DIR}/widgetbox
${CMAKE_CURRENT_BINARY_DIR}/buddyeditor
${CMAKE_CURRENT_BINARY_DIR}/formeditor
${CMAKE_CURRENT_BINARY_DIR}/objectinspector
${CMAKE_CURRENT_BINARY_DIR}/propertyeditor
${CMAKE_CURRENT_BINARY_DIR}/signalsloteditor
${CMAKE_CURRENT_BINARY_DIR}/tabordereditor
${CMAKE_CURRENT_BINARY_DIR}/taskmenu
${CMAKE_CURRENT_BINARY_DIR}/widgetbox
${CMAKE_SOURCE_DIR}/src/designer/components
${CMAKE_SOURCE_DIR}/src/designer/sdk
${CMAKE_SOURCE_DIR}/src/designer/extension
${CMAKE_SOURCE_DIR}/src/designer/shared
${CMAKE_SOURCE_DIR}/src/designer
)
if(KATIE_TYPE STREQUAL SHARED)

1
src/designer/shared/shared.cmake
View file

@ -12,6 +12,7 @@ set(DESIGNER_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/shared/qdesigner_command_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/morphmenu_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/qdesigner_command2_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/qdesigner_propertycommand_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/qdesigner_formbuilder_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/qdesigner_taskmenu_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/formlayoutmenu_p.h

29
src/gui/CMakeLists.txt
View file

@ -440,35 +440,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_BINARY_DIR}/include/QtGui
${CMAKE_BINARY_DIR}/privateinclude/QtGui
${CMAKE_CURRENT_SOURCE_DIR}/accessible
${CMAKE_CURRENT_SOURCE_DIR}/animation
${CMAKE_CURRENT_SOURCE_DIR}/dialogs
${CMAKE_CURRENT_SOURCE_DIR}/effects
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview
${CMAKE_CURRENT_SOURCE_DIR}/image
${CMAKE_CURRENT_SOURCE_DIR}/itemviews
${CMAKE_CURRENT_SOURCE_DIR}/kernel
${CMAKE_CURRENT_SOURCE_DIR}/math3d
${CMAKE_CURRENT_SOURCE_DIR}/painting
${CMAKE_CURRENT_SOURCE_DIR}/styles
${CMAKE_CURRENT_SOURCE_DIR}/text
${CMAKE_CURRENT_SOURCE_DIR}/util
${CMAKE_CURRENT_SOURCE_DIR}/widgets
${CMAKE_CURRENT_BINARY_DIR}/accessible
${CMAKE_CURRENT_BINARY_DIR}/animation
${CMAKE_CURRENT_BINARY_DIR}/dialogs
${CMAKE_CURRENT_BINARY_DIR}/effects
${CMAKE_CURRENT_BINARY_DIR}/graphicsview
${CMAKE_CURRENT_BINARY_DIR}/image
${CMAKE_CURRENT_BINARY_DIR}/itemviews
${CMAKE_CURRENT_BINARY_DIR}/kernel
${CMAKE_CURRENT_BINARY_DIR}/math3d
${CMAKE_CURRENT_BINARY_DIR}/painting
${CMAKE_CURRENT_BINARY_DIR}/styles
${CMAKE_CURRENT_BINARY_DIR}/text
${CMAKE_CURRENT_BINARY_DIR}/util
${CMAKE_CURRENT_BINARY_DIR}/widgets
${CMAKE_SOURCE_DIR}/src/core/tools
${FREETYPE_INCLUDE_DIRS}
${X11_INCLUDE_DIR}
)

1
src/gui/graphicsview/graphicsview.cmake
View file

@ -10,6 +10,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview/qgraphicslayoutitem_p.h
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview/qgraphicslinearlayout.h
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview/qgraphicsproxywidget.h
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview/qgraphicsproxywidget_p.h
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview/qgraphicsscene.h
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview/qgraphicsscene_bsp_p.h
${CMAKE_CURRENT_SOURCE_DIR}/graphicsview/qgraphicsscene_p.h

2
src/gui/itemviews/itemviews.cmake
View file

@ -3,6 +3,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qabstractitemview.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qabstractitemview_p.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qheaderview.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qheaderview_p.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qidentityproxymodel.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qlistview.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qlistview_p.h
@ -34,6 +35,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qstandarditemmodel_p.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qstringlistmodel.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qtreewidgetitemiterator.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qtreewidgetitemiterator_p.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qdatawidgetmapper.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qfileiconprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/itemviews/qfileiconprovider_p.h

1
src/gui/kernel/kernel.cmake
View file

@ -8,6 +8,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qboxlayout.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qclipboard.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcursor.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcursor_p.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdesktopwidget.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdrag.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qdnd_p.h

1
src/gui/painting/painting.cmake
View file

@ -5,6 +5,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolor.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolor_p.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qcolormap.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qcssutil_p.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qdrawutil.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qgraphicssystem_p.h
${CMAKE_CURRENT_SOURCE_DIR}/painting/qmatrix.h

2
src/gui/styles/styles.cmake
View file

@ -1,11 +1,13 @@
set(GUI_HEADERS
${GUI_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/styles/qstyle.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qstyle_p.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qstylefactory.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qstyleoption.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qstyleplugin.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qcommonstylepixmaps_p.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qcommonstyle.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qcommonstyle_p.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qstylehelper_p.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qproxystyle.h
${CMAKE_CURRENT_SOURCE_DIR}/styles/qproxystyle_p.h

1
src/gui/text/text.cmake
View file

@ -22,6 +22,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/text/qtextdocument_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qtexthtmlparser_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qabstracttextdocumentlayout.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qabstracttextdocumentlayout_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qtextdocumentlayout_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qtextcursor.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qtextcursor_p.h

1
src/gui/widgets/widgets.cmake
View file

@ -20,6 +20,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qdockwidget.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qdockwidget_p.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qdockarealayout_p.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qeffects_p.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qfontcombobox.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qframe.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qframe_p.h

10
src/network/CMakeLists.txt
View file

@ -61,16 +61,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtNetwork
${CMAKE_BINARY_DIR}/privateinclude/QtNetwork
${CMAKE_CURRENT_SOURCE_DIR}/access
${CMAKE_CURRENT_SOURCE_DIR}/bearer
${CMAKE_CURRENT_SOURCE_DIR}/kernel
${CMAKE_CURRENT_SOURCE_DIR}/socket
${CMAKE_CURRENT_SOURCE_DIR}/ssl
${CMAKE_CURRENT_BINARY_DIR}/access
${CMAKE_CURRENT_BINARY_DIR}/bearer
${CMAKE_CURRENT_BINARY_DIR}/kernel
${CMAKE_CURRENT_BINARY_DIR}/socket
${CMAKE_CURRENT_BINARY_DIR}/ssl
${OPENSSL_INCLUDE_DIR}
)

1
src/network/kernel/kernel.cmake
View file

@ -3,6 +3,7 @@ set(NETWORK_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qauthenticator.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qauthenticator_p.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostaddress.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostaddress_p.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostinfo.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostinfo_p.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qurlinfo.h

1
src/network/socket/socket.cmake
View file

@ -6,6 +6,7 @@ set(NETWORK_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/socket/qabstractsocket.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qabstractsocket_p.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qtcpsocket.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qtcpsocket_p.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qudpsocket.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qtcpserver.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qlocalserver.h

53
src/script/CMakeLists.txt
View file

@ -34,11 +34,31 @@ set(SCRIPT_PUBLIC_HEADERS
QScriptValueList
)
include_directories(
${CMAKE_BINARY_DIR}/include
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtScript
${CMAKE_BINARY_DIR}/privateinclude/QtScript
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/parser
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/bytecompiler
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/debugger
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/runtime
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/wtf
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/wtf/unicode
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/unicode
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/interpreter
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/API
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/bytecode
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/generated
${PCRE_INCLUDES}
)
set(SCRIPT_SOURCES
${SCRIPT_SOURCES}
# Generated files, simply list them for JavaScriptCore
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/generated/Grammar.cpp
# JSCore
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/API/JSCallbackConstructor.cpp
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/API/JSCallbackFunction.cpp
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/API/JSCallbackObject.cpp
@ -152,35 +172,6 @@ set(SCRIPT_SOURCES
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/wtf/unicode/UTF8.cpp
)
include_directories(
${CMAKE_BINARY_DIR}/include
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtScript
${CMAKE_BINARY_DIR}/privateinclude/QtScript
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/api
${CMAKE_CURRENT_SOURCE_DIR}/bridge
${CMAKE_CURRENT_SOURCE_DIR}/parser
${CMAKE_CURRENT_BINARY_DIR}/api
${CMAKE_CURRENT_BINARY_DIR}/bridge
${CMAKE_CURRENT_BINARY_DIR}/parser
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/parser
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/bytecompiler
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/debugger
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/runtime
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/wtf
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/wtf/unicode
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/unicode
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/interpreter
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/API
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/bytecode
${CMAKE_SOURCE_DIR}/src/3rdparty/javascriptcore/generated
${PCRE_INCLUDES}
)
katie_generate_misc("${SCRIPT_HEADERS}" QtScript)
katie_generate_public("${SCRIPT_PUBLIC_HEADERS}" QtScript)
katie_generate_package(KtScript "KtCore")

2
src/scripttools/CMakeLists.txt
View file

@ -19,8 +19,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtScript
${CMAKE_BINARY_DIR}/include/QtScriptTools
${CMAKE_BINARY_DIR}/privateinclude/QtScriptTools
${CMAKE_CURRENT_SOURCE_DIR}/debugging
${CMAKE_CURRENT_BINARY_DIR}/debugging
)
set(SCRIPTTOOLS_HEADERS

11
src/sql/CMakeLists.txt
View file

@ -40,17 +40,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtSql
${CMAKE_BINARY_DIR}/privateinclude/QtSql
${CMAKE_CURRENT_SOURCE_DIR}/kernel
${CMAKE_CURRENT_SOURCE_DIR}/drivers
${CMAKE_CURRENT_SOURCE_DIR}/models
${CMAKE_CURRENT_BINARY_DIR}/kernel
${CMAKE_CURRENT_BINARY_DIR}/drivers
${CMAKE_CURRENT_BINARY_DIR}/models
${CMAKE_CURRENT_BINARY_DIR}/drivers/ibase
${CMAKE_CURRENT_BINARY_DIR}/drivers/mysql
${CMAKE_CURRENT_BINARY_DIR}/drivers/odbc
${CMAKE_CURRENT_BINARY_DIR}/drivers/psql
${CMAKE_CURRENT_BINARY_DIR}/drivers/sqlite
)
katie_generate_misc("${SQL_HEADERS}" QtSql)

3
src/svg/CMakeLists.txt
View file

@ -50,9 +50,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtGui
${CMAKE_BINARY_DIR}/include/QtSvg
${CMAKE_BINARY_DIR}/privateinclude/QtSvg
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core/tools
${CMAKE_SOURCE_DIR}/src/gui/painting
${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src
${ZLIB_INCLUDE_DIRS}
)

10
src/test/CMakeLists.txt
View file

@ -103,7 +103,8 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtTest
${CMAKE_BINARY_DIR}/privateinclude/QtTest
${CMAKE_CURRENT_SOURCE_DIR}
# for fftw and valgrind
${CMAKE_SOURCE_DIR}/src
)
katie_generate_misc("${TEST_HEADERS}" QtTest)
@ -111,6 +112,13 @@ katie_generate_public("${TEST_PUBLIC_HEADERS}" QtTest)
katie_generate_package(KtTest "KtCore")
katie_setup_target(KtTest ${TEST_SOURCES} ${TEST_HEADERS})
# for 3rd party source
if(HAVE_SYS_TIME_H)
add_definitions(-DTIME_WITH_SYS_TIME=1 -DHAVE_SYS_TIME_H)
else()
add_definitions(-DTIME_WITH_SYS_TIME=0)
endif()
add_library(KtTest ${KATIE_TYPE} ${KtTest_SOURCES})
target_link_libraries(KtTest ${EXTRA_TEST_LIBS})
set_target_properties(KtTest PROPERTIES

4
src/tools/CMakeLists.txt
View file

@ -1,3 +1,7 @@
add_definitions(
-DKATIE_TOOLS_SUFFIX="${KATIE_TOOLS_SUFFIX}"
)
# semi-bootstraped
add_subdirectory(moc)

2
src/tools/uic/CMakeLists.txt
View file

@ -10,6 +10,8 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cpp
# for class_lib_map.h
${CMAKE_SOURCE_DIR}/src/shared
)
set(UIC_SOURCES

2
src/tools/uic/cpp/cppwriteincludes.cpp
View file

@ -62,7 +62,7 @@ struct ClassInfoEntry
const char *header;
};
#include "shared/qclass_lib_map.h"
#include "qclass_lib_map.h"
namespace CPP {

1
src/uitools/CMakeLists.txt
View file

@ -47,7 +47,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtScript
${CMAKE_BINARY_DIR}/include/QtUiTools
${CMAKE_BINARY_DIR}/privateinclude/QtUiTools
${CMAKE_CURRENT_SOURCE_DIR}
# for widgets.table
${CMAKE_SOURCE_DIR}/src/shared
)

3
src/xml/CMakeLists.txt
View file

@ -59,9 +59,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtCore
${CMAKE_BINARY_DIR}/include/QtXml
${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_CURRENT_SOURCE_DIR}/dom
${CMAKE_CURRENT_SOURCE_DIR}/kernel
${CMAKE_CURRENT_SOURCE_DIR}/sax
)
set(XML_HEADERS