File 0004-Use-system-ftgl-lib-if-available.patch of Package tulip

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-Use-system-ftgl-lib-if-available.patch of Package tulip (Revision ccdc6026360fb24d026e4960ab0f2261)

Currently displaying revision ccdc6026360fb24d026e4960ab0f2261 , Show latest

From e19a244d5e147c078d7a4f188c7502a0db96d7b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Tue, 11 Nov 2014 10:15:54 +0100
Subject: [PATCH 4/5] Use system ftgl lib if available

* Find system ftgl

* libftgl: set FTGL_LIBRARIES to libftgl.so
  otherwise cmake uses full path and complains with
    $<TARGET_PROPERTY:/usr/lib64/libftgl.so,INTERFACE_SOURCES>
    Target name not supported.

* thirdparty: don't build local ftgl
---
 CMakeLists.txt            | 10 ++++++++--
 cmake/FindFTGL.cmake      | 23 +++++++++++++----------
 thirdparty/CMakeLists.txt |  1 -
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6406436015b8..5e42cff6c5eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -652,8 +652,14 @@ IF(NOT TULIP_BUILD_CORE_ONLY)
     SET(QuazipLibrary quazip-tulip-${TulipMMVersion})
   ENDIF(QUAZIP_FOUND)
 
-  SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/)
-  SET(FTGLLibrary ftgl-tulip-${TulipMMVersion})
+  IF(SYSTEM_FTGL)
+    FIND_PACKAGE(FTGL)  
+    SET(FTGLInclude ${FTGL_INCLUDE_DIR})
+    SET(FTGLLibrary ${FTGL_LIBRARIES})
+  ELSE()
+    SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/)
+    SET(FTGLLibrary ftgl-tulip-${TulipMMVersion})
+  ENDIF()
   SET(Tess2Include ${PROJECT_SOURCE_DIR}/thirdparty/libtess2/Include)
   SET(Tess2Library tess2-tulip-${TulipMMVersion})
 ENDIF(NOT TULIP_BUILD_CORE_ONLY)
diff --git a/cmake/FindFTGL.cmake b/cmake/FindFTGL.cmake
index 613c659341bf..0a3d104ac9f2 100644
--- a/cmake/FindFTGL.cmake
+++ b/cmake/FindFTGL.cmake
@@ -45,15 +45,16 @@
 # Once done this will define
 #
 # FTGL_FOUND          - system has ftgl
-# FTGL_INCLUDE_DIR    - path to FTGL/FTGL.h
+# FTGL_INCLUDE_DIR    - path to ftgl.h
 # FTGL_LIBRARIES      - the library that must be included
 #
 #
 
 
-FIND_PATH(FTGL_INCLUDE_DIR FTGL/FTGL.h
+FIND_PATH(FTGL_INCLUDE_DIR ftgl.h
        ${ADDITIONAL_INCLUDE_PATH}
       /usr/include
+      /usr/include/FTGL
       /usr/X11/include
       /usr/X11R6/include
       ${VISUS_INCLUDE}  
@@ -61,14 +62,16 @@ FIND_PATH(FTGL_INCLUDE_DIR FTGL/FTGL.h
 
 IF (NOT WIN32)
 
-FIND_FILE(FTGL_LIBRARIES libftgl.a  
-       ${ADDITIONAL_LIBRARY_PATH}
-      /usr/lib
-      /usr/X11/lib
-      /usr/X11R6/lib
-      /sw/lib
-      ${VISUS_LIBRARIES}  
-)
+SET(FTGL_LIBRARIES "libftgl.so")
+#FIND_LIBRARY(FTGL_LIBRARIES libftgl.so
+#       ${ADDITIONAL_LIBRARY_PATH}
+#      /usr/lib64
+#      /usr/lib
+#      /usr/X11/lib
+#      /usr/X11R6/lib
+#      /sw/lib
+#      ${VISUS_LIBRARIES}  
+#)
 
 ELSE (NOT WIN32)
 
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 6e6005c89797..4f0403dd2b8f 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -19,7 +19,6 @@ IF(NOT YAJL_FOUND)
 ENDIF(NOT YAJL_FOUND)
 
 IF(NOT TULIP_BUILD_CORE_ONLY)
-  ADD_SUBDIRECTORY(ftgl)
   ADD_SUBDIRECTORY(libtess2)
   IF(NOT QUAZIP_FOUND)
     MESSAGE(STATUS "Quazip library was not found on the system, the version located in thirdparty will be compiled and used instead.")
-- 
2.15.0

Places

File 0004-Use-system-ftgl-lib-if-available.patch of Package tulip (Revision ccdc6026360fb24d026e4960ab0f2261)

Places