Blob Blame History Raw
From eb36f922af0ae81ce0a1ce2f31d5cf1aecc15d72 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 2 May 2017 11:53:03 +0200
Subject: [PATCH 6/8] Unbundle togl

---
 CMakeLists.txt    | 2 +-
 ng/CMakeLists.txt | 1 -
 ng/ngpkg.cpp      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff4473a..005373a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,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 togl CACHE PATH "togl library")
 
     if(WIN32)
         add_definitions(-DTOGL_WGL)
diff --git a/ng/CMakeLists.txt b/ng/CMakeLists.txt
index 0f36f43..d98c802 100644
--- a/ng/CMakeLists.txt
+++ b/ng/CMakeLists.txt
@@ -42,7 +42,6 @@ if(USE_GUI)
       occgeom.tcl acisgeom.tcl netgen.ocf
       DESTINATION ${ng_install_dir_bin} COMPONENT netgen)
 
-  add_subdirectory(Togl2.1)
   install(FILES drawing.tcl DESTINATION ${ng_install_dir_bin} COMPONENT netgen)
 endif(USE_GUI)
 
diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp
index 76e2b1c..c1de086 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 <togl.h>
 #include "fonts.hpp"
 
 extern bool nodisplay;
-- 
2.12.2