diff --git a/CMakeLists.txt b/CMakeLists.txt index a19ec507c..9d40b2c3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ check_taglib_filename( COMPLEX_TAGLIB_FILENAME ) # optional macro_optional_find_package(Jreen) -IF( ENABLE_JREEN AND NOT LIBJREEN_FOUND ) +IF( NOT LIBJREEN_FOUND ) ADD_SUBDIRECTORY( thirdparty/jreen ) SET( LIBJREEN_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include ) IF( UNIX AND NOT APPLE ) @@ -65,7 +65,7 @@ IF( ENABLE_JREEN AND NOT LIBJREEN_FOUND ) ENDIF( WIN32 ) SET( LIBJREEN_FOUND true ) MESSAGE(STATUS "Internal libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}") -ENDIF( ENABLE_JREEN AND NOT LIBJREEN_FOUND ) +ENDIF( NOT LIBJREEN_FOUND ) IF( WIN32 ) find_library(QTSPARKLE_LIBRARIES qtsparkle) diff --git a/src/sip/CMakeLists.txt b/src/sip/CMakeLists.txt index 82aa3ae97..3e547058a 100644 --- a/src/sip/CMakeLists.txt +++ b/src/sip/CMakeLists.txt @@ -1,10 +1,11 @@ # only build one of them, if ENABLE_JREEN is true, GLOOX_FOUND is automatically set to "false" -IF( GLOOX_FOUND ) +IF( GLOOX_FOUND AND NOT LIBJREEN_FOUND ) ADD_SUBDIRECTORY( jabber ) -ENDIF( GLOOX_FOUND ) -IF( ENABLE_JREEN ) +ENDIF( GLOOX_FOUND AND NOT LIBJREEN_FOUND ) + +IF( LIBJREEN_FOUND ) ADD_SUBDIRECTORY( jreen ) -ENDIF( ENABLE_JREEN) +ENDIF( LIBJREEN_FOUND ) ADD_SUBDIRECTORY( twitter ) ADD_SUBDIRECTORY( zeroconf )