| 1 |
bicatali 11/12/27 08:01:37 |
| 2 |
|
| 3 |
Added: 0.9.2-include.patch 0.9.2-numpy.patch |
| 4 |
0.9.2-proj4.patch 0.9.2-tests.patch |
| 5 |
0.9.2-antlr.patch |
| 6 |
Removed: gdl-0.9_rc2-gcc4.4.patch gdl-0.9-numpy.patch |
| 7 |
gdl-0.9_rc4-gcc4.3.patch gdl-0.9-configure.patch |
| 8 |
gdl-0.9_rc4-gcc4.5.patch gdl-0.9.1-antlr.patch |
| 9 |
Log: |
| 10 |
Version bump. Rewrote from scratch and switched to cmake since the configure scripts are not well maintained. Added a few patches to allow projections from gshhs and proj. Added a few more use flags. Fix bug #380323, bug #391667, and bug #393193. |
| 11 |
|
| 12 |
(Portage version: 2.1.10.41/cvs/Linux x86_64) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 dev-lang/gdl/files/0.9.2-include.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-include.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-include.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: 0.9.2-include.patch |
| 21 |
=================================================================== |
| 22 |
--- gdl-0.9.2.orig/src/CFMTLexer.cpp 2011-12-22 20:18:17.000000000 +0000 |
| 23 |
+++ gdl-0.9.2/src/CFMTLexer.cpp 2011-12-24 06:35:24.000000000 +0000 |
| 24 |
@@ -1,5 +1,6 @@ |
| 25 |
/* $ANTLR 2.7.7 (20091222): "cformat.g" -> "CFMTLexer.cpp"$ */ |
| 26 |
|
| 27 |
+#include <cstdlib> |
| 28 |
#include "includefirst.hpp" |
| 29 |
|
| 30 |
#include "CFMTLexer.hpp" |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 dev-lang/gdl/files/0.9.2-numpy.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-numpy.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-numpy.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: 0.9.2-numpy.patch |
| 40 |
=================================================================== |
| 41 |
--- gdl-0.9.2.orig/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000 |
| 42 |
+++ gdl-0.9.2/CMakeLists.txt 2011-12-24 05:39:10.000000000 +0000 |
| 43 |
@@ -476,7 +484,7 @@ |
| 44 |
"${PYTHONMSG} ${PYTHON_MODULEMSG}") |
| 45 |
endif(NOT PYTHON_NUMPY_FOUND) |
| 46 |
set(LIBRARIES ${LIBRARIES} ${PYTHON_LIBRARIES}) |
| 47 |
- include_directories(${PYTHON_INCLUDE_DIRS}) |
| 48 |
+ include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_NUMPY_INCLUDE_DIR}) |
| 49 |
else(PYTHONLIBS_FOUND) |
| 50 |
message(FATAL_ERROR "Python is required but was not found.\n" |
| 51 |
"Use -DPYTHONDIR=DIR to specify the Python directory tree.\n" |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 dev-lang/gdl/files/0.9.2-proj4.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-proj4.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-proj4.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: 0.9.2-proj4.patch |
| 61 |
=================================================================== |
| 62 |
--- gdl-0.9.2.orig/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000 |
| 63 |
+++ gdl-0.9.2/CMakeLists.txt 2011-12-24 06:12:08.000000000 +0000 |
| 64 |
@@ -412,17 +420,17 @@ |
| 65 |
find_package(Libproj4 QUIET) |
| 66 |
if(LIBPROJ4_FOUND) |
| 67 |
set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m) |
| 68 |
- check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW) |
| 69 |
- if(USE_LIBPROJ4_NEW) |
| 70 |
+ check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4) |
| 71 |
+ if(USE_LIBPROJ4) |
| 72 |
set(USE_LIBPROJ4 1) |
| 73 |
- else(USE_LIBPROJ4_NEW) |
| 74 |
- check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4) |
| 75 |
- if(NOT USE_LIBPROJ4) |
| 76 |
+ else(USE_LIBPROJ4) |
| 77 |
+ check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW) |
| 78 |
+ if(NOT USE_LIBPROJ4_NEW) |
| 79 |
message(FATAL_ERROR "Libproj4 is required but was not found.\n" |
| 80 |
"Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n" |
| 81 |
"Use -DLIBPRJ4=OFF to not use it.") |
| 82 |
- endif(NOT USE_LIBPROJ4) |
| 83 |
- endif(USE_LIBPROJ4_NEW) |
| 84 |
+ endif(NOT USE_LIBPROJ4_NEW) |
| 85 |
+ endif(USE_LIBPROJ4) |
| 86 |
include_directories(${LIBPROJ4_INCLUDE_DIR}) |
| 87 |
set(LIBRARIES ${LIBRARIES} ${LIBPROJ4_LIBRARIES}) |
| 88 |
set(CMAKE_REQUIRED_LIBRARIES) |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.1 dev-lang/gdl/files/0.9.2-tests.patch |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-tests.patch?rev=1.1&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-tests.patch?rev=1.1&content-type=text/plain |
| 96 |
|
| 97 |
Index: 0.9.2-tests.patch |
| 98 |
=================================================================== |
| 99 |
diff -Nur gdl-0.9.2.orig/testsuite/CMakeLists.txt gdl-0.9.2/testsuite/CMakeLists.txt |
| 100 |
--- gdl-0.9.2.orig/testsuite/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000 |
| 101 |
+++ gdl-0.9.2/testsuite/CMakeLists.txt 2011-12-25 00:40:51.000000000 +0000 |
| 102 |
@@ -13,6 +13,7 @@ |
| 103 |
*(p-4)=0; |
| 104 |
setenv(\"LC_COLLATE\",\"C\",1); |
| 105 |
setenv(\"GDL_PATH\",\"+${BASE_SOURCE}/testsuite/:+${BASE_SOURCE}/src/pro/\",1); |
| 106 |
+setenv(\"LD_LIBRARY_PATH\",\"+${BASE_BINARY}/testsuite\",1); |
| 107 |
execl(\"${BASE_BINARY}/src/gdl\",\"-quiet\",\"-e\",v[1],(char*)0); |
| 108 |
} |
| 109 |
") |
| 110 |
@@ -21,10 +22,117 @@ |
| 111 |
add_library(test_ce SHARED EXCLUDE_FROM_ALL libtest_ce.cpp) |
| 112 |
add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test DEPENDS launchtest test_ce) |
| 113 |
get_target_property(LAUNCHTESTLOCATION launchtest LOCATION) |
| 114 |
-execute_process( |
| 115 |
- COMMAND "fgrep" ".pro" "${BASE_SOURCE}/testsuite/Makefile.am" |
| 116 |
- COMMAND "awk" "{printf(\"%s;\",$1)}" |
| 117 |
- OUTPUT_VARIABLE TESTS) |
| 118 |
-foreach(TEST ${TESTS}) |
| 119 |
- add_test(${TEST} ${LAUNCHTESTLOCATION} ${TEST}) |
| 120 |
-endforeach(TEST TESTS) |
| 121 |
+ |
| 122 |
+add_test(test_angles.pro ${LAUNCHTESTLOCATION} test_angles.pro) |
| 123 |
+add_test(test_base64.pro ${LAUNCHTESTLOCATION} test_base64.pro) |
| 124 |
+add_test(test_binfmt.pro ${LAUNCHTESTLOCATION} test_binfmt.pro) |
| 125 |
+add_test(test_bug_1779553.pro ${LAUNCHTESTLOCATION} test_bug_1779553.pro) |
| 126 |
+add_test(test_bug_2555865.pro ${LAUNCHTESTLOCATION} test_bug_2555865.pro) |
| 127 |
+add_test(test_bug_2610174.pro ${LAUNCHTESTLOCATION} test_bug_2610174.pro) |
| 128 |
+add_test(test_bug_2846561.pro ${LAUNCHTESTLOCATION} test_bug_2846561.pro) |
| 129 |
+add_test(test_bug_2876150.pro ${LAUNCHTESTLOCATION} test_bug_2876150.pro) |
| 130 |
+add_test(test_bug_2876161.pro ${LAUNCHTESTLOCATION} test_bug_2876161.pro) |
| 131 |
+# these two need display |
| 132 |
+if(X11) |
| 133 |
+ add_test(test_bug_2974380.pro ${LAUNCHTESTLOCATION} test_bug_2974380.pro) |
| 134 |
+ add_test(test_bug_3275334.pro ${LAUNCHTESTLOCATION} test_bug_3275334.pro) |
| 135 |
+ add_test(test_get_screen_size.pro ${LAUNCHTESTLOCATION} test_get_screen_size.pro) |
| 136 |
+endif(X11) |
| 137 |
+add_test(test_bug_3033108.pro ${LAUNCHTESTLOCATION} test_bug_3033108.pro) |
| 138 |
+add_test(test_bug_3054361.pro ${LAUNCHTESTLOCATION} test_bug_3054361.pro) |
| 139 |
+add_test(test_bug_3055720.pro ${LAUNCHTESTLOCATION} test_bug_3055720.pro) |
| 140 |
+add_test(test_bug_3057511.pro ${LAUNCHTESTLOCATION} test_bug_3057511.pro) |
| 141 |
+add_test(test_bug_3057520.pro ${LAUNCHTESTLOCATION} test_bug_3057520.pro) |
| 142 |
+add_test(test_bug_3061072.pro ${LAUNCHTESTLOCATION} test_bug_3061072.pro) |
| 143 |
+add_test(test_bug_3081887.pro ${LAUNCHTESTLOCATION} test_bug_3081887.pro) |
| 144 |
+add_test(test_bug_3085858.pro ${LAUNCHTESTLOCATION} test_bug_3085858.pro) |
| 145 |
+add_test(test_bug_3086851.pro ${LAUNCHTESTLOCATION} test_bug_3086851.pro) |
| 146 |
+add_test(test_bug_3091599.pro ${LAUNCHTESTLOCATION} test_bug_3091599.pro) |
| 147 |
+add_test(test_bug_3091610.pro ${LAUNCHTESTLOCATION} test_bug_3091610.pro) |
| 148 |
+add_test(test_bug_3100945.pro ${LAUNCHTESTLOCATION} test_bug_3100945.pro) |
| 149 |
+add_test(test_bug_3104209.pro ${LAUNCHTESTLOCATION} test_bug_3104209.pro) |
| 150 |
+add_test(test_bug_3104214.pro ${LAUNCHTESTLOCATION} test_bug_3104214.pro) |
| 151 |
+add_test(test_bug_3104326.pro ${LAUNCHTESTLOCATION} test_bug_3104326.pro) |
| 152 |
+add_test(test_bug_3104349.pro ${LAUNCHTESTLOCATION} test_bug_3104349.pro) |
| 153 |
+add_test(test_bug_3147181.pro ${LAUNCHTESTLOCATION} test_bug_3147181.pro) |
| 154 |
+add_test(test_bug_3147733.pro ${LAUNCHTESTLOCATION} test_bug_3147733.pro) |
| 155 |
+add_test(test_bug_3151760.pro ${LAUNCHTESTLOCATION} test_bug_3151760.pro) |
| 156 |
+add_test(test_bug_3152899.pro ${LAUNCHTESTLOCATION} test_bug_3152899.pro) |
| 157 |
+add_test(test_bug_3189072.pro ${LAUNCHTESTLOCATION} test_bug_3189072.pro) |
| 158 |
+add_test(test_bug_3199465.pro ${LAUNCHTESTLOCATION} test_bug_3199465.pro) |
| 159 |
+add_test(test_bug_3244840.pro ${LAUNCHTESTLOCATION} test_bug_3244840.pro) |
| 160 |
+add_test(test_bug_3286031.pro ${LAUNCHTESTLOCATION} test_bug_3286031.pro) |
| 161 |
+add_test(test_bug_3288652.pro ${LAUNCHTESTLOCATION} test_bug_3288652.pro) |
| 162 |
+add_test(test_bug_3290532.pro ${LAUNCHTESTLOCATION} test_bug_3290532.pro) |
| 163 |
+add_test(test_bug_3296360.pro ${LAUNCHTESTLOCATION} test_bug_3296360.pro) |
| 164 |
+add_test(test_bug_3298378.pro ${LAUNCHTESTLOCATION} test_bug_3298378.pro) |
| 165 |
+add_test(test_bug_3300626.pro ${LAUNCHTESTLOCATION} test_bug_3300626.pro) |
| 166 |
+add_test(test_bug_3313522.pro ${LAUNCHTESTLOCATION} test_bug_3313522.pro) |
| 167 |
+add_test(test_bug_3376577.pro ${LAUNCHTESTLOCATION} test_bug_3376577.pro) |
| 168 |
+add_test(test_ce.pro ${LAUNCHTESTLOCATION} test_ce.pro) |
| 169 |
+add_test(test_clip.pro ${LAUNCHTESTLOCATION} test_clip.pro) |
| 170 |
+add_test(test_common.pro ${LAUNCHTESTLOCATION} test_common.pro) |
| 171 |
+add_test(test_constants.pro ${LAUNCHTESTLOCATION} test_constants.pro) |
| 172 |
+add_test(test_correlate.pro ${LAUNCHTESTLOCATION} test_correlate.pro) |
| 173 |
+add_test(test_deriv.pro ${LAUNCHTESTLOCATION} test_deriv.pro) |
| 174 |
+add_test(test_device.pro ${LAUNCHTESTLOCATION} test_device.pro) |
| 175 |
+add_test(test_dicom.pro ${LAUNCHTESTLOCATION} test_dicom.pro) |
| 176 |
+add_test(test_erfinv.pro ${LAUNCHTESTLOCATION} test_erfinv.pro) |
| 177 |
+add_test(test_execute.pro ${LAUNCHTESTLOCATION} test_execute.pro) |
| 178 |
+add_test(test_fft.pro ${LAUNCHTESTLOCATION} test_fft.pro) |
| 179 |
+add_test(test_file_basename.pro ${LAUNCHTESTLOCATION} test_file_basename.pro) |
| 180 |
+add_test(test_file_copy.pro ${LAUNCHTESTLOCATION} test_file_copy.pro) |
| 181 |
+add_test(test_file_delete.pro ${LAUNCHTESTLOCATION} test_file_delete.pro) |
| 182 |
+add_test(test_file_dirname.pro ${LAUNCHTESTLOCATION} test_file_dirname.pro) |
| 183 |
+add_test(test_file_search.pro ${LAUNCHTESTLOCATION} test_file_search.pro) |
| 184 |
+add_test(test_file_which.pro ${LAUNCHTESTLOCATION} test_file_which.pro) |
| 185 |
+add_test(test_fix.pro ${LAUNCHTESTLOCATION} test_fix.pro) |
| 186 |
+add_test(test_fixprint.pro ${LAUNCHTESTLOCATION} test_fixprint.pro) |
| 187 |
+add_test(test_gc.pro ${LAUNCHTESTLOCATION} test_gc.pro) |
| 188 |
+if(GRIB) |
| 189 |
+ add_test(test_grib.pro ${LAUNCHTESTLOCATION} test_grib.pro) |
| 190 |
+endif(GRIB) |
| 191 |
+add_test(test_hist_2d.pro ${LAUNCHTESTLOCATION} test_hist_2d.pro) |
| 192 |
+add_test(test_idl8.pro ${LAUNCHTESTLOCATION} test_idl8.pro) |
| 193 |
+add_test(test_idl_validname.pro ${LAUNCHTESTLOCATION} test_idl_validname.pro) |
| 194 |
+add_test(test_interpol.pro ${LAUNCHTESTLOCATION} test_interpol.pro) |
| 195 |
+add_test(test_interpolate_missing.pro ${LAUNCHTESTLOCATION} test_interpolate_missing.pro) |
| 196 |
+# Needs MEMORY(), not working on Linux |
| 197 |
+# add_test(test_memory.pro ${LAUNCHTESTLOCATION} test_memory.pro) |
| 198 |
+# add_test(test_fft_leak.pro ${LAUNCHTESTLOCATION} test_fft_leak.pro) |
| 199 |
+add_test(test_moment.pro ${LAUNCHTESTLOCATION} test_moment.pro) |
| 200 |
+# mpfit disabled because needs external non required library |
| 201 |
+# add_test(test_mpfit.pro ${LAUNCHTESTLOCATION} test_mpfit.pro) |
| 202 |
+add_test(test_multiroots.pro ${LAUNCHTESTLOCATION} test_multiroots.pro) |
| 203 |
+add_test(test_nestedloop.pro ${LAUNCHTESTLOCATION} test_nestedloop.pro) |
| 204 |
+add_test(test_plotting_ranges.pro ${LAUNCHTESTLOCATION} test_plotting_ranges.pro) |
| 205 |
+add_test(test_pmulti.pro ${LAUNCHTESTLOCATION} test_pmulti.pro) |
| 206 |
+add_test(test_product.pro ${LAUNCHTESTLOCATION} test_product.pro) |
| 207 |
+add_test(test_ps_decomposed.pro ${LAUNCHTESTLOCATION} test_ps_decomposed.pro) |
| 208 |
+if(PYTHON) |
| 209 |
+ add_test(test_python.pro ${LAUNCHTESTLOCATION} test_python.pro) |
| 210 |
+endif(PYTHON) |
| 211 |
+if(PYTHON_MODULE) |
| 212 |
+ add_test(test_python_module_0.pro ${LAUNCHTESTLOCATION} test_python_module_0.pro) |
| 213 |
+ add_test(test_python_module_1.pro ${LAUNCHTESTLOCATION} test_python_module_1.pro) |
| 214 |
+ add_test(test_python_module_2.pro ${LAUNCHTESTLOCATION} test_python_module_2.pro) |
| 215 |
+endif(PYTHON_MODULE) |
| 216 |
+add_test(test_readf.pro ${LAUNCHTESTLOCATION} test_readf.pro) |
| 217 |
+add_test(test_rebin.pro ${LAUNCHTESTLOCATION} test_rebin.pro) |
| 218 |
+add_test(test_rk4.pro ${LAUNCHTESTLOCATION} test_rk4.pro) |
| 219 |
+add_test(test_scope_varfetch.pro ${LAUNCHTESTLOCATION} test_scope_varfetch.pro) |
| 220 |
+add_test(test_sem.pro ${LAUNCHTESTLOCATION} test_sem.pro) |
| 221 |
+add_test(test_spawn_unit.pro ${LAUNCHTESTLOCATION} test_spawn_unit.pro) |
| 222 |
+add_test(test_spher_harm.pro ${LAUNCHTESTLOCATION} test_spher_harm.pro) |
| 223 |
+add_test(test_spl_init.pro ${LAUNCHTESTLOCATION} test_spl_init.pro) |
| 224 |
+add_test(test_step.pro ${LAUNCHTESTLOCATION} test_step.pro) |
| 225 |
+add_test(test_str_functions.pro ${LAUNCHTESTLOCATION} test_str_functions.pro) |
| 226 |
+add_test(test_str_sep.pro ${LAUNCHTESTLOCATION} test_str_sep.pro) |
| 227 |
+add_test(test_stregex.pro ${LAUNCHTESTLOCATION} test_stregex.pro) |
| 228 |
+add_test(test_strsplit.pro ${LAUNCHTESTLOCATION} test_strsplit.pro) |
| 229 |
+add_test(test_suite.pro ${LAUNCHTESTLOCATION} test_suite.pro) |
| 230 |
+add_test(test_systime.pro ${LAUNCHTESTLOCATION} test_systime.pro) |
| 231 |
+add_test(test_url.pro ${LAUNCHTESTLOCATION} test_url.pro) |
| 232 |
+add_test(test_wavelet.pro ${LAUNCHTESTLOCATION} test_wavelet.pro) |
| 233 |
+add_test(test_zeropoly.pro ${LAUNCHTESTLOCATION} test_zeropoly.pro) |
| 234 |
+add_test(test_zip.pro ${LAUNCHTESTLOCATION} test_zip.pro) |
| 235 |
|
| 236 |
|
| 237 |
|
| 238 |
1.1 dev-lang/gdl/files/0.9.2-antlr.patch |
| 239 |
|
| 240 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-antlr.patch?rev=1.1&view=markup |
| 241 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.2-antlr.patch?rev=1.1&content-type=text/plain |
| 242 |
|
| 243 |
Index: 0.9.2-antlr.patch |
| 244 |
=================================================================== |
| 245 |
diff -Nur gdl-0.9.2.orig/CMakeLists.txt gdl-0.9.2/CMakeLists.txt |
| 246 |
--- gdl-0.9.2.orig/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000 |
| 247 |
+++ gdl-0.9.2/CMakeLists.txt 2011-12-22 20:32:20.000000000 +0000 |
| 248 |
@@ -94,6 +94,8 @@ |
| 249 |
|
| 250 |
set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "Choose data install directory relative to CMAKE_INSTALL_PREFIX") |
| 251 |
|
| 252 |
+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?") |
| 253 |
+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree") |
| 254 |
|
| 255 |
# check for 64-bit OS |
| 256 |
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) |
| 257 |
@@ -143,9 +145,15 @@ |
| 258 |
# mpi |
| 259 |
check_include_file(mpi.h HAVE_MPI_H) |
| 260 |
|
| 261 |
-# SA: whithout it compilation of antlr fails if there's a conflicting |
| 262 |
-# version of antlr in system-wide directories |
| 263 |
-include_directories(src) |
| 264 |
+if(BUNDLED_ANTLR) |
| 265 |
+ # SA: whithout it compilation of antlr fails if there's a conflicting |
| 266 |
+ # version of antlr in system-wide directories |
| 267 |
+ include_directories(src) |
| 268 |
+else(BUNDLED_ANTLR) |
| 269 |
+ find_package(ANTLR QUIET) |
| 270 |
+ set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES}) |
| 271 |
+ include_directories(${ANTLR_INCLUDE_DIR}) |
| 272 |
+endif(BUNDLED_ANTLR) |
| 273 |
|
| 274 |
# Ncurses MANDATORY |
| 275 |
# -DNCURSESDIR=DIR |
| 276 |
diff -Nur gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake gdl-0.9.2/CMakeModules/FindANTLR.cmake |
| 277 |
--- gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake 1970-01-01 01:00:00.000000000 +0100 |
| 278 |
+++ gdl-0.9.2/CMakeModules/FindANTLR.cmake 2011-12-22 21:03:34.000000000 +0000 |
| 279 |
@@ -0,0 +1,11 @@ |
| 280 |
+ |
| 281 |
+ |
| 282 |
+find_library(ANTLR_LIBRARIES NAMES antlr) |
| 283 |
+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp) |
| 284 |
+include(FindPackageHandleStandardArgs) |
| 285 |
+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR) |
| 286 |
+ |
| 287 |
+mark_as_advanced( |
| 288 |
+ANTLR_LIBRARIES |
| 289 |
+ANTLR_INCLUDE_DIR |
| 290 |
+) |
| 291 |
diff -Nur gdl-0.9.2.orig/src/CMakeLists.txt gdl-0.9.2/src/CMakeLists.txt |
| 292 |
--- gdl-0.9.2.orig/src/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000 |
| 293 |
+++ gdl-0.9.2/src/CMakeLists.txt 2011-12-22 20:31:27.000000000 +0000 |
| 294 |
@@ -224,9 +224,8 @@ |
| 295 |
widget.cpp |
| 296 |
) |
| 297 |
|
| 298 |
-add_subdirectory(antlr) |
| 299 |
|
| 300 |
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR}) |
| 301 |
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}) |
| 302 |
link_directories(${LINK_DIRECTORIES}) |
| 303 |
|
| 304 |
if(PYTHON_MODULE) #libgdl |
| 305 |
@@ -237,8 +236,13 @@ |
| 306 |
add_executable(gdl ${SOURCES}) |
| 307 |
endif(PYTHON_MODULE) |
| 308 |
|
| 309 |
-add_dependencies(gdl antlr) # be sure that antlr is built before gdl |
| 310 |
-target_link_libraries(gdl antlr) # link antlr against gdl |
| 311 |
+if(BUNDLED_ANTLR) |
| 312 |
+ add_subdirectory(antlr) |
| 313 |
+ include_directories(${CMAKE_SOURCE_DIR}/src/antlr) |
| 314 |
+ add_dependencies(gdl antlr) # be sure that antlr is built before gdl |
| 315 |
+ target_link_libraries(gdl antlr) # link antlr against gdl |
| 316 |
+endif(BUNDLED_ANTLR) |
| 317 |
+ |
| 318 |
target_link_libraries(gdl ${LIBRARIES}) |
| 319 |
add_definitions(-DHAVE_CONFIG_H) |
Archives