Skip to content

Commit 9af14cf

Browse files
committed
Unit tests failing on the Mac
X library path needed to be updated when OS is 10.11 (El Capitan). refs #144
1 parent 09c467e commit 9af14cf

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

trick_source/data_products/DPX/APPS/FXPLOT/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif
2222

2323
ifeq ($(TRICK_HOST_TYPE), Darwin)
2424
INCDIRS += -I/usr/X11/include
25-
XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib -lXt -lX11
25+
XLIBS = -L${MOTIF_HOME}/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11
2626
else
2727
ifneq (${MOTIF_HOME},/usr)
2828
XLIBS = -L${MOTIF_HOME}/lib64 -L${MOTIF_HOME}/lib

trick_source/data_products/DPX/APPS/GXPLOT/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif
2323
ifeq ($(TRICK_HOST_TYPE), Darwin)
2424
INCDIRS += -I/usr/X11/include
2525
MOTIF_INCDIR = -I/sw/include
26-
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -lXt -lX11 ${LIBXML}
26+
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11 ${LIBXML}
2727
else
2828
XLIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lXm -lXt -lX11 ${LIBXML}
2929
endif

trick_source/data_products/DPX/test/unit_test/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ endif
4040
ifeq ($(TRICK_HOST_TYPE), Darwin)
4141
CFLAGS += -DGTEST_HAS_TR1_TUPLE=0
4242
MOTIF_INCDIR = -I/sw/include
43-
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -lXt -lX11
43+
XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11
4444
else
4545
MOTIF_INCDIR = -I/usr/X11R6/lib64 -I/usr/X11R6/lib
4646
XLIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lXm -lXt -lX11 -ldl

0 commit comments

Comments
 (0)