Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/psi-im/psi

  • Loading branch information...
wadealer committed Jun 12, 2017
2 parents e1889b2 + 2bc41a3 commit 54986bc0da29a21e9ccd5c6ca6ad90827ec2c058
@@ -81,18 +81,22 @@ if(WIN32)
set(LIBGCRYPT_SDK "libgcrypt")
set(LIBGPGERROR_SDK "libgpg-error")
endif()
set(QCA_DIR "${SDK_PATH}/qca/${SDK_SUFFIX}/" CACHE STRING "Path to QCA")
set(IDN_ROOT "${SDK_PATH}/libidn/${SDK_SUFFIX}/" CACHE STRING "Path to IDN library")
set(HUNSPELL_ROOT "${SDK_PATH}/hunspell/${SDK_SUFFIX}/" CACHE STRING "Path to hunspell library")
set(LIBGCRYPT_ROOT "${SDK_PATH}/${LIBGCRYPT_SDK}/${SDK_SUFFIX}/" CACHE STRING "Path to libgcrypt library")
set(LIBGPGERROR_ROOT "${SDK_PATH}/${LIBGPGERROR_SDK}/${SDK_SUFFIX}/" CACHE STRING "Path to libgpg-error library")
set(LIBOTR_ROOT "${SDK_PATH}/libotr/${SDK_SUFFIX}/" CACHE STRING "Path to libotr library")
set(LIBTIDY_ROOT "${SDK_PATH}/libtidy/${SDK_SUFFIX}/" CACHE STRING "Path to libtidy library")
set(QJSON_ROOT "${SDK_PATH}/qjson/${SDK_SUFFIX}" CACHE STRING "Path to qjson library")
set(ZLIB_ROOT "${SDK_PATH}/zlib/${SDK_SUFFIX}/" CACHE STRING "Path to zlib")
set(QJDNS_DIR "${SDK_PATH}/qjdns/${SDK_SUFFIX}/" CACHE STRING "Path to qjdns")
set(GST_SDK "${SDK_PATH}/gstbundle/${SDK_SUFFIX}/" CACHE STRING "Path to gstreamer SDK")
set(PSIMEDIA_DIR "${SDK_PATH}/psimedia/${SDK_SUFFIX}/" CACHE STRING "Path to psimedia plugin")
if(EXISTS "${SDK_PATH}")
set(QCA_DIR "${SDK_PATH}/qca/${SDK_SUFFIX}/" CACHE STRING "Path to QCA")
set(IDN_ROOT "${SDK_PATH}/libidn/${SDK_SUFFIX}/" CACHE STRING "Path to IDN library")
set(HUNSPELL_ROOT "${SDK_PATH}/hunspell/${SDK_SUFFIX}/" CACHE STRING "Path to hunspell library")
set(LIBGCRYPT_ROOT "${SDK_PATH}/${LIBGCRYPT_SDK}/${SDK_SUFFIX}/" CACHE STRING "Path to libgcrypt library")
set(LIBGPGERROR_ROOT "${SDK_PATH}/${LIBGPGERROR_SDK}/${SDK_SUFFIX}/" CACHE STRING "Path to libgpg-error library")
set(LIBOTR_ROOT "${SDK_PATH}/libotr/${SDK_SUFFIX}/" CACHE STRING "Path to libotr library")
set(LIBTIDY_ROOT "${SDK_PATH}/libtidy/${SDK_SUFFIX}/" CACHE STRING "Path to libtidy library")
set(QJSON_ROOT "${SDK_PATH}/qjson/${SDK_SUFFIX}" CACHE STRING "Path to qjson library")
set(ZLIB_ROOT "${SDK_PATH}/zlib/${SDK_SUFFIX}/" CACHE STRING "Path to zlib")
set(QJDNS_DIR "${SDK_PATH}/qjdns/${SDK_SUFFIX}/" CACHE STRING "Path to qjdns")
set(GST_SDK "${SDK_PATH}/gstbundle/${SDK_SUFFIX}/" CACHE STRING "Path to gstreamer SDK")
set(PSIMEDIA_DIR "${SDK_PATH}/psimedia/${SDK_SUFFIX}/" CACHE STRING "Path to psimedia plugin")
else()
message(WARNING "Psi SDK not found at ${SDK_PATH}. Please set SDK_PATH variable or add Psi dependencies to PATH system environmet variable")
endif()
set(PLUGINS_PATH "/plugins" CACHE STRING "Install suffix for plugins")
endif()

