OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0032323: Configuration - drop unused dependency from Xmu

Browse Source 
Removed unused header Aspect_XWD.hxx.
Removed redundant includes of unused X11 extension headers.
Added missing dependency on pthread to TKDraw.

Added "-z defs" linker flag to qmake projects to detect missing library dependencies.
Removed unused CSF_MotifLibs.
This commit is contained in:
kgv 2021-04-23 13:02:08 +03:00 committed by bugmaster
parent 376d374d1f
commit 342bb7fd4d
11 changed files with 12 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adm/cmake/occt_csf.cmake
View File

@ -110,8 +110,8 @@ else()
set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB})
OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
elseif (USE_XLIB)
set (CSF_OpenGlLibs GL)
set (CSF_XwLibs "X11 Xext Xmu Xi")
set (CSF_OpenGlLibs "GL")
set (CSF_XwLibs "X11")
else()
find_library (OpenGlLibs_LIB NAMES OpenGL)
set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
@ -130,7 +130,7 @@ else()
set (CSF_ThreadLibs "pthread rt stdc++")
if (USE_XLIB)
set (CSF_OpenGlLibs "GL")
set (CSF_XwLibs "X11 Xext Xmu Xi")
set (CSF_XwLibs "X11")
else()
set (CSF_OpenGlLibs "GL EGL")
endif()

2
adm/cmake/occt_toolkit.cmake
View File

@ -359,7 +359,7 @@ endforeach()
if (APPLE)
list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
if (NOT ${IS_X11_FOUND} EQUAL -1)
find_package (X11 COMPONENTS X11 Xext Xmu Xi)
find_package (X11 COMPONENTS X11)
if (NOT X11_FOUND)
message (STATUS "Warning: X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
endif()

3
adm/genproj.tcl
View File

@ -1530,8 +1530,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
set aLibsMap(CSF_TclTkLibs) "tk8.6"
}
if { "$::HAVE_XLIB" == "true" } {
set aLibsMap(CSF_XwLibs) "X11 Xext Xmu Xi"
set aLibsMap(CSF_MotifLibs) "X11"
set aLibsMap(CSF_XwLibs) "X11"
}
}
}

3
adm/qmake/OccCppConfig.pri
View File

@ -43,6 +43,9 @@ win32 {
QMAKE_CXXFLAGS += -fexceptions
QMAKE_CXXFLAGS += -fvisibility=default
DEFINES += OCC_CONVERT_SIGNALS
gcc {
QMAKE_LFLAGS += -Wl,-z,defs
}
mac {
iphoneos {
QMAKE_IOS_DEPLOYMENT_TARGET = 8.0

3
adm/qmake/OccToolkit.pri
View File

@ -63,8 +63,7 @@ win32 {
CSF_TclTkLibs = -ltk8.6
HAVE_XLIB {
CSF_OpenGlLibs = -lGL
CSF_XwLibs = -lX11 -lXext -lXmu -lXi
CSF_MotifLibs = -lX11
CSF_XwLibs = -lX11
} else {
CSF_OpenGlLibs = -lGL -lEGL
}

4
dox/build/build_3rdparty/building_3rdparty.md vendored
View File

@ -272,7 +272,7 @@ There are two types of third-party products, which are necessary to build OCCT:
All 3rd-party products required for building of OCCT could be installed
from official repositories. You may install them from console using apt-get utility:
sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libfreeimage-dev rapidjson-dev
sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libx11-dev libgl1-mesa-dev libfreeimage-dev rapidjson-dev
Building is possible with C++ compliant compiler:
@ -624,4 +624,4 @@ in *FREEIMAGE_SRC_DIR* by the corrected file, which you can find in attachment t
5. Clean temporary files
make clean
make clean

1
src/Aspect/Aspect_DisplayConnection.cxx
View File

@ -19,7 +19,6 @@
#if defined(HAVE_XLIB)
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#endif
IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection,Standard_Transient)

93
src/Aspect/Aspect_XWD.hxx
View File

@ -1,93 +0,0 @@
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef __Aspect_WNTXWD_HXX
# define __Aspect_WNTXWD_HXX
#if !defined(_WIN32) && (!defined(__APPLE__) || defined(HAVE_XLIB)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
# include <X11/XWDFile.h>
# else
# ifdef WORD64
# define B32 :32
# else
# define B32
# endif /* WORD64 */
# define XWD_FILE_VERSION 7
# define XYBitmap 0
# define XYPixmap 1
# define ZPixmap 2
# define LSBFirst 0
# define MSBFirst 1
# define DoRed ( 1 << 0 )
# define DoGreen ( 1 << 1 )
# define DoBlue ( 1 << 2 )
# define StaticGray 0
# define GrayScale 1
# define StaticColor 2
# define PseudoColor 3
# define TrueColor 4
# define DirectColor 5
typedef unsigned int CARD32;
typedef struct _xwd_file_header {
CARD32 header_size B32;
CARD32 file_version B32;
CARD32 pixmap_format B32;
CARD32 pixmap_depth B32;
CARD32 pixmap_width B32;
CARD32 pixmap_height B32;
CARD32 xoffset B32;
CARD32 byte_order B32;
CARD32 bitmap_unit B32;
CARD32 bitmap_bit_order B32;
CARD32 bitmap_pad B32;
CARD32 bits_per_pixel B32;
CARD32 bytes_per_line B32;
CARD32 visual_class B32;
CARD32 red_mask B32;
CARD32 green_mask B32;
CARD32 blue_mask B32;
CARD32 bits_per_rgb B32;
CARD32 colormap_entries B32;
CARD32 ncolors B32;
CARD32 window_width B32;
CARD32 window_height B32;
CARD32 window_x B32;
CARD32 window_y B32;
CARD32 window_bdrwidth B32;
# ifdef WORD64
CARD32 header_end B32;
# endif /* WORD64 */
} XWDFileHeader;
typedef struct _xcolor {
unsigned long pixel;
unsigned short red;
unsigned short green;
unsigned short blue;
char flags;
char pad;
} XColor;
# endif /* _WIN32 */
#endif /* __Aspect_WNTXWD_HXX */

1
src/Aspect/FILES
View File

@ -80,4 +80,3 @@ Aspect_XRPoseActionData.hxx
Aspect_XRSession.cxx
Aspect_XRSession.hxx
Aspect_XRTrackedDeviceRole.hxx
Aspect_XWD.hxx

1
src/TKDraw/EXTERNLIB
View File

@ -21,3 +21,4 @@ CSF_TBB
CSF_objc
CSF_Appkit
CSF_IOKit
CSF_ThreadLibs

1
src/Xw/Xw_Window.cxx
View File

@ -26,7 +26,6 @@
#if defined(HAVE_XLIB)
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
//#include <X11/XF86keysym.h>
#endif