diff options
39 files changed, 267 insertions, 37 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4075ed75a..b04a984f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,22 +227,25 @@ option( BUILD_EXAMPLE_DCLOCK "Build example dclock" ${BUILD_EXAMPLE_ set( TQT_CONFIG "full" CACHE STRING "Predefined set of tqt interanl options, one of: minimal|small|medium|large|full" ) set( WITH_UNSUPORTED_CONFIG OFF CACHE BOOL "Build TQt regardles some unsupported option configuration" ) - mark_as_advanced( TQT_CONFIG WITH_UNSUPORTED_CONFIG ) +set( TQT_PLATFORM "local" CACHE STRING "Use qplatformdefs.h from \"mkspec/\${TQT_PLATFORM}\"" ) + +# NOTE: a special TQT_PLATFORM=value of "local" will cause generation of a `qplatformdefs.h` based +# on current cmake build settings. If the generated file is not fit for your platform, please +# fill in a bug. You may still workaround it specifying concrete TQT_PLATFORM value. ##### configure checks include( ConfigureChecks.cmake ) include( config.tests/unix/endian/ConfigureChecks.cmake ) # test: little/big endian -include( config.tests/unix/largefile/ConfigureChecks.cmake ) # test: large lifes +include( config.tests/unix/largefile/ConfigureChecks.cmake ) # test: large files include( config.tests/unix/stl/ConfigureChecks.cmake ) # test: stl supported include( config.tests/unix/ipv6/ConfigureChecks.cmake ) # test: IPv6 network ###### global compiler settings - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) @@ -258,9 +261,25 @@ tde_conditional_add_subdirectory( BUILD_TUTORIAL tutorial ) tde_conditional_add_subdirectory( BUILD_EXAMPLE examples ) tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations ) +if( TQT_PLATFORM STREQUAL "local" ) + add_subdirectory( mkspecs/local ) +endif() + ##### write configure files configure_file( src/tools/qconfig.cpp.cmake src/tools/qconfig.cpp @ONLY ) configure_file( include/ntqconfig.h.cmake include/ntqconfig.h @ONLY ) configure_file( include/ntqmodules.h.cmake include/ntqmodules.h @ONLY ) + + +##### install mkspecs + +if( BUILD_TQMAKE ) + install( + DIRECTORY ${CMAKE_SOURCE_DIR}/mkspecs + DESTINATION "${QT_INSTALL_DATA}" + PATTERN "mkspecs/local/*" EXCLUDE + ) + tde_install_symlink( "${TQT_PLATFORM}" "${QT_INSTALL_DATA}/mkspecs/default" ) +endif( BUILD_TQMAKE ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e3c039b7d..1579bc24b 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -38,6 +38,17 @@ foreach( _mod KERNEL TOOLS WIDGETS DIALOGS STYLES ) endif( ) endforeach( ) +if( NOT EXISTS "${CMAKE_SOURCE_DIR}/mkspecs/${TQT_PLATFORM}" ) + tde_message_fatal( "mkspecs/${TQT_PLATFORM} for TQT_PLATFORM=${TQT_PLATFORM} does not exists." ) +elseif( NOT TQT_PLATFORM STREQUAL "local" AND + NOT EXISTS "${CMAKE_SOURCE_DIR}/mkspecs/${TQT_PLATFORM}/qplatformdefs.h" ) + tde_message_fatal( "qplatformdefs.h is missing from mkspecs/${TQT_PLATFORM}" ) +endif() + +if( NOT UNIX ) + tqt_expert_config("Non-unix system") +endif() + ##### check for fontconfig pkg_search_module( LIBFONTCONFIG fontconfig ) @@ -282,6 +293,15 @@ check_include_file( "unistd.h" Q_OS_UNIX ) #probabl check_include_file( "sys/mman.h" Q_OS_LINUX ) #probably not needed +##### setup include dirs + +if( TQT_PLATFORM STREQUAL "local" ) + set( TQT_PLATFORM_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/mkspecs/local" ) + else() + set( TQT_PLATFORM_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/mkspecs/${TQT_PLATFORM}" ) +endif() + + ##### variables to generate <ntqconfig.h> (include folder) set( _TQT_CONFIG_STRING "${TQT_CONFIG}-config" ) diff --git a/mkspecs/local/CMakeLists.txt b/mkspecs/local/CMakeLists.txt new file mode 100644 index 000000000..57549ff98 --- /dev/null +++ b/mkspecs/local/CMakeLists.txt @@ -0,0 +1,65 @@ +macro(type_to_varname _type _varname) + string( TOUPPER "${_type}" ${_varname} ) + string( REPLACE " " "_" "${${_varname}}" ${_varname} ) + string( REPLACE "*" "P" "${${_varname}}" ${_varname} ) +endmacro( type_to_varname ) + +# A helper macro to determin the type used as socklen_t +macro( check_socklen_t_type _var ) + foreach( _type ${ARGN}) + type_to_varname( "HAVE_${_type}_AS_SOCKLEN_T" _type_var) + check_cxx_source_compiles( + "#include <sys/types.h> + #include <sys/socket.h> + int main(){ + ${_type} len; + getpeername(0,0,&len); + }" + ${_type_var} + ) + if( ${_type_var} ) + set( ${_var} ${_type} CACHE INTERNAL "A socklen_t type" ) + break() + endif() + endforeach() +endmacro( check_socklen_t_type ) + +if( UNIX ) + + check_symbol_exists( SIG_IGN "signal.h" HAVE_SIG_IGN ) + if( NOT HAVE_SIG_IGN ) + tde_message_fatal( "Systems without SIG_IGN definition are not supported" ) + endif() + + # Check which type we should use as socklen_t + check_socklen_t_type( QT_SOCKLEN_T socklen_t size_t int ) + if( NOT QT_SOCKLEN_T ) + tde_message_fatal( "Failed to determin typy used as socklen_t" ) + endif() + + check_symbol_exists( snprintf "stdio.h" QT_SNPRINTF ) + check_symbol_exists( vsnprintf "stdarg.h;stdio.h" QT_VSNPRINTF ) + + tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "Xext" ) + check_symbol_exists( XShmCreateImage "X11/Xlib.h;X11/extensions/XShm.h" QT_MITSHM ) + tde_restore( CMAKE_REQUIRED_LIBRARIES ) + + configure_file( qplatformdefs_unix.h.cmake qplatformdefs.h @ONLY ) +else() + tde_message_fatal( + "Unsupported platform" + "Currently tqt cmake supports autoconfiguration only for unix platforms." + "Use -DTQT_PLATFORM=platform to specify specify another platform." + ) +endif() + +configure_file( qmake.conf.cmake qmake.conf @ONLY ) + +if( BUILD_TQMAKE ) + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/qplatformdefs.h + ${CMAKE_CURRENT_BINARY_DIR}/qmake.conf + DESTINATION "${QT_INSTALL_DATA}/mkspecs/local/" + ) +endif( BUILD_TQMAKE ) diff --git a/mkspecs/local/qmake.conf.cmake b/mkspecs/local/qmake.conf.cmake new file mode 100644 index 000000000..b40951502 --- /dev/null +++ b/mkspecs/local/qmake.conf.cmake @@ -0,0 +1,90 @@ +# +# +# qmake configuration for local system generated by cmake + +# FIXME: This file is WIP <2024-03-09 Fat-Zer> # + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt warn_on release incremental link_prl +QMAKE_INCREMENTAL_STYLE = sublib + +QMAKE_CC = @CMAKE_C_COMPILER@ +QMAKE_LEX = @FLEX_EXECUTABLE@ +QMAKE_LEXFLAGS = +QMAKE_YACC = @BISON_EXECUTABLE@ +QMAKE_YACCFLAGS = @BISON_FLAGS@ +# QMAKE_YACCFLAGS_MANGLE = -p $base -b $base +# QMAKE_YACC_HEADER = $base.tab.h +# QMAKE_YACC_SOURCE = $base.tab.c +QMAKE_CFLAGS = @CMAKE_C_FLAGS@ +# QMAKE_CFLAGS_DEP = -M +# QMAKE_CFLAGS_WARN_ON = -Wall -W +# QMAKE_CFLAGS_WARN_OFF = -w +QMAKE_CFLAGS_RELEASE = @CMAKE_C_FLAGS_RELEASE@ +QMAKE_CFLAGS_DEBUG = @CMAKE_C_FLAGS_DEBUG@ +# QMAKE_CFLAGS_SHLIB = -fPIC +# QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +# QMAKE_CFLAGS_THREAD = -D_REENTRANT + +QMAKE_CXX = @CMAKE_CXX_COMPILER@ +QMAKE_CXXFLAGS = @CMAKE_CXX_FLAGS@ +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE = @CMAKE_CXX_FLAGS_RELEASE@ +QMAKE_CXXFLAGS_DEBUG = @CMAKE_CXX_FLAGS_DEBUG@ +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +# QMAKE_INCDIR_X11 = /usr/X11R6/include +# QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/@SYSTEM_LIBDIR@ +# QMAKE_INCDIR_OPENG = /usr/X11R6/include +# QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 + +QMAKE_LINK = @CMAKE_LINKER@ +QMAKE_LINK_SHLIB = g++ +# QMAKE_LFLAGS = -luuid +# QMAKE_LFLAGS_RELEASE = +# QMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_SHLIB = @CMAKE_SHARED_LINKER_FLAGS@ +# QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB +# QMAKE_LFLAGS_SONAME = -Wl,-soname, +# QMAKE_LFLAGS_THREAD = +# QMAKE_RPATH = -Wl,-rpath, + +# QMAKE_LIBS = -luuid +# QMAKE_LIBS_DYNLOAD = -ldl +# QMAKE_LIBS_X11 = -lXext -lX11 -lm +# QMAKE_LIBS_X11SM = -lSM -lICE +# QMAKE_LIBS_NIS = -lnsl +# QMAKE_LIBS_QT = -lqt +# QMAKE_LIBS_QT_THREAD = -ltqt-mt +# QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu +# QMAKE_LIBS_OPENGL_QT = -lGL -lXmu +# QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic + +QMAKE_AR = ar cqs +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = strip +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/local/qplatformdefs_unix.h.cmake b/mkspecs/local/qplatformdefs_unix.h.cmake new file mode 100644 index 000000000..598847dbf --- /dev/null +++ b/mkspecs/local/qplatformdefs_unix.h.cmake @@ -0,0 +1,60 @@ +#ifndef TQPLATFORMDEFS_H +#define TQPLATFORMDEFS_H + +// Get TQt defines/settings + +#include "ntqglobal.h" + +// This will make gcc much happier with our code +#if defined(__gnu_linux__) && !defined(_DEFAULT_SOURCE) +# define _DEFAULT_SOURCE +#endif + +#include <unistd.h> + + +// We are hot - unistd.h should have turned on the specific APIs we requested + + +#ifdef TQT_THREAD_SUPPORT +#include <pthread.h> +#endif + +#include <dirent.h> +#include <fcntl.h> +#include <grp.h> +#include <pwd.h> +#include <signal.h> +#include <dlfcn.h> + +#include <sys/types.h> +#include <sys/ioctl.h> +#include <sys/ipc.h> +#include <sys/time.h> +#include <sys/shm.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <sys/wait.h> + +// DNS header files are not fully covered by X/Open specifications. +// In particular nothing is said about res_* :/ +// Header files <netinet/in.h> and <arpa/nameser.h> are not included +// by <resolv.h> on older versions of the GNU C library. Note that +// <arpa/nameser.h> must be included before <resolv.h>. +#include <netinet/in.h> +#include <arpa/nameser.h> +#include <resolv.h> + + +#define QT_SIGNAL_RETTYPE void +#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_IGNORE SIG_IGN + +#cmakedefine QT_SOCKLEN_T @QT_SOCKLEN_T@ + +#cmakedefine QT_SNPRINTF ::snprintf +#cmakedefine QT_VSNPRINTF ::vsnprintf + +#cmakedefine QT_MITSHM + +#endif // TQPLATFORMDEFS_H diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index c4ebd483d..35e2cfc59 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -8,7 +8,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/qmake/generators/unix ${CMAKE_SOURCE_DIR}/qmake/generators/win32 ${CMAKE_SOURCE_DIR}/qmake/generators/mac - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ) diff --git a/qmake/generators/win32/CMakeLists.txt b/qmake/generators/win32/CMakeLists.txt index fdb010716..6dafcf642 100644 --- a/qmake/generators/win32/CMakeLists.txt +++ b/qmake/generators/win32/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/qmake ${CMAKE_SOURCE_DIR}/qmake/generators - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/include ) diff --git a/src/codecs/CMakeLists.txt b/src/codecs/CMakeLists.txt index b200b3167..677dd1f26 100644 --- a/src/codecs/CMakeLists.txt +++ b/src/codecs/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/include ) diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt index 0e85ffa38..ab1a9ac5c 100644 --- a/src/dialogs/CMakeLists.txt +++ b/src/dialogs/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${TIRPC_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${CUPS_INCLUDE_DIR} diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 4876ae41f..faca1dfa1 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/3rdparty/opentype ${NAS_INCLUDE_DIRS} diff --git a/src/moc/CMakeLists.txt b/src/moc/CMakeLists.txt index fc649d84a..606f04c15 100644 --- a/src/moc/CMakeLists.txt +++ b/src/moc/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/include ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index b56019d4d..ec7589a6f 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/tools ) diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 1ab02176d..c146f2779 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${OPENGL_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH} ${X11_Xutil_INCLUDE_PATH} diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 2b81806fd..1987afeaf 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/sql/drivers/cache ${PostgreSQL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} diff --git a/src/styles/CMakeLists.txt b/src/styles/CMakeLists.txt index e4efa3d10..784f29aeb 100644 --- a/src/styles/CMakeLists.txt +++ b/src/styles/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/include - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_SOURCE_DIR}/src/kernel ) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 7cb02c111..c14a0a03c 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index f78efe72e..0a976b478 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/include ) diff --git a/tools/assistant/CMakeLists.txt b/tools/assistant/CMakeLists.txt index 860273f1d..509fb6f46 100644 --- a/tools/assistant/CMakeLists.txt +++ b/tools/assistant/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/assistant/lib/CMakeLists.txt b/tools/assistant/lib/CMakeLists.txt index 90746eb57..1c62d980b 100644 --- a/tools/assistant/lib/CMakeLists.txt +++ b/tools/assistant/lib/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/designer/app/CMakeLists.txt b/tools/designer/app/CMakeLists.txt index 119622e35..d9def2523 100644 --- a/tools/designer/app/CMakeLists.txt +++ b/tools/designer/app/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../designer - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 + ${TQT_PLATFORM_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/designer/designer/CMakeLists.txt b/tools/designer/designer/CMakeLists.txt index c9ac4d242..22efc91d3 100644 --- a/tools/designer/designer/CMakeLists.txt +++ b/tools/designer/designer/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/designer/editor/CMakeLists.txt b/tools/designer/editor/CMakeLists.txt index 9d4070d6a..1bcd8261a 100644 --- a/tools/designer/editor/CMakeLists.txt +++ b/tools/designer/editor/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/designer/tools/tqtconv2ui/CMakeLists.txt b/tools/designer/tools/tqtconv2ui/CMakeLists.txt index a2d1e15aa..b01d41ff3 100644 --- a/tools/designer/tools/tqtconv2ui/CMakeLists.txt +++ b/tools/designer/tools/tqtconv2ui/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/designer/tools/tqtcreatecw/CMakeLists.txt b/tools/designer/tools/tqtcreatecw/CMakeLists.txt index 14b2f2971..534ec9fe6 100644 --- a/tools/designer/tools/tqtcreatecw/CMakeLists.txt +++ b/tools/designer/tools/tqtcreatecw/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/designer/uic/CMakeLists.txt b/tools/designer/uic/CMakeLists.txt index c4580808a..c26c9aeeb 100644 --- a/tools/designer/uic/CMakeLists.txt +++ b/tools/designer/uic/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/designer/uilib/CMakeLists.txt b/tools/designer/uilib/CMakeLists.txt index 28a2ce528..b2669f769 100644 --- a/tools/designer/uilib/CMakeLists.txt +++ b/tools/designer/uilib/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/linguist/linguist/CMakeLists.txt b/tools/linguist/linguist/CMakeLists.txt index 9940f3901..1abb30465 100644 --- a/tools/linguist/linguist/CMakeLists.txt +++ b/tools/linguist/linguist/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/linguist/lrelease/CMakeLists.txt b/tools/linguist/lrelease/CMakeLists.txt index c7084f173..f96c899e5 100644 --- a/tools/linguist/lrelease/CMakeLists.txt +++ b/tools/linguist/lrelease/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/linguist/lupdate/CMakeLists.txt b/tools/linguist/lupdate/CMakeLists.txt index cb3769f1a..e5654605b 100644 --- a/tools/linguist/lupdate/CMakeLists.txt +++ b/tools/linguist/lupdate/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/linguist/tqm2ts/CMakeLists.txt b/tools/linguist/tqm2ts/CMakeLists.txt index ad4988b9b..35f5df49b 100644 --- a/tools/linguist/tqm2ts/CMakeLists.txt +++ b/tools/linguist/tqm2ts/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/linguist/tutorial/tt1/CMakeLists.txt b/tools/linguist/tutorial/tt1/CMakeLists.txt index 3f6c2feff..0c176100f 100644 --- a/tools/linguist/tutorial/tt1/CMakeLists.txt +++ b/tools/linguist/tutorial/tt1/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/linguist/tutorial/tt2/CMakeLists.txt b/tools/linguist/tutorial/tt2/CMakeLists.txt index c2373fd49..618ff250d 100644 --- a/tools/linguist/tutorial/tt2/CMakeLists.txt +++ b/tools/linguist/tutorial/tt2/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/linguist/tutorial/tt3/CMakeLists.txt b/tools/linguist/tutorial/tt3/CMakeLists.txt index 1d0eafebc..9150207ef 100644 --- a/tools/linguist/tutorial/tt3/CMakeLists.txt +++ b/tools/linguist/tutorial/tt3/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${ZLIB_INCLUDE_DIRS} ) diff --git a/tools/maketqpf/CMakeLists.txt b/tools/maketqpf/CMakeLists.txt index 60b175b8a..a5f0c024d 100644 --- a/tools/maketqpf/CMakeLists.txt +++ b/tools/maketqpf/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ) diff --git a/tools/msg2tqm/CMakeLists.txt b/tools/msg2tqm/CMakeLists.txt index a33958a0e..12db4cb4c 100644 --- a/tools/msg2tqm/CMakeLists.txt +++ b/tools/msg2tqm/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories( - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ) diff --git a/tools/qembed/CMakeLists.txt b/tools/qembed/CMakeLists.txt index 55a47f75b..2a0844b6e 100644 --- a/tools/qembed/CMakeLists.txt +++ b/tools/qembed/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories( - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ) diff --git a/tools/qtconfig/CMakeLists.txt b/tools/qtconfig/CMakeLists.txt index 6c4e95d92..7a304469a 100644 --- a/tools/qtconfig/CMakeLists.txt +++ b/tools/qtconfig/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ) diff --git a/tools/tqtmergetr/CMakeLists.txt b/tools/tqtmergetr/CMakeLists.txt index 2dce428b4..aa78eac77 100644 --- a/tools/tqtmergetr/CMakeLists.txt +++ b/tools/tqtmergetr/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories( - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ) diff --git a/tools/tqvfb/CMakeLists.txt b/tools/tqvfb/CMakeLists.txt index 2e8d7f1bb..0cdc44048 100644 --- a/tools/tqvfb/CMakeLists.txt +++ b/tools/tqvfb/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64 ${CMAKE_BINARY_DIR}/include ${PNG_INCLUDE_DIRS} ) |