ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-22 01:46:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unit tests failing on the Mac

Browse Source 
X library path needed to be updated when OS is 10.11 (El Capitan).

refs #144
This commit is contained in:
Alex Lin 2015-12-03 11:01:55 -06:00
parent 09c467e423
commit 9af14cf45c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/data_products/DPX/APPS/FXPLOT/makefile
View File

@ -22,7 +22,7 @@ endif
ifeq ($(TRICK_HOST_TYPE), Darwin)
INCDIRS += -I/usr/X11/include
XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib -lXt -lX11
XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11
else
ifneq (${MOTIF_HOME},/usr)
XLIBS = -L${MOTIF_HOME}/lib64 -L${MOTIF_HOME}/lib

2
trick_source/data_products/DPX/APPS/GXPLOT/makefile
View File

@ -23,7 +23,7 @@ endif
ifeq ($(TRICK_HOST_TYPE), Darwin)
INCDIRS += -I/usr/X11/include
MOTIF_INCDIR = -I/sw/include
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -lXt -lX11 ${LIBXML}
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11 ${LIBXML}
else
XLIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lXm -lXt -lX11 ${LIBXML}
endif

2
trick_source/data_products/DPX/test/unit_test/makefile
View File

@ -40,7 +40,7 @@ endif
ifeq ($(TRICK_HOST_TYPE), Darwin)
CFLAGS += -DGTEST_HAS_TR1_TUPLE=0
MOTIF_INCDIR = -I/sw/include
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -lXt -lX11
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11
else
MOTIF_INCDIR = -I/usr/X11R6/lib64 -I/usr/X11R6/lib
XLIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lXm -lXt -lX11 -ldl