@@ -101,32 +105,48 @@ if(EXISTS "${VER_FILE}")
message(STATUS "Found Psi version file: ${VER_FILE}")
file(STRINGS "${VER_FILE}" VER_LINES)
if(IS_PSIPLUS)
string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" VER_LINE_A ${VER_LINES})
string(REGEX MATCH "Psi:[a-fA-F0-9]+" PSI_REV ${VER_LINES})
string(REGEX MATCH "Psi\\+:[a-fA-F0-9]+" PSI_PLUS_REV ${VER_LINES})
if(PSI_REV)
string(REPLACE "Psi:" "" PSI_REV_NUM ${PSI_REV})
endif()
if(PSI_PLUS_REV)
string(REPLACE "Psi+:" "" PSI_PLUS_REV_NUM ${PSI_PLUS_REV})
string(REGEX MATCHALL "^([0-9]+\\.[0-9]+\\.[0-9]+)+.+Psi:([a-fA-F0-9]+)+.+Psi\\+:([a-fA-F0-9]+)+" VER_LINE_A ${VER_LINES})
if(${CMAKE_MATCH_COUNT} EQUAL 3)
if(CMAKE_MATCH_1)
set(APP_VERSION ${CMAKE_MATCH_1})
endif()
if(CMAKE_MATCH_2)
set(PSI_REVISION ${CMAKE_MATCH_2})
endif()
if(CMAKE_MATCH_3)
set(PSI_PLUS_REVISION ${CMAKE_MATCH_3})
endif()
else() #psi-plus-snapshots compatibility
string(REGEX MATCHALL "^([0-9]+\\.[0-9]+\\.[0-9]+)+\\.([a-fA-F0-9]+)+\\.([a-fA-F0-9]+)+" VER_LINE_B ${VER_LINES})
if(${CMAKE_MATCH_COUNT} EQUAL 3)
if(CMAKE_MATCH_1)
set(APP_VERSION ${CMAKE_MATCH_1})
endif()
if(CMAKE_MATCH_2)
set(PSI_PLUS_REVISION ${CMAKE_MATCH_2})
endif()
if(CMAKE_MATCH_3)
set(PSI_REVISION ${CMAKE_MATCH_3})
endif()
endif()
endif()
if(VER_LINE_A)
set(APP_VERSION ${VER_LINE_A})
message(STATUS "Psi version is: ${APP_VERSION}")
if(APP_VERSION)
message(STATUS "Psi version found: ${APP_VERSION}")
elseif(NOT APP_VERSION AND (NOT PSI_VERSION) )
message(WARNING "Psi+ version not found! 1.0-dev version will be set")
set(APP_VERSION "1.0")
endif()
if(PSI_REV_NUM)
set(PSI_REVISION ${PSI_REV_NUM})
message(STATUS "Psi revision: ${PSI_REVISION}")
if(PSI_REVISION)
message(STATUS "Psi revision found: ${PSI_REVISION}")
endif()
if(PSI_PLUS_REV_NUM)
set(PSI_PLUS_REVISION ${PSI_PLUS_REV_NUM})
message(STATUS "Psi+ revision: ${PSI_PLUS_REVISION}")
if(PSI_PLUS_REVISION)
message(STATUS "Psi+ revision found: ${PSI_PLUS_REVISION}")
endif()
else()
string(REGEX MATCH "^[0-9]+\\.[0-9]+" VER_LINE ${VER_LINES})
if (VER_LINE)
set(APP_VERSION ${VER_LINE})
message(STATUS "Psi version is: ${VER_LINE}")
message(STATUS "Psi version found: ${VER_LINE}")
endif()
endif()
endif()
@@ -171,6 +191,16 @@ else()
endif()
endif()

message(STATUS "CXX flags: ${CMAKE_CXX_FLAGS}")
message(STATUS "C flags: ${CMAKE_C_FLAGS}")

if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
message(STATUS "CXX debug flags: ${CMAKE_CXX_FLAGS_DEBUG}")
message(STATUS "C debug flags: ${CMAKE_C_FLAGS_DEBUG}")
endif()

