Commit b48ae61d authored by Robert Butora's avatar Robert Butora
Browse files

Support CentOS7/EPEL builds. HAVE_BOOST workaround for https://github.com/SOCI/soci/issues/433.

parent ef982652

Makefile

+5 −2
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ INC_DIR=/usr/local/omniORB/include \ 
	   /usr/local/soci/include \

	   /usr/local/soci/include/soci \

	   /usr/include/mysql \

	   /usr/include/soci \

	   /usr/include/cfitsio \

	   /usr/local/CCfits/include \

	   /usr/local/cfitsio/include \

	   ./src
@@ -27,10 +29,11 @@ LIB_DIR=/usr/local/omniORB/lib \ 
CC=g++

CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG

CXX_RELEASE_FLAGS=-O3

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -DHAVE_BOOST

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

	-lsoci_core -lsoci_mysql -lCCfits -lboost_thread -lboost_filesystem \

	-lboost_system -lboost_iostreams -lboost_date_time -lboost_regex -lssl -lcrypto

	-lboost_system -lboost_iostreams -lboost_date_time -lboost_regex -lssl -lcrypto \

	-lmysqlclient

INC_PARM=$(foreach d, $(INC_DIR), -I$d)

LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)

#================================================================================