From c1da56a6a024e319560e4719de77769a31af6a4f Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 31 Oct 2013 21:14:24 -0700 Subject: [PATCH] scons: specialize default search path for icu on OS X since homebrew is so common now and icu is 'key-only' --- SConstruct | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 7f299d38d..ac5780c43 100644 --- a/SConstruct +++ b/SConstruct @@ -36,11 +36,17 @@ except: LIBDIR_SCHEMA_DEFAULT='lib' severities = ['debug', 'warn', 'error', 'none'] +ICU_INCLUDES_DEFAULT='/usr/include' +ICU_LIBS_DEFAULT='/usr/' + DEFAULT_CC = "gcc" DEFAULT_CXX = "g++" if sys.platform == 'darwin': DEFAULT_CC = "clang" DEFAULT_CXX = "clang++" + # homebrew default + ICU_INCLUDES_DEFAULT='/usr/local/opt/icu4c/include/' + ICU_LIBS_DEFAULT='/usr/local/opt/icu4c/' py3 = None @@ -320,8 +326,8 @@ opts.AddVariables( # Variables for required dependencies ('FREETYPE_CONFIG', 'The path to the freetype-config executable.', 'freetype-config'), ('XML2_CONFIG', 'The path to the xml2-config executable.', 'xml2-config'), - PathVariable('ICU_INCLUDES', 'Search path for ICU include files', '/usr/include', PathVariable.PathAccept), - PathVariable('ICU_LIBS','Search path for ICU include files','/usr/' + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept), + PathVariable('ICU_INCLUDES', 'Search path for ICU include files', ICU_INCLUDES_DEFAULT, PathVariable.PathAccept), + PathVariable('ICU_LIBS','Search path for ICU include files',ICU_LIBS_DEFAULT + LIBDIR_SCHEMA_DEFAULT, PathVariable.PathAccept), ('ICU_LIB_NAME', 'The library name for icu (such as icuuc, sicuuc, or icucore)', 'icuuc', PathVariable.PathAccept), BoolVariable('PNG', 'Build Mapnik with PNG read and write support', 'True'),