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 00784140 authored by Tobias WEBER's avatar Tobias WEBER

makelists update

parent 1ea95e65
......@@ -183,7 +183,8 @@ add_definitions(-DBOOST_MATH_FWD_HPP)
#add_definitions("${QtGui_DEFINITIONS}")
#add_definitions("${Qt5OpenGL_DEFINITIONS}")
include_directories("${PROJECT_SOURCE_DIR}" ".")
include_directories("${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/3rdparty")
include_directories("." "./3rdparty")
include_directories("${Boost_INCLUDE_DIRS}/..")
include_directories("${PNG_INCLUDE_DIRS}")
#include_directories("${JPEG_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS}")
......
find_path(Clipper_INCLUDE_DIRS
NAMES clipper.h
PATH_SUFFIXES clipper
HINTS /usr/local/include/clipper /usr/local/include /usr/include/clipper /usr/include /opt/local/include/clipper /opt/local/include
HINTS /usr/local/include /usr/include /opt/local/include
DOC "Clipper include directories"
)
......
find_path(Julia_INCLUDE_DIRS
NAMES julia.h
HINTS /usr/local/include /usr/local/include/julia /usr/include /usr/include/julia /opt/local/include /opt/local/include/julia
PATH_SUFFIXES julia
HINTS /usr/local/include /usr/include /opt/local/include
DOC "Julia include directories"
)
......
find_path(QWT_INCLUDE_DIRS
NAMES qwt.h
PATH_SUFFIXES qwt6-qt5 qwt-qt5 qwt6 qwt
PATH_SUFFIXES qwt6-qt5 qwt-qt5 qt5/qwt qt5/qwt/qwt qt5/qwt6 qt5 qwt6 qwt
HINTS /usr/local/include /usr/include /opt/local/include
DOC "Qwt include directories"
)
......
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