if(USE_QT5)
option( QT4_BUILD "Build with Qt4 support" OFF )
else()
@@ -25,6 +25,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

if (QJDns_INCLUDE_DIR AND QJDns_LIBRARY)
# in cache already
set(QJDns_FIND_QUIETLY TRUE)
@@ -43,6 +44,10 @@ set ( LIBINCS
qjdns.h
)

if(NOT QJDns_SUFFIX)
set( QJDns_SUFFIX "")
endif()

find_path(
QJDns_INCLUDE_DIR ${LIBINCS}
HINTS
@@ -52,13 +57,13 @@ find_path(
PATH_SUFFIXES
""
if( NOT WIN32 )
jdns
endif( NOT WIN32 )
jdns
endif( NOT WIN32 )
)

find_library(
QJDns_LIBRARY
NAMES qjdns
NAMES qjdns qjdns${QJDns_SUFFIX}
HINTS
${PC_QJDns_LIBDIR}
${PC_QJDns_LIBRARY_DIRS}
@@ -78,4 +83,3 @@ if ( QJDns_FOUND )
endif ( QJDns_FOUND )

mark_as_advanced( QJDns_INCLUDE_DIR QJDns_LIBRARY )

This file was deleted.

@@ -34,17 +34,30 @@ set ( LIBINCS
qca.h
)

if(NOT Qca_SUFFIX)
set(Qca_SUFFIX "")
endif()

if("${Qca_SUFFIX}" STREQUAL "-qt5")
set(EXTRA_PATH_SUFFIXES
qt5/Qca-qt5/QtCrypto
Qca-qt5/QtCrypto
qt5/QtCrypto
)
endif()

find_path(
Qca_INCLUDE_DIR ${LIBINCS}
HINTS
${QCA_DIR}/include
PATH_SUFFIXES
QtCrypto
${EXTRA_PATH_SUFFIXES}
)

find_library(
Qca_LIBRARY
NAMES qca
NAMES qca${Qca_SUFFIX}
HINTS
${QCA_DIR}/lib
${QCA_DIR}/bin
@@ -41,7 +41,7 @@ Dependency options:
support
--disable-qdbus Disable use of QDBUS
--enable-webkit Enable use of webkit
--with-webkit=[type] type of webkit QWebkit/QtWebEngine
--with-webkit=[type] type of webkit QtWebKit/QtWebEngine
--disable-growl Disable use of Growl
--with-growl=[path] Path to the Growl framework
--enable-whiteboarding Enable use of White Board support
@@ -1351,7 +1351,7 @@ public:
/*
-----BEGIN QCMOD-----
name: webkit
arg: with-webkit=[type],type of webkit QWebkit/QtWebEngine
arg: with-webkit=[type],type of webkit QtWebKit/QtWebEngine
-----END QCMOD-----
*/
@@ -1374,11 +1374,11 @@ public:
QStringList tryList;
QString wt = conf->getenv("QC_WITH_WEBKIT").toLower();
if (wt.isEmpty() || !(wt == "qwebkit" || wt == "qtwebengine")) {
if (wt.isEmpty() || !(wt == "qtwebkit" || wt == "qtwebengine")) {
#if QT_VERSION >= QT_VERSION_CHECK(5,7,0)
tryList << "qtwebengine" << "qwebkit";
tryList << "qtwebengine" << "qtwebkit";
#else
tryList << "qwebkit";
tryList << "qtwebkit";
#endif
} else {
#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
@@ -1396,7 +1396,7 @@ public:
webkitType = "QtWebEngine";
qt = "webenginewidgets webchannel";
} else {
webkitType = "QWebKit";
webkitType = "QtWebKit";
qt = "webkit";
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
qt += " webkitwidgets";
BIN +6 Bytes (100%) configure.exe
Binary file not shown.
@@ -327,11 +327,6 @@ QLineEdit#le_status_text {
<use-highlighting type="bool">true</use-highlighting><use-nick-coloring type="bool">true</use-nick-coloring><use-hash-nick-coloring type="bool">true</use-hash-nick-coloring><colored-history type="bool">true</colored-history>
<allow-highlight-events type="bool">false</allow-highlight-events>
</muc>
<show-deprecated comment="Deprecated functionality or protocols">
<service-discovery comment="Service discovery dialog">
<protocol-selector comment="Show the iq:browse and iq:agents service discovery protocol selector." type="bool">false</protocol-selector>
</service-discovery>
</show-deprecated>
<spell-check comment="Options related to the spell checker">
<enabled comment="Whether the spell checker is enabled" type="bool">true</enabled>
<langs type="QString"></langs>
@@ -7,8 +7,6 @@ set(CMAKE_AUTOMOC OFF)
if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
set(D "d")
add_definitions(-DALLOW_QT_PLUGINS_DIR)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 ${EXTRA_FLAG}")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 ${EXTRA_FLAG}")
endif()

set( LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
@@ -70,9 +68,7 @@ if(USE_QT5)

set(QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE})
set(QT_LIBRARIES Qt5::Widgets Qt5::Core Qt5::Network Qt5::Xml ${WEBKIT_LIBS} Qt5::Concurrent Qt5::Multimedia Qt5::Svg ${SQL_LIBS})
find_package( Qca-qt5 REQUIRED )
set(QCA_INCLUDES ${Qca-qt5_INCLUDE_DIR})
set(qca_LIB ${Qca-qt5_LIBRARY})
set(Qca_SUFFIX -qt5)
if(LINUX)
list(APPEND QT_LIBRARIES Qt5::DBus Qt5::X11Extras ${LIBXCB_LIBRARIES})
endif()
@@ -101,9 +97,9 @@ else()
unset(QT_EXTRA_MODULES)

include(${QT_USE_FILE})
find_package( Qca REQUIRED )
set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
set(qca_LIB ${Qca_LIBRARY})
#find_package( Qca REQUIRED )
#set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
#set(qca_LIB ${Qca_LIBRARY})
if(ENABLE_SQL)
find_package(QJSON REQUIRED)
set(EXTRA_LIBS
@@ -117,6 +113,8 @@ else()
endif()
endif()

find_package( Qca REQUIRED )

if(LINUX)
find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR})
@@ -165,7 +163,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_SOURCE_DIR}
${QCA_INCLUDES}
${Qca_INCLUDE_DIR}
)

if( BUNDLED_IRIS )
@@ -191,14 +189,14 @@ endif()
if(ENABLE_SQL)
set( PSI_VER_SUFFIX "${PSI_VER_SUFFIX}, sql" )
endif()
#set(PSI_PLUS_VERSION "${APP_VERSION}" CACHE STRING "Version string of Psi")
if( NOT PSI_VERSION AND ( NOT IS_PSIPLUS ) )
set(PSI_VERSION "${APP_VERSION}-dev \(${PSI_COMPILATION_DATE}${PSI_VER_SUFFIX}\)")
endif()
if( NOT PSI_VERSION AND ( PSI_REVISION AND PSI_PLUS_REVISION ) )

if( IS_PSIPLUS AND ( NOT PSI_VERSION AND ( PSI_REVISION AND PSI_PLUS_REVISION ) ) )
set(PSI_VERSION "${APP_VERSION} \(${PSI_COMPILATION_DATE}, Psi:${PSI_REVISION}, Psi+:${PSI_PLUS_REVISION}${PSI_VER_SUFFIX}\)")
message(STATUS "Psi+ version set: ${PSI_VERSION}")
elseif( NOT IS_PSIPLUS AND ( NOT PSI_VERSION AND APP_VERSION ) )
set(PSI_VERSION "${APP_VERSION}-dev \(${PSI_COMPILATION_DATE}${PSI_VER_SUFFIX}\)")
message(STATUS "Psi version set: ${PSI_VERSION}")
endif()
message(STATUS "Compilation date: ${PSI_COMPILATION_DATE}")

#add_definitions(-DPSI_VERSION=${PSI_VERSION})

@@ -382,7 +380,7 @@ target_link_libraries(${PROJECT_NAME}
${X11_LIBRARIES}
${EXTRA_LIBS}
iris
${qca_LIB}
${Qca_LIBRARY}
)
target_link_libraries(${PROJECT_NAME}
options

0 comments on commit 54986bc

Please sign in to comment.
You can’t perform that action at this time.