File tulip-system-ftgl.patch of Package tulip

Overview Repositories Revisions Requests Users Attributes Meta

File tulip-system-ftgl.patch of Package tulip

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -238,11 +238,13 @@ SET(GZStreamInclude ${PROJECT_SOURCE_DIR
 SET(GZStreamLibrary gzstream)
 SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF)
 SET(OGDFLibrary OGDF)
-IF(UBUNTU_PPA_BUILD)
+IF(SYSTEM_FTGL)
   FIND_PACKAGE(FTGL)  
   SET(FTGLInclude ${FTGL_INCLUDE_DIR})
+  SET(FTGLLibrary ${FTGL_LIBRARY})
 ELSE()
   SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/)
+  SET(FTGLLibrary ftgl)
 ENDIF()
 
 SET(TulipInclude ${PROJECT_SOURCE_DIR}/library/tulip/include/)
Index: FindFTGL.cmake
===================================================================
--- FindFTGL.cmake.orig
+++ FindFTGL.cmake
@@ -135,4 +135,6 @@ IF(NOT FTGL_FOUND)
     MESSAGE(STATUS "${FTGL_DIR_MESSAGE}")
   ELSE(NOT FTGL_FIND_QUIETLY)
   ENDIF(FTGL_FIND_REQUIRED)
+ELSE(NOT FTGL_FOUND)
+  MESSAGE(STATUS "Found FTGL: ${FTGL_LIBRARY}")
 ENDIF(NOT FTGL_FOUND)
Index: library/tulip-ogl/src/CMakeLists.txt
===================================================================
--- library/tulip-ogl/src/CMakeLists.txt.orig
+++ library/tulip-ogl/src/CMakeLists.txt
@@ -87,7 +87,7 @@ IF(ENABLE_RENDERING_TIME_DISPLAY)
 ENDIF(ENABLE_RENDERING_TIME_DISPLAY)
 
 ADD_LIBRARY (${LibTulipOglName} SHARED ${tulip-ogl_LIB_SRCS})
-TARGET_LINK_LIBRARIES(${LibTulipOglName} ftgl)
+TARGET_LINK_LIBRARIES(${LibTulipOglName} ${FTGLLibrary})
 TARGET_LINK_LIBRARIES(${LibTulipOglName} ${GLEW_LIBRARY})
 TARGET_LINK_LIBRARIES(${LibTulipOglName} ${LibTulipName})
 TARGET_LINK_LIBRARIES(${LibTulipOglName} ${OPENGL_glu_LIBRARY})
Index: library/tulip/include/tulip/SimpleVector.h
===================================================================
--- library/tulip/include/tulip/SimpleVector.h.orig
+++ library/tulip/include/tulip/SimpleVector.h
@@ -21,6 +21,8 @@
 #ifndef _SIMPLE_VECTOR_H_
 #define _SIMPLE_VECTOR_H_
 
+#include <stdlib.h>
+
 namespace tlp {
 
 // SimpleVector
Index: thirdparty/CMakeLists.txt
===================================================================
--- thirdparty/CMakeLists.txt.orig
+++ thirdparty/CMakeLists.txt
@@ -1,7 +1,7 @@
 ADD_SUBDIRECTORY(gzstream)
 ADD_SUBDIRECTORY(OGDF)
 
-IF(NOT UBUNTU_PPA_BUILD)
+IF(NOT SYSTEM_FTGL)
 ADD_SUBDIRECTORY(ftgl)
 ENDIF()

Places

File tulip-system-ftgl.patch of Package tulip

Places