From 3ffacb3510d2fb6950888a32d7515c87aac74d6e Mon Sep 17 00:00:00 2001 From: mathbouchard-pmd Date: Wed, 12 Mar 2014 09:30:34 -0400 Subject: [PATCH] Change cplex linux include --- build-debug/SConscript | 1 + build-release/SConscript | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-debug/SConscript b/build-debug/SConscript index 8e0fcbf..3dc1d82 100644 --- a/build-debug/SConscript +++ b/build-debug/SConscript @@ -31,6 +31,7 @@ def validateLibrary(libraryName, exclude): cpppath = { "Linux": [r"/opt/ibm/ILOG/CPLEX_Studio126/cplex/include", os.environ['HOME']+"/source/gurobi510/linux64/include", + os.environ['HOME']+"/gitwork/cpxinc/", r"/usr/local/include/", r"//usr/include/coin/"], "Windows": [], diff --git a/build-release/SConscript b/build-release/SConscript index 4ff9de8..9b92d38 100644 --- a/build-release/SConscript +++ b/build-release/SConscript @@ -44,8 +44,9 @@ def buildoctavecmd(cpppath, libpath, libs, cxxflags, cppedefines): cpppath = { "Linux": [r"/opt/ibm/ILOG/CPLEX_Studio126/cplex/include", os.environ['HOME']+"/source/gurobi510/linux64/include", - r"/usr/local/include/", - r"/usr/include/coin/"], + os.environ['HOME']+"/gitwork/cpxinc/", + r"/usr/local/include/", + r"/usr/include/coin/"], "Windows": [], "Darwin": [os.environ['HOME']+"/Applications/IBM/ILOG/CPLEX_Studio126/cplex/include", r"/Library/gurobi560/mac64/include",