Hello Roman, thanks a lot for your patches. During commit, I had to slightly modify patch 1 and 2. The glib minimal version is now set to 2.40 and the include problem was fixed at another position. Please check the patches-roman branch at Sourceforge and tell me if that's still working for you. I will then merge it to the master branch.
Sebastian On 07.10.2015 19:06, Roman Lebedev wrote: > Hello. > > I've been meaning to do those changes for a while, but > it wasn't until a user came to #darktable with LF building > issue today. > > Fisrt commit addresses build failure with old glib2 versions, > and makes sure that it will not happen again. > > Second commit fixes a warning due to config.h being included > too late, and thus, #define re-definition. > > And the issue in last commit did hit me more than once, and > each time it took me awhile to understand what is wrong... > > Thanks! > > Roman Lebedev (3): > CMakeLists: specify glib2 version requirments. > lenstool: make sure that config.h is always included before glib.h > CMake: move modules out of build/ and make build dir The build dir > > .gitignore | 2 +- > CMakeLists.txt | 7 +++- > apps/lenstool/lenstool.cpp | 1 + > build/CMakeModules/FindGLIB2.cmake | 69 > -------------------------------- > build/CMakeModules/toolchain_win32.cmake | 18 --------- > cmake/modules/FindGLIB2.cmake | 69 > ++++++++++++++++++++++++++++++++ > cmake/modules/toolchain_win32.cmake | 18 +++++++++ > include/lensfun/config.h.in.cmake | 13 +++++- > 8 files changed, 106 insertions(+), 91 deletions(-) > delete mode 100644 build/CMakeModules/FindGLIB2.cmake > delete mode 100644 build/CMakeModules/toolchain_win32.cmake > create mode 100644 cmake/modules/FindGLIB2.cmake > create mode 100644 cmake/modules/toolchain_win32.cmake > ------------------------------------------------------------------------------ Full-scale, agent-less Infrastructure Monitoring from a single dashboard Integrate with 40+ ManageEngine ITSM Solutions for complete visibility Physical-Virtual-Cloud Infrastructure monitoring from one console Real user monitoring with APM Insights and performance trend reports Learn More http://pubads.g.doubleclick.net/gampad/clk?id=247754911&iu=/4140 _______________________________________________ Lensfun-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lensfun-users
