diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 20:11:47 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 20:11:47 -0500 |
commit | f166176868c4843bcaebb302094b21957c0e7611 (patch) | |
tree | 23ccf90414c3ef902acfe927d9091ba6ee146237 | |
parent | ecc461cfc7c0790fca7bc78b736ebd45b6d3d702 (diff) | |
parent | 664adfa61b4ab9664fc470fade4b7adf0ece7c7c (diff) | |
download | tdenetwork-f166176868c4843bcaebb302094b21957c0e7611.tar.gz tdenetwork-f166176868c4843bcaebb302094b21957c0e7611.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork
-rw-r--r-- | ConfigureChecks.cmake | 9 | ||||
m--------- | cmake | 0 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index ce92731a..d78e05db 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,6 +9,11 @@ # ################################################# +# required stuff +tde_setup_architecture_flags( ) +find_package( TQt ) +find_package( TDE ) + ##### check for gcc visibility support ######### # FIXME # This should check for [T]Qt3 visibility support @@ -27,10 +32,6 @@ if( BUILD_KOPETE OR BUILD_KPPP ) check_include_file( string.h HAVE_STRING_H ) endif( ) -# required stuff -find_package( TQt ) -find_package( TDE ) - if( WITH_SLP ) check_library_exists( slp "SLPOpen" "" HAVE_SLP ) if( HAVE_SLP ) diff --git a/cmake b/cmake -Subproject 08c6f54d6f80554caa671847417cf04326adb63 +Subproject 47d775518c382c77f663a70bb23fad93e681009 |