genmodel 0.0.37 → 0.0.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/Genmodel/extconf.rb +30 -4
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9392b2f09d84cc6fa7bf6de12d1af984eb2edb5a
|
|
4
|
+
data.tar.gz: 7e268105f190b3f7a09514b10fa4c78a2519eedd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 86b3e9a97f0fa20b414781fae46a0a0fb81be36d753407d786171402e91cb2c306845174950a37eeafa4ce1a182d5e82348dede6dc790c7adfdd280b2a6f7509
|
|
7
|
+
data.tar.gz: 89271f97ad4baf478670aa0a4ef7c5acf8b8af8d8b0ff6d76f0370163a920e0fa061896d72d83a614475b35195d18efa4c04212cbff6c741c99af0615c02b116
|
data/ext/Genmodel/extconf.rb
CHANGED
|
@@ -60,7 +60,8 @@ if is_darwin
|
|
|
60
60
|
|
|
61
61
|
path = Dir.home+"/Applications/IBM/ILOG/CPLEX_Studio126/cplex/lib/x86-64_osx/static_pic"
|
|
62
62
|
puts "Looking for libcplex (function CPXopenCPLEX) in "+path
|
|
63
|
-
if(is_cplex && find_library("cplex","CPXopenCPLEX",path)) #"CPXopenCPLEX",path))
|
|
63
|
+
#if(is_cplex && find_library("cplex","CPXopenCPLEX",path)) #"CPXopenCPLEX",path))
|
|
64
|
+
if(is_cplex && find_library("cplex","main",path)) #"CPXopenCPLEX",path))
|
|
64
65
|
puts "found"
|
|
65
66
|
else
|
|
66
67
|
puts "not found"
|
|
@@ -76,7 +77,27 @@ if is_darwin
|
|
|
76
77
|
Find.find(search_path) do |path|
|
|
77
78
|
if (FileTest.directory?(path))
|
|
78
79
|
puts path+search_file
|
|
79
|
-
temp_name = (path).gsub(/\/usr\/local\/Cellar\/cbc\//,'')
|
|
80
|
+
#temp_name = (path).gsub(/\/usr\/local\/Cellar\/cbc\//,'')
|
|
81
|
+
temp_name = (path).gsub(/\/usr\/local\/Cellar\/coinmp\//,'')
|
|
82
|
+
count = temp_name.count('/')
|
|
83
|
+
if ((count == 0) && (File.exist?(path+search_file)))
|
|
84
|
+
file_exist = "-I#{path}/include/coin"
|
|
85
|
+
break
|
|
86
|
+
end
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
end
|
|
90
|
+
|
|
91
|
+
search_path = "/usr/local/Cellar/coinmp/"
|
|
92
|
+
search_file = "/include/coin/OsiClpSolverInterface.hpp"
|
|
93
|
+
puts "Looking for OsiClpSolverInterface.hpp in "+search_path+"/*"
|
|
94
|
+
file_exist = nil
|
|
95
|
+
if file_exist == nil && File.exist?(search_path)
|
|
96
|
+
Find.find(search_path) do |path|
|
|
97
|
+
if (FileTest.directory?(path))
|
|
98
|
+
puts path+search_file
|
|
99
|
+
#temp_name = (path).gsub(/\/usr\/local\/Cellar\/cbc\//,'')
|
|
100
|
+
temp_name = (path).gsub(/\/usr\/local\/Cellar\/coinmp\//,'')
|
|
80
101
|
count = temp_name.count('/')
|
|
81
102
|
if ((count == 0) && (File.exist?(path+search_file)))
|
|
82
103
|
file_exist = "-I#{path}/include/coin"
|
|
@@ -187,8 +208,13 @@ elsif is_linux
|
|
|
187
208
|
if(is_cplex && find_header("ilcplex/cplex.h",path))
|
|
188
209
|
puts "found"
|
|
189
210
|
else
|
|
190
|
-
|
|
191
|
-
|
|
211
|
+
path = "/opt/ibm/ILOG/CPLEX_Studio124/cplex/include"
|
|
212
|
+
puts "Looking for ilcplex/cplex.h in "+path
|
|
213
|
+
if(is_cplex && find_header("ilcplex/cplex.h",path))
|
|
214
|
+
puts "found"
|
|
215
|
+
else
|
|
216
|
+
is_cplex = false
|
|
217
|
+
end
|
|
192
218
|
end
|
|
193
219
|
|
|
194
220
|
path = "/usr/lib:/usr/local/lib/"
|