If you are using GitLab outside of the ILL, then you will need to use HTTPS and not SSH for clone/push/pull operations. SSH will work normally if you are using the VPN.

Commit 86c91862 authored by Tobias WEBER's avatar Tobias WEBER

prebuild fix

parent 2cd80a3e
......@@ -132,6 +132,10 @@ if("${QT_UIC_EXECUTABLE}" STREQUAL "")
get_target_property(QT_UIC_EXECUTABLE Qt5::uic IMPORTED_LOCATION)
endif()
#if("${QT_QCOLLECTIONGENERATOR_EXECUTABLE}" STREQUAL "")
# get_target_property(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt5::qcollectiongenerator IMPORTED_LOCATION)
#endif()
message("Project source dir: ${PROJECT_SOURCE_DIR}")
message("CMake source dir: ${CMAKE_SOURCE_DIR}")
......
......@@ -9,16 +9,19 @@
if [[ $# -ge 3 ]]; then
UIC="$1"
MOC="$2"
COLGEN="$(dirname $2)/qcollectiongenerator-qt5"
TAKINROOT="$3"
FORCE=0
else
UIC="$(which uic-qt5)"
MOC="$(which moc-qt5)"
COLGEN="$(which qcollectiongenerator-qt5)"
if [ $? -ne 0 ]; then
UIC="$(which uic)"
MOC="$(which moc)"
COLGEN="$(which qcollectiongenerator)"
fi
TAKINROOT=.
......@@ -31,7 +34,7 @@ if [ -z "$UIC" ] || [ -z "${MOC}" ]; then
exit -1;
fi
echo -e "Using UIC: ${UIC}\nUsing MOC: ${MOC}"
echo -e "Using UIC: ${UIC}\nUsing MOC: ${MOC}\nUsing collection generator: ${COLGEN}"
echo -e "Takin root dir: ${TAKINROOT}\n"
......@@ -123,7 +126,7 @@ echo -e "\n"
echo -e "--------------------------------------------------------------------------------"
echo -e "building docs..."
qcollectiongenerator ${TAKINROOT}/doc/takin.qhcp -o ${TAKINROOT}/doc/takin.qhc
${COLGEN} ${TAKINROOT}/doc/takin.qhcp -o ${TAKINROOT}/doc/takin.qhc
cp -v ${TAKINROOT}/doc/takin.qhc ${TAKINROOT}/res/doc/
cp -v ${TAKINROOT}/doc/takin.qch ${TAKINROOT}/res/doc/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment