mirror of
https://github.com/romixlab/qmsgpack.git
synced 2025-08-01 03:14:27 +02:00
Merge branch 'master' of https://github.com/romixlab/qmsgpack
This commit is contained in:
@@ -62,6 +62,18 @@ Add options before ``..`` as follow:
|
||||
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=True ..
|
||||
|
||||
Custom Qt installation
|
||||
""""""""""""""""""""""
|
||||
|
||||
If you installed Qt with online installer, cmake will most likely not find it, in this case try adding following lines to CMakeLists.txt:
|
||||
|
||||
.. code-block:: cmake
|
||||
|
||||
set(Qt5Core_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Core")
|
||||
set(Qt5Test_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Test")
|
||||
set(Qt5_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Core")
|
||||
set(QT_QMAKE_EXECUTABLE "/opt/Qt5.6.0/5.6/gcc_64/bin/qmake")
|
||||
|
||||
qmake
|
||||
^^^^^
|
||||
|
||||
|
@@ -59,15 +59,15 @@ endif
|
||||
## -- Rsync Deploy config -- ##
|
||||
# Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
|
||||
ifndef SSH_USER
|
||||
SSH_USER = roman@vds.marsworks.ru
|
||||
SSH_USER = nginx@mars
|
||||
endif
|
||||
|
||||
ifndef SSH_PORT
|
||||
SSH_PORT = 22
|
||||
SSH_PORT = 7722
|
||||
endif
|
||||
|
||||
ifndef DOCUMENT_ROOT
|
||||
DOCUMENT_ROOT = /var/www/roman/data/www/msgpack.marsworks.ru/
|
||||
DOCUMENT_ROOT = /var/www/msgpack.marsworks.ru/
|
||||
endif
|
||||
|
||||
#If you choose to delete on sync, rsync will create a 1:1 match
|
||||
|
Reference in New Issue
Block a user