cmake: Enable building with TQT_THREAD_SUPPORT at global level.

To build tqmake and tmoc, TQT_THREAD_SUPPORT is turned off.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

ConfigureChecks.cmake

@@ -238,7 +238,7 @@ endif()
 
 find_package( Threads )
 if( Threads_FOUND )
-    set( THREAD_SUPPORT TQT_THREAD_SUPPORT )
+    add_definitions( -DTQT_THREAD_SUPPORT )
 endif()
 
 

qmake/CMakeLists.txt

@@ -14,6 +14,23 @@ include_directories(
 
 link_directories()
 
+remove_definitions( -DTQT_THREAD_SUPPORT )
+
+
+##### tqmake-kernel (static)
+
+set( target tqmake-kernel )
+set( _SRC_ ${CMAKE_SOURCE_DIR}/src/kernel/qurl.cpp )
+
+tde_add_library( ${target} STATIC_PIC
+
+  SOURCES
+        ${_SRC_}
+
+  DEPENDENCIES
+    tqt-includes
+)
+
 
 ##### tqmake (executable)
 

qmake/generators/win32/CMakeLists.txt

@@ -4,11 +4,64 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/qmake
   ${CMAKE_SOURCE_DIR}/qmake/generators
+  ${CMAKE_SOURCE_DIR}/mkspecs/linux-g++-64
   ${CMAKE_BINARY_DIR}/include
 )
 
 link_directories()
 
+remove_definitions( -DTQT_THREAD_SUPPORT )
+
+
+##### tqmake-tools (static)
+
+set( target tqmake-tools )
+set( _SRC_ ${CMAKE_SOURCE_DIR}/src/tools/qstring.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qtextstream.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qiodevice.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qglobal.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgdict.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qcstring.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdatastream.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgarray.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qbuffer.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qglist.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qptrcollection.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfile.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfile_unix.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qregexp.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgvector.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgcache.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qbitarray.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdir.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/quuid.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfileinfo_unix.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdir_unix.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfileinfo.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdatetime.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qstringlist.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qmap.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qsettings.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qlocale.cpp
+           ${CMAKE_BINARY_DIR}/src/tools/qconfig.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qunicodetables.cpp
+)
+
+tde_add_library( tqmake-tools STATIC_PIC
+
+  SOURCES
+        ${_SRC_}
+  LINK_PRIVATE
+     ${_UUID_LIBRARIES}
+
+  DEPENDENCIES
+    tqt-includes
+)
+set_property( TARGET ${target}-static
+              APPEND PROPERTY COMPILE_DEFINITIONS
+              TQT_NO_TEXTCODEC TQT_NO_UNICODETABLES TQT_NO_COMPONENT TQT_NO_STL TQT_NO_COMPRESS
+)
+
 
 ##### win32-generator (static)
 

src/codecs/CMakeLists.txt

