TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

Browse Source
pull/16/head
Darrell Anderson 11 years ago
parent 8d46300c49 62ac96e110
commit a23b86dd87
28 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File

7
CMakeLists.txt
Unescape View File

@ -46,6 +46,8 @@ tde_setup_paths( )
tde_setup_architecture_flags( ) tde_setup_architecture_flags( )
find_package( TQt ) find_package( TQt )
list( APPEND TDECORE_LIBRARY_DIRS ${TQT_LIBRARY_DIRS} )
##### add apidox targets ############ ##### add apidox targets ############
@ -618,6 +620,7 @@ endif( WITH_XRANDR )
pkg_search_module( XRENDER xrender ) pkg_search_module( XRENDER xrender )
if( XRENDER_FOUND ) if( XRENDER_FOUND )
set( HAVE_XRENDER 1 ) set( HAVE_XRENDER 1 )
list( APPEND TDECORE_LIBRARY_DIRS ${XRENDER_LIBRARY_DIRS} )
else( XRENDER_FOUND) else( XRENDER_FOUND)
message(FATAL_ERROR "\nxrender support is required, but not found on your system" ) message(FATAL_ERROR "\nxrender support is required, but not found on your system" )
endif( XRENDER_FOUND ) endif( XRENDER_FOUND )
@ -713,6 +716,7 @@ if( WITH_LIBART )
message(FATAL_ERROR "\nlibart-2.0 support are requested, but not found on your system" ) message(FATAL_ERROR "\nlibart-2.0 support are requested, but not found on your system" )
endif( NOT LIBART_FOUND ) endif( NOT LIBART_FOUND )
set( HAVE_LIBART 1 ) set( HAVE_LIBART 1 )
list( APPEND TDECORE_LIBRARY_DIRS ${LIBART_LIBRARY_DIRS} )
endif( WITH_LIBART ) endif( WITH_LIBART )
@ -727,6 +731,7 @@ if( WITH_LIBIDN )
check_include_file( "idna.h" HAVE_IDNA_H ) check_include_file( "idna.h" HAVE_IDNA_H )
check_include_file( "punycode.h" HAVE_PUNYCODE_H ) check_include_file( "punycode.h" HAVE_PUNYCODE_H )
check_include_file( "stringprep.h" HAVE_STRINGPREP_H ) check_include_file( "stringprep.h" HAVE_STRINGPREP_H )
list( APPEND TDECORE_LIBRARY_DIRS ${LIBIDN_LIBRARY_DIRS} )
endif( WITH_LIBIDN ) endif( WITH_LIBIDN )
##### check for libbfq ########################## ##### check for libbfq ##########################
@ -865,6 +870,7 @@ if( DBUS_TQT_FOUND )
else() else()
tde_message_fatal( "dbus-1-tqt are required, but not found on your system" ) tde_message_fatal( "dbus-1-tqt are required, but not found on your system" )
endif( ) endif( )
list( APPEND TDECORE_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
if( WITH_NETWORK_MANAGER_BACKEND ) if( WITH_NETWORK_MANAGER_BACKEND )
@ -925,6 +931,7 @@ if( WITH_GAMIN )
pkg_search_module( GAMIN gamin ) pkg_search_module( GAMIN gamin )
if( GAMIN_FOUND ) if( GAMIN_FOUND )
set( HAVE_FAM 1 ) set( HAVE_FAM 1 )
list( APPEND TDECORE_LIBRARY_DIRS ${GAMIN_LIBRARY_DIRS} )
else( GAMIN_FOUND ) else( GAMIN_FOUND )
message(FATAL_ERROR "\nfam/gamin support was requested, but gamin was not found on your system" ) message(FATAL_ERROR "\nfam/gamin support was requested, but gamin was not found on your system" )
endif( GAMIN_FOUND ) endif( GAMIN_FOUND )

2
dnssd/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )
##### headers ################################### ##### headers ###################################

2
kded/CMakeLists.txt
Unescape View File

@ -23,7 +23,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
kimgio/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
kjs/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
${LIBPCRE_LIBDIR} ${LIBPCRE_LIBDIR}
) )

2
libtdemid/CMakeLists.txt
Unescape View File

@ -18,7 +18,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
libtdescreensaver/CMakeLists.txt
Unescape View File

@ -20,7 +20,7 @@ include_directories(
list( REMOVE_ITEM CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) list( REMOVE_ITEM CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

3
pics/CMakeLists.txt
Unescape View File

@ -27,8 +27,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
${LIBART_LIBRARY_DIRS}
) )

2
tdeabc/vcard/CMakeLists.txt
Unescape View File

@ -20,7 +20,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeconf_update/CMakeLists.txt
Unescape View File

@ -16,7 +16,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

5
tdecore/CMakeLists.txt
Unescape View File

@ -37,10 +37,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
${LIBIDN_LIBRARY_DIRS}
${GAMIN_LIBDIR}
${LIBART_LIBRARY_DIRS}
) )
##### headers ################################### ##### headers ###################################

2
tdecore/tdeconfig_compiler/CMakeLists.txt
Unescape View File

@ -16,7 +16,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeinit/CMakeLists.txt
Unescape View File

@ -25,7 +25,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeio/misc/CMakeLists.txt
Unescape View File

@ -39,7 +39,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeio/misc/tdentlm/CMakeLists.txt
Unescape View File

@ -18,7 +18,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeio/misc/tdesasl/CMakeLists.txt
Unescape View File

@ -17,7 +17,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeioslave/http/kcookiejar/CMakeLists.txt
Unescape View File

@ -21,7 +21,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdelfeditor/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
${LIBR_LIBDIR} ${LIBR_LIBDIR}
) )

2
tdestyles/highcontrast/config/CMakeLists.txt
Unescape View File

@ -18,7 +18,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdestyles/kthemestyle/CMakeLists.txt
Unescape View File

@ -22,7 +22,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdestyles/utils/installtheme/CMakeLists.txt
Unescape View File

@ -16,7 +16,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )
##### kinstalltheme ############################# ##### kinstalltheme #############################

2
tdesu/CMakeLists.txt
Unescape View File

@ -18,7 +18,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeui/CMakeLists.txt
Unescape View File

@ -32,7 +32,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeui/kdetrayproxy/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdeunittest/CMakeLists.txt
Unescape View File

@ -17,7 +17,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdewallet/backend/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdewallet/client/CMakeLists.txt
Unescape View File

@ -18,7 +18,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

2
tdewidgets/CMakeLists.txt
Unescape View File

@ -28,7 +28,7 @@ include_directories(
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TDECORE_LIBRARY_DIRS}
) )

Write Preview
Loading…
Cancel
Save