diff --git a/CMakeLists.txt b/CMakeLists.txt index ef0ee42..44546ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,7 +241,7 @@ if (USE_GUI) add_definitions(-DTCL -DOPENGL -DUSE_TOGL_2) include_directories(${TCL_INCLUDE_PATH}) include_directories(${TK_INCLUDE_PATH}) - set(LIBTOGL togl) + set(LIBTOGL togls CACHE PATH "togl library") if(WIN32) add_definitions(-DTOGL_WGL) diff --git a/ng/CMakeLists.txt b/ng/CMakeLists.txt index 75de5b1..f2bf8d1 100644 --- a/ng/CMakeLists.txt +++ b/ng/CMakeLists.txt @@ -78,6 +78,5 @@ if(USE_GUI) DESTINATION ${NG_INSTALL_DIR_BIN} COMPONENT netgen) endif() - add_subdirectory(Togl2.1) endif(USE_GUI) diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp index 220500c..07f258c 100644 --- a/ng/ngpkg.cpp +++ b/ng/ngpkg.cpp @@ -24,7 +24,7 @@ The interface between the GUI and the netgen library // to be sure to include the 'right' togl-version -#include "Togl2.1/togl.h" +#include #include "fonts.hpp" extern bool nodisplay;