> On 4 Jan 2017, at 18:21, Roman Lebedev <lebedev...@gmail.com> wrote: > >> On Wed, Jan 4, 2017 at 10:20 AM, <para...@paraf.in> wrote: >> Changes to cmake files is probably the culprit - rawspeed now doesn't >> inherit CFLAGS from darktable and so is missing include path for libjpeg. > > But from where did darktable get that jpeg include path? From user? > rawspeed does look for jpeg: > https://github.com/darktable-org/rawspeed/blob/c42c358973b40a266f41de62e06a09a8d309c289/RawSpeed/CMakeLists.txt#L26-L27
Hmm, you're right and git master actually compiles for me as is. I'm using macports here. So the question is where brew is different. Grep for JPEG_INCLUDE_DIRS in CMakeCache.txt in build directory (which BTW should be cleaned of course) should help. > >> P.S. >> About switching from stable to master branch and back - there're also issues >> with cherry-picking commits for some reason. We need to come up with correct >> and clean way of branch checkout… Maybe git clean is needed… > Yeah, it will be a painful expirience. At least it will end one way or > another once 2.4 is out. > > Roman. > >>> On 4 Jan 2017, at 05:05, Wolfgang Goetz <wolfgang.zt...@web.de> wrote: >>> >>> Roman Lebedev wrote: >>> >>>> On Tue, Jan 3, 2017 at 1:46 AM, Wolfgang Goetz >>>> <wolfgang.zt...@web.de> wrote: >>>>> MacOS/brew broken: >>>>> ... >>>>> [ 2%] Building CXX object >>>>> src/external/rawspeed/RawSpeed/CMakeFiles/rawspeed.dir/ArwDecoder.cpp.o >>>>> In file included >>>>> from >>>>> /Users/wolfganggoetz/repos/darktable/src/external/rawspeed/RawSpeed/ArwDecoder.cpp:1: >>>>> >>>>> /Users/wolfganggoetz/repos/darktable/src/external/rawspeed/RawSpeed/StdAfx.h:97:10: >>>>> fatal error: 'jpeglib.h' file not found #include "jpeglib.h" ^ >>>>> 1 error generated. >>>> Hmm, you do have jpeg or jpeg-turbo formula installed? >>> >>> >>> >>>> Because travis-ci osx builds do not fail, e.g. >>>> https://travis-ci.org/darktable-org/rawspeed/jobs/188323509 >>> >>> >>> >>> to make it short: >>> http://stackoverflow.com/questions/14525898/cmake-doesnt-set-xcodes-user-include-path >>> >>> not sure if it's the right place, looks more like sledgehammer: >>> >>> >>> diff --git a/CMakeLists.txt b/CMakeLists.txt >>> index 6b7a1530f..d8e57008b 100644 >>> --- a/CMakeLists.txt >>> +++ b/CMakeLists.txt >>> @@ -32,7 +32,7 @@ endif() >>> IF(DEFINED DT_FORCE_CXX_COMPILER) >>> set(CMAKE_CXX_COMPILER ${DT_FORCE_CXX_COMPILER}) >>> endif() >>> - >>> +include_directories(/usr/local/include) >>> include(CheckCCompilerFlag) >>> include(TestBigEndian) >>> >>> >>> >>> build OK, dt 2.3.0+142 running :-) >>> >>> >>> >>> kind regards >>> Wolfgang >>> >>> >>> >>> >>> >>> >>> the long way: >>> >>> >>> travis is cool. >>> attention: default is OSX 10.11/XCode 7.3.1 >>> >>> i'm on real hardware more like osx_image: xcode8.2 >>> exact:macOS Sierra Version 10.12.2, XCode Version 8.2.1 (not avail in >>> travis) >>> >>> >>> >>> brew is cool. (in darktable: 'brew bundle' for dependencies, atm just >>> updating to gcc-6.3.0, this will take some time!) >>> >>> tags/release-2.2.1 build is ok. >>> >>> /usr/local/include/jpeglib.h exists. >>> >>> playing around with CC and CXX environments doesnt help. (fun to see gcc-6 >>> as CC and clang as CXX) >>> >>> sandboxing: same error >>> export PATH=.:$PATH >>> brew bundle exec build.sh >>> >>> >>> >>> >>> >>> >>> >>> VERBOSE=1 >>> >>> >>> with submodule: >>> >>> [ 3%] Building CXX object >>> src/external/rawspeed/RawSpeed/CMakeFiles/rawspeed.dir/ArwDecoder.cpp.o >>> cd >>> /Users/wolfganggoetz/repos/darktable/build/src/external/rawspeed/RawSpeed >>> && >>> /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ >>> -DDEBUG -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED >>> -DGTK_DISABLE_SINGLE_INCLUDES -DOS_OBJECT_USE_OBJC=0 -D_XOPEN_SOURCE=700 >>> -D__GDK_KEYSYMS_COMPAT_H__ -isystem >>> /usr/local/Cellar/pugixml/1.8.1/include/pugixml-1.8 -D_DARWIN_C_SOURCE >>> -Wall -fno-strict-aliasing -Wformat -Wformat-security -Wshadow >>> -Wtype-limits -Wvla -Wno-error=varargs -Wframe-larger-than=32768 >>> -Wlarger-than=524288 -std=c++11 -fno-strict-aliasing -Wall >>> -fno-strict-aliasing -Wformat -Wformat-security -Wshadow -Wtype-limits >>> -Wvla -Wno-error=varargs -Wframe-larger-than=32768 -Wlarger-than=524288 -O2 >>> -g -DNDEBUG -O2 -isysroot >>> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk >>> -fPIC -march=native -g3 -ggdb3 -o >>> CMakeFiles/rawspeed.dir/ArwDecoder.cpp.o -c >>> /Users/wolfganggoetz/repos/darktable/src/external/rawspeed/RawSpeed/ArwDecoder.cpp >>> In file included from >>> /Users/wolfganggoetz/repos/darktable/src/external/rawspeed/RawSpeed/AriDecoder.cpp:1: >>> /Users/wolfganggoetz/repos/darktable/src/external/rawspeed/RawSpeed/StdAfx.h:97:10: >>> fatal error: 'jpeglib.h' file not found >>> >>> >>> >>> >>> good output from release-2.2.1: >>> >>> [ 2%] Building CXX object >>> src/external/rawspeed/CMakeFiles/rawspeed.dir/RawSpeed/ArwDecoder.cpp.o >>> cd /Users/wolfganggoetz/repos/darktable_old/build/src/external/rawspeed && >>> /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ >>> -DGDK_DISABLE_DEPRECATED -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_14 >>> -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_MIN_REQUIRED >>> -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGTK_DISABLE_DEPRECATED >>> -DGTK_DISABLE_SINGLE_INCLUDES -DHAVE_CONFIG_H -DHAVE_GPHOTO2 >>> -DHAVE_GPHOTO_25_OR_NEWER -DHAVE_GRAPHICSMAGICK -DHAVE_HTTP_SERVER >>> -DHAVE_KWALLET -DHAVE_LENSFUN -DHAVE_LIBSECRET -DHAVE_OPENCL -DHAVE_OPENEXR >>> -DHAVE_OPENJPEG -DMAC_INTEGRATION -DOS_OBJECT_USE_OBJC=0 -DUSE_LUA >>> -D_XOPEN_SOURCE=700 -D__GDK_KEYSYMS_COMPAT_H__ >>> -I/Users/wolfganggoetz/repos/darktable_old/src >>> -I/Users/wolfganggoetz/repos/darktable_old/src/external -isystem >>> /usr/local/include/glib-2.0 -isystem >>> /usr/local/include/../lib/glib-2.0/include -isystem >>> /usr/local/Cellar/gtk+3/3.22.5/include/gtk-3.0 -isystem >>> /usr/local/Cellar/glib/2.50.2/include/gio-unix-2.0 -isystem >>> /usr/local/Cellar/cairo/1.14.8/include/cairo -isystem >>> /usr/local/Cellar/libepoxy/1.3.1/include -isystem >>> /usr/local/Cellar/pango/1.40.3/include/pango-1.0 -isystem >>> /usr/local/Cellar/harfbuzz/1.3.4_1/include/harfbuzz -isystem >>> /usr/local/Cellar/atk/2.22.0/include/atk-1.0 -isystem >>> /usr/local/Cellar/pixman/0.34.0/include/pixman-1 -isystem >>> /usr/local/Cellar/fontconfig/2.12.1_2/include -isystem >>> /usr/local/opt/freetype/include/freetype2 -isystem >>> /usr/local/Cellar/libpng/1.6.27/include/libpng16 -isystem >>> /usr/local/Cellar/gdk-pixbuf/2.36.2/include/gdk-pixbuf-2.0 -isystem >>> /usr/local/Cellar/glib/2.50.2/include/glib-2.0 -isystem >>> /usr/local/Cellar/glib/2.50.2/lib/glib-2.0/include -isystem >>> /usr/local/opt/gettext/include -isystem /usr/local/Cellar/pcre/8.39/include >>> -isystem >>> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/libxml2 >>> -isystem /usr/local/Cellar/libsoup/2.56.0/include/libsoup-2.4 -isystem >>> /usr/include/libxml2 -isystem /usr/local/include -isystem >>> /usr/local/include/OpenEXR -isystem >>> /usr/local/Cellar/lensfun/0.3.2_1/include/lensfun -isystem >>> /usr/local/include/pango-1.0 -isystem /usr/local/include/librsvg-2.0 >>> -isystem /usr/local/include/json-glib-1.0 -isystem >>> /usr/local/Cellar/openjpeg/2.1.2/include/openjpeg-2.1 -isystem >>> /usr/local/Cellar/libsecret/0.18.5/include/libsecret-1 -isystem >>> /usr/local/include/gtkmacintegration -isystem >>> /usr/local/include/GraphicsMagick >>> -I/Users/wolfganggoetz/repos/darktable_old/build/src -isystem >>> /usr/local/opt/lua/include >>> -I/Users/wolfganggoetz/repos/darktable_old/src/external/LuaAutoC -isystem >>> /usr/local/Cellar/pugixml/1.8.1/include/pugixml-1.8 -D_DARWIN_C_SOURCE >>> -Wall -fno-strict-aliasing -Wformat -Wformat-security -Wshadow >>> -Wtype-limits -Wvla -Wno-error=varargs -Wframe-larger-than=32768 >>> -Wlarger-than=524288 -std=c++11 -stdlib=libc++ -pthread -march=native >>> -msse2 -g -Wno-error=shadow -Wframe-larger-than=16384 -Wlarger-than=16384 >>> -O2 -g -DNDEBUG -O2 -isysroot >>> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk >>> -fPIC -o CMakeFiles/rawspeed.dir/RawSpeed/ArwDecoder.cpp.o -c >>> /Users/wolfganggoetz/repos/darktable_old/src/external/rawspeed/RawSpeed/ArwDecoder.cpp >>> >>> >>> >>> >>> >>> >>> >>> >>> >>>> >>>>> kind regards >>>>> Wolfgang >>>> Roman. >>> >>> >> >> ___________________________________________________________________________ >> darktable developer mailing list >> to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org >> > ___________________________________________________________________________ > darktable developer mailing list > to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org > > ___________________________________________________________________________ darktable developer mailing list to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org
