Remove explicite linking to the threading library and some cleanup.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
gregory guy 3 years ago
parent 2727e3a3d8
commit 12c977220a
No known key found for this signature in database
GPG Key ID: 2CC84A1CC6823AF8

@ -89,7 +89,6 @@ set( TQT_CONFIG "full-config" CACHE STRING "Enable tqt fonctionalities" ) #choic
option( BUILD_ALL "Build all" ON )
option( BUILD_TQMAKE "Build the tqmake executable" ${BUILD_ALL} )
option( BUILD_TMOC "Build the tmoc executable" ON )
option( BUILD_LIB_TQT "Build the tqt library" ON )
option( BUILD_ACCESSIBILITY "Build with Accessibility support" ${BUILD_ALL} )

@ -9,7 +9,6 @@ include_directories(
link_directories()
if( BUILD_LIB_TQT )
##### codecs (static)
set( target codecs )
@ -49,4 +48,3 @@ tqt_automoc( ${target}-static )
list( APPEND qtlib_embed ${target}-static )
set( qtlib_embed ${qtlib_embed} PARENT_SCOPE )
endif()

@ -164,7 +164,6 @@ tde_add_library( ${target} STATIC_PIC
${JPEG_LIBRARIES}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${LIBFONTCONFIG_LIBRARIES}
${GLIB2_LIBRARIES}
@ -179,7 +178,7 @@ set( qtlib_embed ${qtlib_embed} PARENT_SCOPE )
set_property( TARGET ${target}-static
APPEND PROPERTY COMPILE_DEFINITIONS
${NO_SOUND} ${NAS_SUPPORT} ${THREAD_SUPPORT} ${USE_GLIBMAINLOOP}
${NO_SOUND} ${NAS_SUPPORT} ${USE_GLIBMAINLOOP}
${NO_XFTFREETYPE} ${USE_XFT2_HEADER} ${NO_SHAPE} ${TABLET_SUPPORT}
${NO_XINERAMA} ${NO_XRANDR} ${NO_XRENDER} ${NO_XSYNC}
${NO_XKB} ${NO_SM} ${NO_XCURSOR} ${NO_IMAGEIO_MNG}

@ -10,7 +10,6 @@ include_directories(
link_directories()
if( BUILD_LIB_TQT )
##### tools (static)
set( target tools )
@ -63,19 +62,14 @@ tde_add_library( ${target} STATIC_PIC
${_SRC_}
LINK
${_UUID_LIBRARIES}
dl
${dl_LIBRARIES}
DEPENDENCIES
tqt-includes
)
set_property( TARGET ${target}-static
APPEND PROPERTY COMPILE_DEFINITIONS
TQT_THREAD_SUPPORT
)
tqt_automoc( ${target}-static )
list( APPEND qtlib_embed ${target}-static )
set( qtlib_embed ${qtlib_embed} PARENT_SCOPE )
endif()

Loading…
Cancel
Save