1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
Description: Update CMake's build files to exclude the dirs and files that we exclude from upstream's source code.
Author: James Turton <james@somecomputer.xyz>
Last-Update: 2020-04-10
Forwarded: no
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -332,20 +333,19 @@ ENDIF(TULIP_BUILD_PYTHON_COMPONENTS)
## ========================================================
## Include and library paths
## ========================================================
-SET(GZStreamInclude ${PROJECT_SOURCE_DIR}/thirdparty/gzstream/)
SET(GZStreamLibrary gzstream)
IF(NOT TULIP_BUILD_CORE_ONLY AND NOT TRAVIS_BUILD_THIRDPARTY_ONLY)
SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/)
SET(FTGLLibrary ftgl)
- ADD_COMPILE_DEFINITIONS(FTGL_LIBRARY_STATIC)
+ #ADD_COMPILE_DEFINITIONS(FTGL_LIBRARY_STATIC)
SET(Tess2Include ${PROJECT_SOURCE_DIR}/thirdparty/libtess2/Include)
SET(Tess2Library tess2)
- ADD_COMPILE_DEFINITIONS(TESS2_LIBRARY_STATIC)
+ #ADD_COMPILE_DEFINITIONS(TESS2_LIBRARY_STATIC)
ENDIF(NOT TULIP_BUILD_CORE_ONLY AND NOT TRAVIS_BUILD_THIRDPARTY_ONLY)
SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF/include)
SET(OGDFBuildInclude ${PROJECT_BINARY_DIR}/thirdparty/OGDF/include)
SET(OGDFLibrary OGDF)
#utf8-cpp
find_package(utf8cpp QUIET)
@@ -557,8 +555,6 @@ IF (NOT TRAVIS_BUILD_THIRDPARTY_ONLY)
IF(NOT TULIP_BUILD_CORE_ONLY)
- ADD_SUBDIRECTORY(bundlers)
-
IF(MSVC)
INCLUDE(InstallRequiredSystemLibraries)
IF(OPENMP_FOUND)
@@ -648,10 +643,6 @@ IF (NOT TRAVIS_BUILD_THIRDPARTY_ONLY)
ENDIF(APPLE)
- IF(LINUX)
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/bundlers/linux/make_appimage_bundle.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/bundlers/linux/make_appimage_bundle.sh" @ONLY)
- ENDIF(LINUX)
-
ELSE(NOT TULIP_BUILD_CORE_ONLY)
IF(LINUX)
--- a/library/tulip-ogl/bitmaps/CMakeLists.txt
+++ b/library/tulip-ogl/bitmaps/CMakeLists.txt
@@ -18,7 +18,3 @@ INSTALL(FILES fontb.ttf
slashStripesTexture.png
DESTINATION ${TulipBitmapInstallDir}
COMPONENT tulip_ogl)
-
-INSTALL(DIRECTORY fonts
- COMPONENT tulip_ogl
- DESTINATION ${TulipBitmapInstallDir})
--- a/software/tulip/CMakeLists.txt
+++ b/software/tulip/CMakeLists.txt
@@ -73,7 +73,8 @@ ENDIF(WIN32)
ADD_EXECUTABLE(tulip ${SRCS} ${MOC_SRCS})
ENDIF(WIN32)
-TARGET_LINK_LIBRARIES(tulip crash_handling ${LibTulipCoreName} ${LibTulipOGLName} ${LibTulipGUIName} ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(tulip crash_handling ${LibTulipCoreName} ${LibTulipOGLName} ${LibTulipGUIName}
+ ${Tess2Library} ${QT_LIBRARIES})
INSTALL(TARGETS tulip
RUNTIME DESTINATION ${TulipBinInstallDir} COMPONENT tulip_app
--- a/plugins/perspective/GraphPerspective/CMakeLists.txt
+++ b/plugins/perspective/GraphPerspective/CMakeLists.txt
@@ -53,6 +53,6 @@ include/SearchWidget.h
ADD_LIBRARY(GraphPerspective-${Tulip_VERSION} SHARED ${LIB_SRCS} ${RCC_SRCS} ${UI_SRCS} ${MOC_SRCS})
TARGET_LINK_LIBRARIES(GraphPerspective-${Tulip_VERSION} ${LibTulipCoreName} ${LibTulipOGLName} ${LibTulipGUIName})
-TARGET_LINK_LIBRARIES(GraphPerspective-${Tulip_VERSION} ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(GraphPerspective-${Tulip_VERSION} ${Tess2Library} ${QT_LIBRARIES})
TULIP_INSTALL_PLUGIN(GraphPerspective-${Tulip_VERSION} ${TulipPerspectivePluginsInstallDir})
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -1,20 +1,11 @@
TULIP_DISABLE_COMPILER_WARNINGS()
ADD_CORE_FILES(CMakeLists.txt
- utf8-cpp/source/utf8.h
- utf8-cpp/source/utf8/checked.h
- utf8-cpp/source/utf8/core.h
- utf8-cpp/source/utf8/unchecked.h
- utf8-cpp/source/utf8/cpp11.h
- utf8-cpp/source/utf8/cpp17.h
)
-ADD_SUBDIRECTORY(gzstream)
ADD_SUBDIRECTORY(OGDF)
-ADD_SUBDIRECTORY(antlr)
ADD_SUBDIRECTORY(xdkbibtex)
IF(NOT TULIP_BUILD_CORE_ONLY AND NOT TRAVIS_BUILD_THIRDPARTY_ONLY)
- ADD_SUBDIRECTORY(ftgl)
ADD_SUBDIRECTORY(libtess2)
ENDIF(NOT TULIP_BUILD_CORE_ONLY AND NOT TRAVIS_BUILD_THIRDPARTY_ONLY)
|