@@ -9,29 +9,6 @@ include_directories(
 link_directories()
 
 
-if( BUILD_TMOC )
-##### tmoc-codecs (static)
-
-set( target tmoc-codecs )
-set( _SRC_ qtextcodec.cpp
-           qutfcodec.cpp
-)
-
-tde_add_library( ${target} STATIC_PIC
-
-  SOURCES
-        ${_SRC_}
-
-  DEPENDENCIES
-    tqt-includes
-)
-set_property( TARGET ${target}-static
-              APPEND PROPERTY COMPILE_DEFINITIONS
-              QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT TQT_NO_STL TQT_NO_COMPRESS
-)
-endif()
-
-
 if( BUILD_LIB_TQT )
 ##### codecs (static)
 

src/kernel/CMakeLists.txt

@@ -29,23 +29,6 @@ include_directories(
 link_directories()
 
 
-if( BUILD_TQMAKE )
-##### tqmake-kernel (static)
-
-set( target tqmake-kernel )
-set( _SRC_ qurl.cpp )
-
-tde_add_library( ${target} STATIC_PIC
-
-  SOURCES
-        ${_SRC_}
-
-  DEPENDENCIES
-    tqt-includes
-)
-endif()
-
-
 ##### kernel (static)
 
 set( target kernel )

src/moc/CMakeLists.txt

@@ -8,8 +8,77 @@ include_directories(
 
 link_directories()
 
+remove_definitions( -DTQT_THREAD_SUPPORT )
+
 
 if( BUILD_TMOC )
+
+##### tmoc-tools (static)
+
+set( target tmoc-tools )
+set( _SRC_ ${CMAKE_SOURCE_DIR}/src/tools/qbuffer.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qptrcollection.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qcstring.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdatastream.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdatetime.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfile.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdir.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfileinfo.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgarray.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgdict.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qglist.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qglobal.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgvector.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qiodevice.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qregexp.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qstring.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qlocale.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qunicodetables.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qstringlist.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qtextstream.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qbitarray.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qmap.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qgcache.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfile_unix.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qdir_unix.cpp
+           ${CMAKE_SOURCE_DIR}/src/tools/qfileinfo_unix.cpp
+)
+
+tde_add_library( ${target} STATIC_PIC
+
+  SOURCES
+        ${_SRC_}
+
+  DEPENDENCIES
+    tqt-includes
+)
+set_property( TARGET ${target}-static
+              APPEND PROPERTY COMPILE_DEFINITIONS
+              QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT TQT_NO_STL TQT_NO_COMPRESS
+)
+
+
+##### tmoc-codecs (static)
+
+set( target tmoc-codecs )
+set( _SRC_ ${CMAKE_SOURCE_DIR}/src/codecs/qtextcodec.cpp
+           ${CMAKE_SOURCE_DIR}/src/codecs/qutfcodec.cpp
+)
+
+tde_add_library( ${target} STATIC_PIC
+
+  SOURCES
+        ${_SRC_}
+
+  DEPENDENCIES
+    tqt-includes
+)
+set_property( TARGET ${target}-static
+              APPEND PROPERTY COMPILE_DEFINITIONS
+              QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT TQT_NO_STL TQT_NO_COMPRESS
+)
+
+
 ##### tmoc (executable)
 
 set( target tmoc )

src/tools/CMakeLists.txt

@@ -10,105 +10,6 @@ include_directories(
 link_directories()
 
 
-if( BUILD_TQMAKE )
-##### tqmake-tools (static)
-
-set( target tqmake-tools )
-set( _SRC_ qstring.cpp
-           qtextstream.cpp
-           qiodevice.cpp
-           qglobal.cpp
-           qgdict.cpp
-           qcstring.cpp
-           qdatastream.cpp
-           qgarray.cpp
-           qbuffer.cpp
-           qglist.cpp
-           qptrcollection.cpp
-           qfile.cpp
-           qfile_unix.cpp
-           qregexp.cpp
-           qgvector.cpp
-           qgcache.cpp
-           qbitarray.cpp
-           qdir.cpp
-           quuid.cpp
-           qfileinfo_unix.cpp
-           qdir_unix.cpp
-           qfileinfo.cpp
-           qdatetime.cpp
-           qstringlist.cpp
-           qmap.cpp
-           qsettings.cpp
-           qlocale.cpp
-           ${CMAKE_BINARY_DIR}/src/tools/qconfig.cpp
-           qunicodetables.cpp
-)
-
-tde_add_library( tqmake-tools STATIC_PIC
-
-  SOURCES
-        ${_SRC_}
-  LINK
-     ${_UUID_LIBRARIES}
-
-  DEPENDENCIES
-    tqt-includes
-)
-set_property( TARGET ${target}-static
-              APPEND PROPERTY COMPILE_DEFINITIONS
-              TQT_NO_TEXTCODEC TQT_NO_UNICODETABLES TQT_NO_COMPONENT TQT_NO_STL TQT_NO_COMPRESS
-)
-endif( BUILD_TQMAKE )
-
-
-if( BUILD_TMOC )
-##### tmoc-tools (static)
-
-set( target tmoc-tools )
-set( _SRC_ qbuffer.cpp
-           qptrcollection.cpp
-           qcstring.cpp
-           qdatastream.cpp
-           qdatetime.cpp
-           qfile.cpp
-           qdir.cpp
-           qfileinfo.cpp
-           qgarray.cpp
-           qgdict.cpp
-           qglist.cpp
-           qglobal.cpp
-           qgvector.cpp
-           qiodevice.cpp
-           qregexp.cpp
-           qstring.cpp
-           qlocale.cpp
-           qunicodetables.cpp
-           qstringlist.cpp
-           qtextstream.cpp
-           qbitarray.cpp
-           qmap.cpp
-           qgcache.cpp
-           qfile_unix.cpp
-           qdir_unix.cpp
-           qfileinfo_unix.cpp
-)
-
-tde_add_library( ${target} STATIC_PIC
-
-  SOURCES
-        ${_SRC_}
-
-  DEPENDENCIES
-    tqt-includes
-)
-set_property( TARGET ${target}-static
-              APPEND PROPERTY COMPILE_DEFINITIONS
-              QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT TQT_NO_STL TQT_NO_COMPRESS 
-)
-endif()
-
-
 if( BUILD_LIB_TQT )
 ##### tools (static)