From d2f16aeaf152a2b7e0f3961c0c24e6fac0ed63dd Mon Sep 17 00:00:00 2001 From: ghorvath Date: Fri, 8 Jan 2010 22:42:36 +0000 Subject: [PATCH] Patches applied to build system --- CMakeLists.txt | 3 + rtengine/CMakeCache.txt | 401 ------------------------------ rtengine/CMakeLists.txt | 40 +-- rtengine/bilateral2.h | 4 +- rtengine/dcraw.cc | 1 + rtengine/hlmultipliers.cc | 2 - rtengine/imagedata.cc | 2 + rtengine/myfile.cc | 2 + rtengine/rtcmd | Bin 31928 -> 0 bytes rtgui/CMakeCache.txt | 503 -------------------------------------- rtgui/CMakeLists.txt | 112 +++++---- rtgui/main.cc | 5 +- 12 files changed, 106 insertions(+), 969 deletions(-) delete mode 100755 rtengine/CMakeCache.txt delete mode 100755 rtengine/rtcmd delete mode 100755 rtgui/CMakeCache.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 937aa517b..ed2103208 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,6 @@ +cmake_minimum_required(VERSION 2.6) + +option (WITH_RAWZOR "Build with Rawzor support" ON) add_subdirectory (rtexif) add_subdirectory (rtengine) diff --git a/rtengine/CMakeCache.txt b/rtengine/CMakeCache.txt deleted file mode 100755 index 3baf1ec23..000000000 --- a/rtengine/CMakeCache.txt +++ /dev/null @@ -1,401 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: /home/hgabor/RawTherapee/2.5/gui88/rtengine -# It was generated by CMake: /usr/bin/cmake -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a variable in the cache. -# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//Path to a program. -CMAKE_AR:FILEPATH=/usr/bin/ar - -//For backwards compatibility, what version of CMake commands and -// syntax should this version of CMake try to support. -CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4 - -//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or -// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. -CMAKE_BUILD_TYPE:STRING= - -//Enable/Disable color output during build. -CMAKE_COLOR_MAKEFILE:BOOL=ON - -//CXX compiler. -CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++ - -//Flags used by the compiler during all build types. -CMAKE_CXX_FLAGS:STRING= - -//Flags used by the compiler during debug builds. -CMAKE_CXX_FLAGS_DEBUG:STRING=-g - -//Flags used by the compiler during release minsize builds. -CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG - -//Flags used by the compiler during release builds (/MD /Ob1 /Oi -// /Ot /Oy /Gs will produce slightly less optimized but smaller -// files). -CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG - -//Flags used by the compiler during Release with Debug Info builds. -CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g - -//C compiler. -CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc - -//Flags used by the compiler during all build types. -CMAKE_C_FLAGS:STRING= - -//Flags used by the compiler during debug builds. -CMAKE_C_FLAGS_DEBUG:STRING=-g - -//Flags used by the compiler during release minsize builds. -CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG - -//Flags used by the compiler during release builds (/MD /Ob1 /Oi -// /Ot /Oy /Gs will produce slightly less optimized but smaller -// files). -CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG - -//Flags used by the compiler during Release with Debug Info builds. -CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g - -//Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING= - -//Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//Install path prefix, prepended onto install directories. -CMAKE_INSTALL_PREFIX:PATH=/usr/local - -//Path to a program. -CMAKE_LINKER:FILEPATH=/usr/bin/ld - -//Path to a program. -CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make - -//Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING= - -//Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//Path to a program. -CMAKE_NM:FILEPATH=/usr/bin/nm - -//Path to a program. -CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy - -//Path to a program. -CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump - -//Path to a program. -CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib - -//Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING= - -//Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//If set, runtime paths are not added when using shared libraries. -CMAKE_SKIP_RPATH:BOOL=NO - -//Path to a program. -CMAKE_STRIP:FILEPATH=/usr/bin/strip - -//If true, cmake will use relative paths in makefiles and projects. -CMAKE_USE_RELATIVE_PATHS:BOOL=OFF - -//If this value is on, makefiles will be generated without the -// .SILENT directive, and all commands will be echoed to the console -// during the make. This is useful for debugging only. With Visual -// Studio IDE projects all commands are done without /nologo. -CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE - -//Single output directory for building all executables. -EXECUTABLE_OUTPUT_PATH:PATH= - -//Single output directory for building all libraries. -LIBRARY_OUTPUT_PATH:PATH= - -//pkg-config executable -PKG_CONFIG_EXECUTABLE:FILEPATH=/usr/bin/pkg-config - -//Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/hgabor/RawTherapee/2.5/gui88/rtengine - -//Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/hgabor/RawTherapee/2.5/gui88/rtengine - -//Dependencies for the target -rtengine_LIB_DEPENDS:STATIC=general;rtexif;general;lcms;general;iptcdata -lrwz_sdk;general;gthread-2.0;general;gobject-2.0;general;glib-2.0;general;glibmm-2.4;general;gobject-2.0;general;sigc-2.0;general;glib-2.0; - - -######################## -# INTERNAL cache entries -######################## - -//Advanced flag for variable: CMAKE_AR -CMAKE_AR-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_BUILD_TOOL -CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 -//What is the target build tool cmake is generating for. -CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make -//This is the directory where this CMakeCahe.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/hgabor/RawTherapee/2.5/gui88/rtengine -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 -//Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 0 -//Advanced flag for variable: CMAKE_COLOR_MAKEFILE -CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 -//Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/usr/bin/cmake -//Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack -//Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest -//Advanced flag for variable: CMAKE_CXX_COMPILER -CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 -CMAKE_CXX_COMPILER_WORKS:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS -CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_DEBUG -CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_MINSIZEREL -CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_RELEASE -CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO -CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_COMPILER -CMAKE_C_COMPILER-ADVANCED:INTERNAL=1 -CMAKE_C_COMPILER_WORKS:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS -CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_DEBUG -CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_MINSIZEREL -CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_RELEASE -CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_RELWITHDEBINFO -CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Result of TRY_COMPILE -CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE -//Result of TRY_COMPILE -CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE -//Path to cache edit program executable. -CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake -//Executable file format -CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS -CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG -CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE -CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Name of generator. -CMAKE_GENERATOR:INTERNAL=Unix Makefiles -//Start directory with the top level CMakeLists.txt file for this -// project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/hgabor/RawTherapee/2.5/gui88/rtengine -//Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 -//Advanced flag for variable: CMAKE_LINKER -CMAKE_LINKER-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MAKE_PROGRAM -CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS -CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG -CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE -CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_NM -CMAKE_NM-ADVANCED:INTERNAL=1 -//number of local generators -CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=1 -//Advanced flag for variable: CMAKE_OBJCOPY -CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_OBJDUMP -CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_RANLIB -CMAKE_RANLIB-ADVANCED:INTERNAL=1 -//Path to CMake installation. -CMAKE_ROOT:INTERNAL=/usr/share/cmake-2.6 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS -CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG -CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE -CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SKIP_RPATH -CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_STRIP -CMAKE_STRIP-ADVANCED:INTERNAL=1 -//uname command -CMAKE_UNAME:INTERNAL=/bin/uname -//Advanced flag for variable: CMAKE_USE_RELATIVE_PATHS -CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_VERBOSE_MAKEFILE -CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -GLIB2_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIB2_CFLAGS_I:INTERNAL= -GLIB2_CFLAGS_OTHER:INTERNAL= -GLIB2_FOUND:INTERNAL=1 -GLIB2_INCLUDEDIR:INTERNAL=/usr/include -GLIB2_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIB2_LDFLAGS:INTERNAL=-lglib-2.0 -GLIB2_LDFLAGS_OTHER:INTERNAL= -GLIB2_LIBDIR:INTERNAL=/usr/lib -GLIB2_LIBRARIES:INTERNAL=glib-2.0 -GLIB2_LIBRARY_DIRS:INTERNAL= -GLIB2_LIBS:INTERNAL= -GLIB2_LIBS_L:INTERNAL= -GLIB2_LIBS_OTHER:INTERNAL= -GLIB2_LIBS_PATHS:INTERNAL= -GLIB2_PREFIX:INTERNAL=/usr -GLIB2_STATIC_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIB2_STATIC_CFLAGS_I:INTERNAL= -GLIB2_STATIC_CFLAGS_OTHER:INTERNAL= -GLIB2_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIB2_STATIC_LDFLAGS:INTERNAL=-lglib-2.0 -GLIB2_STATIC_LDFLAGS_OTHER:INTERNAL= -GLIB2_STATIC_LIBDIR:INTERNAL= -GLIB2_STATIC_LIBRARIES:INTERNAL=glib-2.0 -GLIB2_STATIC_LIBRARY_DIRS:INTERNAL= -GLIB2_STATIC_LIBS:INTERNAL= -GLIB2_STATIC_LIBS_L:INTERNAL= -GLIB2_STATIC_LIBS_OTHER:INTERNAL= -GLIB2_STATIC_LIBS_PATHS:INTERNAL= -GLIB2_VERSION:INTERNAL=2.18.2 -GLIB2_glib-2.0_INCLUDEDIR:INTERNAL= -GLIB2_glib-2.0_LIBDIR:INTERNAL= -GLIB2_glib-2.0_PREFIX:INTERNAL= -GLIB2_glib-2.0_VERSION:INTERNAL= -GLIBMM_CFLAGS:INTERNAL=-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIBMM_CFLAGS_I:INTERNAL= -GLIBMM_CFLAGS_OTHER:INTERNAL= -GLIBMM_FOUND:INTERNAL=1 -GLIBMM_INCLUDEDIR:INTERNAL=/usr/include -GLIBMM_INCLUDE_DIRS:INTERNAL=/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIBMM_LDFLAGS:INTERNAL=-lglibmm-2.4;-lgobject-2.0;-lsigc-2.0;-lglib-2.0 -GLIBMM_LDFLAGS_OTHER:INTERNAL= -GLIBMM_LIBDIR:INTERNAL=/usr/lib -GLIBMM_LIBRARIES:INTERNAL=glibmm-2.4;gobject-2.0;sigc-2.0;glib-2.0 -GLIBMM_LIBRARY_DIRS:INTERNAL= -GLIBMM_LIBS:INTERNAL= -GLIBMM_LIBS_L:INTERNAL= -GLIBMM_LIBS_OTHER:INTERNAL= -GLIBMM_LIBS_PATHS:INTERNAL= -GLIBMM_PREFIX:INTERNAL=/usr -GLIBMM_STATIC_CFLAGS:INTERNAL=-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIBMM_STATIC_CFLAGS_I:INTERNAL= -GLIBMM_STATIC_CFLAGS_OTHER:INTERNAL= -GLIBMM_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIBMM_STATIC_LDFLAGS:INTERNAL=-lglibmm-2.4;-lgobject-2.0;-lsigc-2.0;-lglib-2.0 -GLIBMM_STATIC_LDFLAGS_OTHER:INTERNAL= -GLIBMM_STATIC_LIBDIR:INTERNAL= -GLIBMM_STATIC_LIBRARIES:INTERNAL=glibmm-2.4;gobject-2.0;sigc-2.0;glib-2.0 -GLIBMM_STATIC_LIBRARY_DIRS:INTERNAL= -GLIBMM_STATIC_LIBS:INTERNAL= -GLIBMM_STATIC_LIBS_L:INTERNAL= -GLIBMM_STATIC_LIBS_OTHER:INTERNAL= -GLIBMM_STATIC_LIBS_PATHS:INTERNAL= -GLIBMM_VERSION:INTERNAL=2.18.1 -GLIBMM_glibmm-2.4_INCLUDEDIR:INTERNAL= -GLIBMM_glibmm-2.4_LIBDIR:INTERNAL= -GLIBMM_glibmm-2.4_PREFIX:INTERNAL= -GLIBMM_glibmm-2.4_VERSION:INTERNAL= -//Advanced flag for variable: PKG_CONFIG_EXECUTABLE -PKG_CONFIG_EXECUTABLE-ADVANCED:INTERNAL=1 -SIGC_CFLAGS:INTERNAL=-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include -SIGC_CFLAGS_I:INTERNAL= -SIGC_CFLAGS_OTHER:INTERNAL= -SIGC_FOUND:INTERNAL=1 -SIGC_INCLUDEDIR:INTERNAL=/usr/include -SIGC_INCLUDE_DIRS:INTERNAL=/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include -SIGC_LDFLAGS:INTERNAL=-lsigc-2.0 -SIGC_LDFLAGS_OTHER:INTERNAL= -SIGC_LIBDIR:INTERNAL=/usr/lib -SIGC_LIBRARIES:INTERNAL=sigc-2.0 -SIGC_LIBRARY_DIRS:INTERNAL= -SIGC_LIBS:INTERNAL= -SIGC_LIBS_L:INTERNAL= -SIGC_LIBS_OTHER:INTERNAL= -SIGC_LIBS_PATHS:INTERNAL= -SIGC_PREFIX:INTERNAL=/usr -SIGC_STATIC_CFLAGS:INTERNAL=-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include -SIGC_STATIC_CFLAGS_I:INTERNAL= -SIGC_STATIC_CFLAGS_OTHER:INTERNAL= -SIGC_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include -SIGC_STATIC_LDFLAGS:INTERNAL=-lsigc-2.0 -SIGC_STATIC_LDFLAGS_OTHER:INTERNAL= -SIGC_STATIC_LIBDIR:INTERNAL= -SIGC_STATIC_LIBRARIES:INTERNAL=sigc-2.0 -SIGC_STATIC_LIBRARY_DIRS:INTERNAL= -SIGC_STATIC_LIBS:INTERNAL= -SIGC_STATIC_LIBS_L:INTERNAL= -SIGC_STATIC_LIBS_OTHER:INTERNAL= -SIGC_STATIC_LIBS_PATHS:INTERNAL= -SIGC_VERSION:INTERNAL=2.0.18 -SIGC_sigc++-2.0_INCLUDEDIR:INTERNAL= -SIGC_sigc++-2.0_LIBDIR:INTERNAL= -SIGC_sigc++-2.0_PREFIX:INTERNAL= -SIGC_sigc++-2.0_VERSION:INTERNAL= -__pkg_config_checked_GLIB2:INTERNAL=1 -__pkg_config_checked_GLIBMM:INTERNAL=1 -__pkg_config_checked_SIGC:INTERNAL=1 - diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt index f07fd960c..c81a1e8b0 100755 --- a/rtengine/CMakeLists.txt +++ b/rtengine/CMakeLists.txt @@ -1,42 +1,50 @@ -cmake_minimum_required(VERSION 2.6) find_package(PkgConfig) -pkg_check_modules (GLIB2 glib-2.0>=2.16) -pkg_check_modules (GLIBMM glibmm-2.4>=2.16) -pkg_check_modules (SIGC sigc++-2.0) +pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.16) +pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16) +pkg_check_modules (GOBJECT REQUIRED gobject-2.0>=2.16) +pkg_check_modules (GLIBMM REQUIRED glibmm-2.4>=2.16) +pkg_check_modules (SIGC REQUIRED sigc++-2.0) IF (WIN32) - SET (EXTRA_LIBDIR "../lib; ../rawzor_win") - SET (EXTRA_INCDIR "../winclude; ../rawzor_win") - SET (EXTRA_LIB "ws2_32 ../lib/libiptcdata.a ../lib/libjpeg.a ../lib/libpng.a ../lib/libtiff.a ../lib/libz.a ../rawzor_win/rwz_sdk_s.a") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") + SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a") + if (WITH_RAWZOR) ADD_DEFINITIONS (-DRAWZOR_SUPPORT) + SET (EXTRA_LIB "${EXTRA_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a") + endif (WITH_RAWZOR) ELSE (WIN32) + if (WITH_RAWZOR) IF (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET (EXTRA_INCDIR "../rawzor_lin32") - SET (EXTRA_LIBDIR "../rawzor_lin32") + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8) - SET (EXTRA_INCDIR "../rawzor_lin64") - SET (EXTRA_LIBDIR "../rawzor_lin64") + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET (EXTRA_LIB "iptcdata -lrwz_sdk") + SET (EXTRA_LIB "-lrwz_sdk") ADD_DEFINITIONS (-DRAWZOR_SUPPORT) + endif (WITH_RAWZOR) + pkg_check_modules (IPTCDATA REQUIRED libiptcdata) + pkg_check_modules (LCMS REQUIRED lcms) ENDIF (WIN32) -include_directories (. ../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}) -link_directories (../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS}) +include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS}) +link_directories (${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_LIBDIR} ${GTHREAD_LIBRARY_DIRS} ${GOBJECT_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} ${IPTCDATA_LIBRARY_DIRS} ${LCMS_LIBRARY_DIRS}) add_library (rtengine SHARED colortemp.cc curves.cc dcraw.cc gauss.cc iccstore.cc image8.cc image16.cc imagedata.cc imageio.cc improcfun.cc init.cc dcrop.cc loadinitial.cc procparams.cc rawimagesource.cc shmap.cc simpleprocess.cc refreshmap.cc stdimagesource.cc myfile.cc iccjpeg.c hlmultipliers.cc improccoordinator.cc - helpers.cc processingjob.cc rtthumbnail.cc utils.cc hlmultipliers.cc bilateral2.cc) + helpers.cc processingjob.cc rtthumbnail.cc utils.cc bilateral2.cc) set_target_properties (rtengine PROPERTIES COMPILE_FLAGS "-O3 -ffast-math -fexpensive-optimizations -funroll-loops -msse") #add_executable (rtcmd rtetest.cc) #add_executable (ppmap pparamsmap.cc) -target_link_libraries (rtengine rtexif lcms ${EXTRA_LIB} gthread-2.0 gobject-2.0 ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES}) +target_link_libraries (rtengine rtexif ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES} ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES}) #target_link_libraries (rtcmd rtengine) #target_link_libraries (ppmap rtengine) diff --git a/rtengine/bilateral2.h b/rtengine/bilateral2.h index 4aea99d23..1ba7d0eac 100755 --- a/rtengine/bilateral2.h +++ b/rtengine/bilateral2.h @@ -25,9 +25,7 @@ #include #include #include - -#define MAX(a,b) ((a)<(b)?(b):(a)) -#define MIN(a,b) ((a)>(b)?(b):(a)) +#include #define ELEM(a,b) (src[i-a][j-b] * ec[src[i-a][j-b]-src[i][j]+0x10000]) #define SULY(a,b) (ec[src[i-a][j-b]-src[i][j]+0x10000]) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index dc5777794..305749325 100755 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -25,6 +25,7 @@ /*RT*/int ciff_base, ciff_len, exif_base, pre_filters; /*RT*/#undef MAX /*RT*/#undef MIN +/*RT*/#undef ABS /*RT*/#define NO_LCMS /*RT*/#define NO_JPEG /*RT*/#define LOCALTIME diff --git a/rtengine/hlmultipliers.cc b/rtengine/hlmultipliers.cc index ea44742ba..eafa43d62 100755 --- a/rtengine/hlmultipliers.cc +++ b/rtengine/hlmultipliers.cc @@ -20,8 +20,6 @@ #include #include -#define MAX(a,b) ((a)<(b)?(b):(a)) - #define MAXVAL 0xffff #define CLIP(a) ((a)>0?((a) #include #include +#ifdef RAWZOR_SUPPORT #include +#endif using namespace rtengine; diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc index e1d2ac79d..5202870f1 100755 --- a/rtengine/myfile.cc +++ b/rtengine/myfile.cc @@ -19,7 +19,9 @@ #include #include #include +#ifdef RAWZOR_SUPPORT #include +#endif IMFILE* fopen (const char* fname) { diff --git a/rtengine/rtcmd b/rtengine/rtcmd deleted file mode 100755 index 1c30444dfe9107b35b2ef9bdee64918fff53af4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31928 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 diff --git a/rtgui/CMakeCache.txt b/rtgui/CMakeCache.txt deleted file mode 100755 index 401913732..000000000 --- a/rtgui/CMakeCache.txt +++ /dev/null @@ -1,503 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: /home/hgabor/RawTherapee/2.5/gui88/rtgui -# It was generated by CMake: /usr/bin/cmake -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a variable in the cache. -# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//Path to a program. -CMAKE_AR:FILEPATH=/usr/bin/ar - -//For backwards compatibility, what version of CMake commands and -// syntax should this version of CMake try to support. -CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4 - -//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or -// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. -CMAKE_BUILD_TYPE:STRING= - -//Enable/Disable color output during build. -CMAKE_COLOR_MAKEFILE:BOOL=ON - -//CXX compiler. -CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++ - -//Flags used by the compiler during all build types. -CMAKE_CXX_FLAGS:STRING= - -//Flags used by the compiler during debug builds. -CMAKE_CXX_FLAGS_DEBUG:STRING=-g - -//Flags used by the compiler during release minsize builds. -CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG - -//Flags used by the compiler during release builds (/MD /Ob1 /Oi -// /Ot /Oy /Gs will produce slightly less optimized but smaller -// files). -CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG - -//Flags used by the compiler during Release with Debug Info builds. -CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g - -//C compiler. -CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc - -//Flags used by the compiler during all build types. -CMAKE_C_FLAGS:STRING= - -//Flags used by the compiler during debug builds. -CMAKE_C_FLAGS_DEBUG:STRING=-g - -//Flags used by the compiler during release minsize builds. -CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG - -//Flags used by the compiler during release builds (/MD /Ob1 /Oi -// /Ot /Oy /Gs will produce slightly less optimized but smaller -// files). -CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG - -//Flags used by the compiler during Release with Debug Info builds. -CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g - -//Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING= - -//Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//Install path prefix, prepended onto install directories. -CMAKE_INSTALL_PREFIX:PATH=/usr/local - -//Path to a program. -CMAKE_LINKER:FILEPATH=/usr/bin/ld - -//Path to a program. -CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make - -//Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING= - -//Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//Path to a program. -CMAKE_NM:FILEPATH=/usr/bin/nm - -//Path to a program. -CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy - -//Path to a program. -CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump - -//Path to a program. -CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib - -//Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING= - -//Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= - -//Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= - -//Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= - -//Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= - -//If set, runtime paths are not added when using shared libraries. -CMAKE_SKIP_RPATH:BOOL=NO - -//Path to a program. -CMAKE_STRIP:FILEPATH=/usr/bin/strip - -//If true, cmake will use relative paths in makefiles and projects. -CMAKE_USE_RELATIVE_PATHS:BOOL=OFF - -//If this value is on, makefiles will be generated without the -// .SILENT directive, and all commands will be echoed to the console -// during the make. This is useful for debugging only. With Visual -// Studio IDE projects all commands are done without /nologo. -CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE - -//Single output directory for building all executables. -EXECUTABLE_OUTPUT_PATH:PATH= - -//Single output directory for building all libraries. -LIBRARY_OUTPUT_PATH:PATH= - -//pkg-config executable -PKG_CONFIG_EXECUTABLE:FILEPATH=/usr/bin/pkg-config - -//Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/hgabor/RawTherapee/2.5/gui88/rtgui - -//Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/hgabor/RawTherapee/2.5/gui88/rtgui - - -######################## -# INTERNAL cache entries -######################## - -//Advanced flag for variable: CMAKE_AR -CMAKE_AR-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_BUILD_TOOL -CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 -//What is the target build tool cmake is generating for. -CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make -//This is the directory where this CMakeCahe.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/hgabor/RawTherapee/2.5/gui88/rtgui -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 -//Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 0 -//Advanced flag for variable: CMAKE_COLOR_MAKEFILE -CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 -//Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/usr/bin/cmake -//Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack -//Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest -//Advanced flag for variable: CMAKE_CXX_COMPILER -CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 -CMAKE_CXX_COMPILER_WORKS:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS -CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_DEBUG -CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_MINSIZEREL -CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_RELEASE -CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO -CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_COMPILER -CMAKE_C_COMPILER-ADVANCED:INTERNAL=1 -CMAKE_C_COMPILER_WORKS:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS -CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_DEBUG -CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_MINSIZEREL -CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_RELEASE -CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_C_FLAGS_RELWITHDEBINFO -CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Result of TRY_COMPILE -CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE -//Result of TRY_COMPILE -CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE -//Path to cache edit program executable. -CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake -//Executable file format -CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS -CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG -CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE -CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Name of generator. -CMAKE_GENERATOR:INTERNAL=Unix Makefiles -//Start directory with the top level CMakeLists.txt file for this -// project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/hgabor/RawTherapee/2.5/gui88/rtgui -//Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 -//Advanced flag for variable: CMAKE_LINKER -CMAKE_LINKER-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MAKE_PROGRAM -CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS -CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG -CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE -CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_NM -CMAKE_NM-ADVANCED:INTERNAL=1 -//number of local generators -CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=1 -//Advanced flag for variable: CMAKE_OBJCOPY -CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_OBJDUMP -CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_RANLIB -CMAKE_RANLIB-ADVANCED:INTERNAL=1 -//Path to CMake installation. -CMAKE_ROOT:INTERNAL=/usr/share/cmake-2.6 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS -CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG -CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE -CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_SKIP_RPATH -CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_STRIP -CMAKE_STRIP-ADVANCED:INTERNAL=1 -//uname command -CMAKE_UNAME:INTERNAL=/bin/uname -//Advanced flag for variable: CMAKE_USE_RELATIVE_PATHS -CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1 -//Advanced flag for variable: CMAKE_VERBOSE_MAKEFILE -CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 -GIOMM_CFLAGS:INTERNAL=-I/usr/include/giomm-2.4;-I/usr/lib/giomm-2.4/include;-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include -GIOMM_CFLAGS_I:INTERNAL= -GIOMM_CFLAGS_OTHER:INTERNAL= -GIOMM_FOUND:INTERNAL=1 -GIOMM_INCLUDEDIR:INTERNAL=/usr/include -GIOMM_INCLUDE_DIRS:INTERNAL=/usr/include/giomm-2.4;/usr/lib/giomm-2.4/include;/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include -GIOMM_LDFLAGS:INTERNAL=-lgiomm-2.4;-lgio-2.0;-lglibmm-2.4;-lgmodule-2.0;-lgobject-2.0;-lsigc-2.0;-lglib-2.0 -GIOMM_LDFLAGS_OTHER:INTERNAL= -GIOMM_LIBDIR:INTERNAL=/usr/lib -GIOMM_LIBRARIES:INTERNAL=giomm-2.4;gio-2.0;glibmm-2.4;gmodule-2.0;gobject-2.0;sigc-2.0;glib-2.0 -GIOMM_LIBRARY_DIRS:INTERNAL= -GIOMM_LIBS:INTERNAL= -GIOMM_LIBS_L:INTERNAL= -GIOMM_LIBS_OTHER:INTERNAL= -GIOMM_LIBS_PATHS:INTERNAL= -GIOMM_PREFIX:INTERNAL=/usr -GIOMM_STATIC_CFLAGS:INTERNAL=-I/usr/include/giomm-2.4;-I/usr/lib/giomm-2.4/include;-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include -GIOMM_STATIC_CFLAGS_I:INTERNAL= -GIOMM_STATIC_CFLAGS_OTHER:INTERNAL= -GIOMM_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/giomm-2.4;/usr/lib/giomm-2.4/include;/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include -GIOMM_STATIC_LDFLAGS:INTERNAL=-lgiomm-2.4;-lgio-2.0;-lglibmm-2.4;-lgmodule-2.0;-ldl;-lgobject-2.0;-lsigc-2.0;-lglib-2.0 -GIOMM_STATIC_LDFLAGS_OTHER:INTERNAL= -GIOMM_STATIC_LIBDIR:INTERNAL= -GIOMM_STATIC_LIBRARIES:INTERNAL=giomm-2.4;gio-2.0;glibmm-2.4;gmodule-2.0;dl;gobject-2.0;sigc-2.0;glib-2.0 -GIOMM_STATIC_LIBRARY_DIRS:INTERNAL= -GIOMM_STATIC_LIBS:INTERNAL= -GIOMM_STATIC_LIBS_L:INTERNAL= -GIOMM_STATIC_LIBS_OTHER:INTERNAL= -GIOMM_STATIC_LIBS_PATHS:INTERNAL= -GIOMM_VERSION:INTERNAL=2.18.1 -GIOMM_giomm-2.4_INCLUDEDIR:INTERNAL= -GIOMM_giomm-2.4_LIBDIR:INTERNAL= -GIOMM_giomm-2.4_PREFIX:INTERNAL= -GIOMM_giomm-2.4_VERSION:INTERNAL= -GIO_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GIO_CFLAGS_I:INTERNAL= -GIO_CFLAGS_OTHER:INTERNAL= -GIO_FOUND:INTERNAL=1 -GIO_INCLUDEDIR:INTERNAL=/usr/include -GIO_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GIO_LDFLAGS:INTERNAL=-lgio-2.0;-lgobject-2.0;-lgmodule-2.0;-lglib-2.0 -GIO_LDFLAGS_OTHER:INTERNAL= -GIO_LIBDIR:INTERNAL=/usr/lib -GIO_LIBRARIES:INTERNAL=gio-2.0;gobject-2.0;gmodule-2.0;glib-2.0 -GIO_LIBRARY_DIRS:INTERNAL= -GIO_LIBS:INTERNAL= -GIO_LIBS_L:INTERNAL= -GIO_LIBS_OTHER:INTERNAL= -GIO_LIBS_PATHS:INTERNAL= -GIO_PREFIX:INTERNAL=/usr -GIO_STATIC_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GIO_STATIC_CFLAGS_I:INTERNAL= -GIO_STATIC_CFLAGS_OTHER:INTERNAL= -GIO_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GIO_STATIC_LDFLAGS:INTERNAL=-lgio-2.0;-lgobject-2.0;-lgmodule-2.0;-ldl;-lglib-2.0 -GIO_STATIC_LDFLAGS_OTHER:INTERNAL= -GIO_STATIC_LIBDIR:INTERNAL= -GIO_STATIC_LIBRARIES:INTERNAL=gio-2.0;gobject-2.0;gmodule-2.0;dl;glib-2.0 -GIO_STATIC_LIBRARY_DIRS:INTERNAL= -GIO_STATIC_LIBS:INTERNAL= -GIO_STATIC_LIBS_L:INTERNAL= -GIO_STATIC_LIBS_OTHER:INTERNAL= -GIO_STATIC_LIBS_PATHS:INTERNAL= -GIO_VERSION:INTERNAL=2.18.2 -GIO_gio-2.0_INCLUDEDIR:INTERNAL= -GIO_gio-2.0_LIBDIR:INTERNAL= -GIO_gio-2.0_PREFIX:INTERNAL= -GIO_gio-2.0_VERSION:INTERNAL= -GLIB2_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIB2_CFLAGS_I:INTERNAL= -GLIB2_CFLAGS_OTHER:INTERNAL= -GLIB2_FOUND:INTERNAL=1 -GLIB2_INCLUDEDIR:INTERNAL=/usr/include -GLIB2_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIB2_LDFLAGS:INTERNAL=-lglib-2.0 -GLIB2_LDFLAGS_OTHER:INTERNAL= -GLIB2_LIBDIR:INTERNAL=/usr/lib -GLIB2_LIBRARIES:INTERNAL=glib-2.0 -GLIB2_LIBRARY_DIRS:INTERNAL= -GLIB2_LIBS:INTERNAL= -GLIB2_LIBS_L:INTERNAL= -GLIB2_LIBS_OTHER:INTERNAL= -GLIB2_LIBS_PATHS:INTERNAL= -GLIB2_PREFIX:INTERNAL=/usr -GLIB2_STATIC_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIB2_STATIC_CFLAGS_I:INTERNAL= -GLIB2_STATIC_CFLAGS_OTHER:INTERNAL= -GLIB2_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIB2_STATIC_LDFLAGS:INTERNAL=-lglib-2.0 -GLIB2_STATIC_LDFLAGS_OTHER:INTERNAL= -GLIB2_STATIC_LIBDIR:INTERNAL= -GLIB2_STATIC_LIBRARIES:INTERNAL=glib-2.0 -GLIB2_STATIC_LIBRARY_DIRS:INTERNAL= -GLIB2_STATIC_LIBS:INTERNAL= -GLIB2_STATIC_LIBS_L:INTERNAL= -GLIB2_STATIC_LIBS_OTHER:INTERNAL= -GLIB2_STATIC_LIBS_PATHS:INTERNAL= -GLIB2_VERSION:INTERNAL=2.18.2 -GLIB2_glib-2.0_INCLUDEDIR:INTERNAL= -GLIB2_glib-2.0_LIBDIR:INTERNAL= -GLIB2_glib-2.0_PREFIX:INTERNAL= -GLIB2_glib-2.0_VERSION:INTERNAL= -GLIBMM_CFLAGS:INTERNAL=-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIBMM_CFLAGS_I:INTERNAL= -GLIBMM_CFLAGS_OTHER:INTERNAL= -GLIBMM_FOUND:INTERNAL=1 -GLIBMM_INCLUDEDIR:INTERNAL=/usr/include -GLIBMM_INCLUDE_DIRS:INTERNAL=/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIBMM_LDFLAGS:INTERNAL=-lglibmm-2.4;-lgobject-2.0;-lsigc-2.0;-lglib-2.0 -GLIBMM_LDFLAGS_OTHER:INTERNAL= -GLIBMM_LIBDIR:INTERNAL=/usr/lib -GLIBMM_LIBRARIES:INTERNAL=glibmm-2.4;gobject-2.0;sigc-2.0;glib-2.0 -GLIBMM_LIBRARY_DIRS:INTERNAL= -GLIBMM_LIBS:INTERNAL= -GLIBMM_LIBS_L:INTERNAL= -GLIBMM_LIBS_OTHER:INTERNAL= -GLIBMM_LIBS_PATHS:INTERNAL= -GLIBMM_PREFIX:INTERNAL=/usr -GLIBMM_STATIC_CFLAGS:INTERNAL=-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include -GLIBMM_STATIC_CFLAGS_I:INTERNAL= -GLIBMM_STATIC_CFLAGS_OTHER:INTERNAL= -GLIBMM_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include -GLIBMM_STATIC_LDFLAGS:INTERNAL=-lglibmm-2.4;-lgobject-2.0;-lsigc-2.0;-lglib-2.0 -GLIBMM_STATIC_LDFLAGS_OTHER:INTERNAL= -GLIBMM_STATIC_LIBDIR:INTERNAL= -GLIBMM_STATIC_LIBRARIES:INTERNAL=glibmm-2.4;gobject-2.0;sigc-2.0;glib-2.0 -GLIBMM_STATIC_LIBRARY_DIRS:INTERNAL= -GLIBMM_STATIC_LIBS:INTERNAL= -GLIBMM_STATIC_LIBS_L:INTERNAL= -GLIBMM_STATIC_LIBS_OTHER:INTERNAL= -GLIBMM_STATIC_LIBS_PATHS:INTERNAL= -GLIBMM_VERSION:INTERNAL=2.18.1 -GLIBMM_glibmm-2.4_INCLUDEDIR:INTERNAL= -GLIBMM_glibmm-2.4_LIBDIR:INTERNAL= -GLIBMM_glibmm-2.4_PREFIX:INTERNAL= -GLIBMM_glibmm-2.4_VERSION:INTERNAL= -GTKMM_CFLAGS:INTERNAL=-I/usr/include/gtkmm-2.4;-I/usr/lib/gtkmm-2.4/include;-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/giomm-2.4;-I/usr/lib/giomm-2.4/include;-I/usr/include/gdkmm-2.4;-I/usr/lib/gdkmm-2.4/include;-I/usr/include/pangomm-1.4;-I/usr/include/atkmm-1.6;-I/usr/include/gtk-2.0;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/lib/gtk-2.0/include;-I/usr/include/cairomm-1.0;-I/usr/include/pango-1.0;-I/usr/include/cairo;-I/usr/include/pixman-1;-I/usr/include/freetype2;-I/usr/include/libpng12;-I/usr/include/atk-1.0 -GTKMM_CFLAGS_I:INTERNAL= -GTKMM_CFLAGS_OTHER:INTERNAL= -GTKMM_FOUND:INTERNAL=1 -GTKMM_INCLUDEDIR:INTERNAL=/usr/include -GTKMM_INCLUDE_DIRS:INTERNAL=/usr/include/gtkmm-2.4;/usr/lib/gtkmm-2.4/include;/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/giomm-2.4;/usr/lib/giomm-2.4/include;/usr/include/gdkmm-2.4;/usr/lib/gdkmm-2.4/include;/usr/include/pangomm-1.4;/usr/include/atkmm-1.6;/usr/include/gtk-2.0;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairomm-1.0;/usr/include/pango-1.0;/usr/include/cairo;/usr/include/pixman-1;/usr/include/freetype2;/usr/include/libpng12;/usr/include/atk-1.0 -GTKMM_LDFLAGS:INTERNAL=-lgtkmm-2.4;-lgiomm-2.4;-lgdkmm-2.4;-latkmm-1.6;-lgtk-x11-2.0;-lpangomm-1.4;-lcairomm-1.0;-lglibmm-2.4;-lsigc-2.0;-lgdk-x11-2.0;-latk-1.0;-lpangoft2-1.0;-lgdk_pixbuf-2.0;-lm;-lpangocairo-1.0;-lgio-2.0;-lcairo;-lpango-1.0;-lfreetype;-lz;-lfontconfig;-lgobject-2.0;-lgmodule-2.0;-lglib-2.0 -GTKMM_LDFLAGS_OTHER:INTERNAL= -GTKMM_LIBDIR:INTERNAL=/usr/lib -GTKMM_LIBRARIES:INTERNAL=gtkmm-2.4;giomm-2.4;gdkmm-2.4;atkmm-1.6;gtk-x11-2.0;pangomm-1.4;cairomm-1.0;glibmm-2.4;sigc-2.0;gdk-x11-2.0;atk-1.0;pangoft2-1.0;gdk_pixbuf-2.0;m;pangocairo-1.0;gio-2.0;cairo;pango-1.0;freetype;z;fontconfig;gobject-2.0;gmodule-2.0;glib-2.0 -GTKMM_LIBRARY_DIRS:INTERNAL= -GTKMM_LIBS:INTERNAL= -GTKMM_LIBS_L:INTERNAL= -GTKMM_LIBS_OTHER:INTERNAL= -GTKMM_LIBS_PATHS:INTERNAL= -GTKMM_PREFIX:INTERNAL=/usr -GTKMM_STATIC_CFLAGS:INTERNAL=-I/usr/include/gtkmm-2.4;-I/usr/lib/gtkmm-2.4/include;-I/usr/include/glibmm-2.4;-I/usr/lib/glibmm-2.4/include;-I/usr/include/giomm-2.4;-I/usr/lib/giomm-2.4/include;-I/usr/include/gdkmm-2.4;-I/usr/lib/gdkmm-2.4/include;-I/usr/include/pangomm-1.4;-I/usr/include/atkmm-1.6;-I/usr/include/gtk-2.0;-I/usr/include/sigc++-2.0;-I/usr/lib/sigc++-2.0/include;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/lib/gtk-2.0/include;-I/usr/include/cairomm-1.0;-I/usr/include/pango-1.0;-I/usr/include/cairo;-I/usr/include/pixman-1;-I/usr/include/freetype2;-I/usr/include/libpng12;-I/usr/include/atk-1.0 -GTKMM_STATIC_CFLAGS_I:INTERNAL= -GTKMM_STATIC_CFLAGS_OTHER:INTERNAL= -GTKMM_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/gtkmm-2.4;/usr/lib/gtkmm-2.4/include;/usr/include/glibmm-2.4;/usr/lib/glibmm-2.4/include;/usr/include/giomm-2.4;/usr/lib/giomm-2.4/include;/usr/include/gdkmm-2.4;/usr/lib/gdkmm-2.4/include;/usr/include/pangomm-1.4;/usr/include/atkmm-1.6;/usr/include/gtk-2.0;/usr/include/sigc++-2.0;/usr/lib/sigc++-2.0/include;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairomm-1.0;/usr/include/pango-1.0;/usr/include/cairo;/usr/include/pixman-1;/usr/include/freetype2;/usr/include/libpng12;/usr/include/atk-1.0 -GTKMM_STATIC_LDFLAGS:INTERNAL=-lgtkmm-2.4;-lgiomm-2.4;-lgdkmm-2.4;-latkmm-1.6;-lgtk-x11-2.0;-lpangomm-1.4;-lcairomm-1.0;-lglibmm-2.4;-lsigc-2.0;-lgdk-x11-2.0;-latk-1.0;-lpangoft2-1.0;-lXinerama;-lXi;-lXrandr;-lXcursor;-lXcomposite;-lXdamage;-lgdk_pixbuf-2.0;-ltiff;-ljpeg;-lpangocairo-1.0;-lgio-2.0;-lXext;-lXfixes;-lcairo;-lm;-lpixman-1;-lpng12;-lxcb-render-util;-lXrender;-lxcb-render;-lX11;-lpthread;-lxcb-xlib;-lxcb;-lXau;-lXdmcp;-lpango-1.0;-lfontconfig;-lexpat;-lfreetype;-lz;-lgobject-2.0;-lgmodule-2.0;-ldl;-lglib-2.0 -GTKMM_STATIC_LDFLAGS_OTHER:INTERNAL= -GTKMM_STATIC_LIBDIR:INTERNAL= -GTKMM_STATIC_LIBRARIES:INTERNAL=gtkmm-2.4;giomm-2.4;gdkmm-2.4;atkmm-1.6;gtk-x11-2.0;pangomm-1.4;cairomm-1.0;glibmm-2.4;sigc-2.0;gdk-x11-2.0;atk-1.0;pangoft2-1.0;Xinerama;Xi;Xrandr;Xcursor;Xcomposite;Xdamage;gdk_pixbuf-2.0;tiff;jpeg;pangocairo-1.0;gio-2.0;Xext;Xfixes;cairo;m;pixman-1;png12;xcb-render-util;Xrender;xcb-render;X11;pthread;xcb-xlib;xcb;Xau;Xdmcp;pango-1.0;fontconfig;expat;freetype;z;gobject-2.0;gmodule-2.0;dl;glib-2.0 -GTKMM_STATIC_LIBRARY_DIRS:INTERNAL= -GTKMM_STATIC_LIBS:INTERNAL= -GTKMM_STATIC_LIBS_L:INTERNAL= -GTKMM_STATIC_LIBS_OTHER:INTERNAL= -GTKMM_STATIC_LIBS_PATHS:INTERNAL= -GTKMM_VERSION:INTERNAL=2.14.1 -GTKMM_gtkmm-2.4_INCLUDEDIR:INTERNAL= -GTKMM_gtkmm-2.4_LIBDIR:INTERNAL= -GTKMM_gtkmm-2.4_PREFIX:INTERNAL= -GTKMM_gtkmm-2.4_VERSION:INTERNAL= -GTK_CFLAGS:INTERNAL=-I/usr/include/gtk-2.0;-I/usr/lib/gtk-2.0/include;-I/usr/include/atk-1.0;-I/usr/include/cairo;-I/usr/include/pango-1.0;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/pixman-1;-I/usr/include/freetype2;-I/usr/include/libpng12 -GTK_CFLAGS_I:INTERNAL= -GTK_CFLAGS_OTHER:INTERNAL= -GTK_FOUND:INTERNAL=1 -GTK_INCLUDEDIR:INTERNAL=/usr/include -GTK_INCLUDE_DIRS:INTERNAL=/usr/include/gtk-2.0;/usr/lib/gtk-2.0/include;/usr/include/atk-1.0;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/pixman-1;/usr/include/freetype2;/usr/include/libpng12 -GTK_LDFLAGS:INTERNAL=-lgtk-x11-2.0;-lgdk-x11-2.0;-latk-1.0;-lpangoft2-1.0;-lgdk_pixbuf-2.0;-lm;-lpangocairo-1.0;-lgio-2.0;-lcairo;-lpango-1.0;-lfreetype;-lz;-lfontconfig;-lgobject-2.0;-lgmodule-2.0;-lglib-2.0 -GTK_LDFLAGS_OTHER:INTERNAL= -GTK_LIBDIR:INTERNAL=/usr/lib -GTK_LIBRARIES:INTERNAL=gtk-x11-2.0;gdk-x11-2.0;atk-1.0;pangoft2-1.0;gdk_pixbuf-2.0;m;pangocairo-1.0;gio-2.0;cairo;pango-1.0;freetype;z;fontconfig;gobject-2.0;gmodule-2.0;glib-2.0 -GTK_LIBRARY_DIRS:INTERNAL= -GTK_LIBS:INTERNAL= -GTK_LIBS_L:INTERNAL= -GTK_LIBS_OTHER:INTERNAL= -GTK_LIBS_PATHS:INTERNAL= -GTK_PREFIX:INTERNAL=/usr -GTK_STATIC_CFLAGS:INTERNAL=-I/usr/include/gtk-2.0;-I/usr/lib/gtk-2.0/include;-I/usr/include/atk-1.0;-I/usr/include/cairo;-I/usr/include/pango-1.0;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/pixman-1;-I/usr/include/freetype2;-I/usr/include/libpng12 -GTK_STATIC_CFLAGS_I:INTERNAL= -GTK_STATIC_CFLAGS_OTHER:INTERNAL= -GTK_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/gtk-2.0;/usr/lib/gtk-2.0/include;/usr/include/atk-1.0;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/pixman-1;/usr/include/freetype2;/usr/include/libpng12 -GTK_STATIC_LDFLAGS:INTERNAL=-lgtk-x11-2.0;-lgdk-x11-2.0;-latk-1.0;-lpangoft2-1.0;-lXinerama;-lXi;-lXrandr;-lXcursor;-lXcomposite;-lXdamage;-lgdk_pixbuf-2.0;-ltiff;-ljpeg;-lpangocairo-1.0;-lgio-2.0;-lXext;-lXfixes;-lcairo;-lm;-lpixman-1;-lpng12;-lxcb-render-util;-lXrender;-lxcb-render;-lX11;-lpthread;-lxcb-xlib;-lxcb;-lXau;-lXdmcp;-lpango-1.0;-lfontconfig;-lexpat;-lfreetype;-lz;-lgobject-2.0;-lgmodule-2.0;-ldl;-lglib-2.0 -GTK_STATIC_LDFLAGS_OTHER:INTERNAL= -GTK_STATIC_LIBDIR:INTERNAL= -GTK_STATIC_LIBRARIES:INTERNAL=gtk-x11-2.0;gdk-x11-2.0;atk-1.0;pangoft2-1.0;Xinerama;Xi;Xrandr;Xcursor;Xcomposite;Xdamage;gdk_pixbuf-2.0;tiff;jpeg;pangocairo-1.0;gio-2.0;Xext;Xfixes;cairo;m;pixman-1;png12;xcb-render-util;Xrender;xcb-render;X11;pthread;xcb-xlib;xcb;Xau;Xdmcp;pango-1.0;fontconfig;expat;freetype;z;gobject-2.0;gmodule-2.0;dl;glib-2.0 -GTK_STATIC_LIBRARY_DIRS:INTERNAL= -GTK_STATIC_LIBS:INTERNAL= -GTK_STATIC_LIBS_L:INTERNAL= -GTK_STATIC_LIBS_OTHER:INTERNAL= -GTK_STATIC_LIBS_PATHS:INTERNAL= -GTK_VERSION:INTERNAL=2.14.4 -GTK_gtk+-2.0_INCLUDEDIR:INTERNAL= -GTK_gtk+-2.0_LIBDIR:INTERNAL= -GTK_gtk+-2.0_PREFIX:INTERNAL= -GTK_gtk+-2.0_VERSION:INTERNAL= -//Advanced flag for variable: PKG_CONFIG_EXECUTABLE -PKG_CONFIG_EXECUTABLE-ADVANCED:INTERNAL=1 -__pkg_config_checked_GIO:INTERNAL=1 -__pkg_config_checked_GIOMM:INTERNAL=1 -__pkg_config_checked_GLIB2:INTERNAL=1 -__pkg_config_checked_GLIBMM:INTERNAL=1 -__pkg_config_checked_GTK:INTERNAL=1 -__pkg_config_checked_GTKMM:INTERNAL=1 - diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt index 1245c45b0..264c31c5d 100755 --- a/rtgui/CMakeLists.txt +++ b/rtgui/CMakeLists.txt @@ -1,42 +1,42 @@ find_package(PkgConfig) -pkg_check_modules (GLIB2 glib-2.0>=2.16) -pkg_check_modules (GLIBMM glibmm-2.4>=2.16) -pkg_check_modules (GTK gtk+-2.0>=2.12) -pkg_check_modules (GTKMM gtkmm-2.4>=2.12) -pkg_check_modules (GIO gio-2.0>=2.16) -pkg_check_modules (GIOMM giomm-2.4>=2.12) +pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.16) +pkg_check_modules (GLIBMM REQUIRED glibmm-2.4>=2.16) +pkg_check_modules (GTK REQUIRED gtk+-2.0>=2.12) +pkg_check_modules (GTKMM REQUIRED gtkmm-2.4>=2.12) +pkg_check_modules (GIO REQUIRED gio-2.0>=2.16) +pkg_check_modules (GIOMM REQUIRED giomm-2.4>=2.12) -SET (BASESOURCEFILES +SET (BASESOURCEFILES batchtoolpanelcoord.cc paramsedited.cc cropwindow.cc previewhandler.cc previewwindow.cc navigator.cc indclippedpanel.cc filterpanel.cc cursormanager.cc rtwindow.cc renamedlg.cc recentbrowser.cc placesbrowser.cc filepanel.cc editorpanel.cc batchqueuepanel.cc ilabel.cc thumbbrowserbase.cc adjuster.cc filebrowserentry.cc filebrowser.cc filethumbnailbuttonset.cc - cachemanager.cc cacheimagedata.cc + cachemanager.cc cacheimagedata.cc clipboard.cc thumbimageupdater.cc bqentryupdater.cc coarsepanel.cc cacorrection.cc colorshift.cc hlrec.cc chmixer.cc colorboost.cc resize.cc icmpanel.cc crop.cc shadowshighlights.cc - colordenoise.cc - exifpanel.cc - sharpening.cc + colordenoise.cc + exifpanel.cc + sharpening.cc whitebalance.cc vignetting.cc rotate.cc distortion.cc - crophandler.cc curveeditor.cc dirbrowser.cc + crophandler.cc curveeditor.cc dirbrowser.cc filecatalog.cc histogrampanel.cc history.cc imagearea.cc imageareapanel.cc iptcpanel.cc lcurve.cc lumadenoise.cc main.cc multilangmgr.cc mycurve.cc options.cc preferences.cc profilepanel.cc saveasdlg.cc saveformatpanel.cc splash.cc - thumbnail.cc tonecurve.cc toolbar.cc + thumbnail.cc tonecurve.cc toolbar.cc guiutils.cc zoompanel.cc toolpanelcoord.cc thumbbrowserentrybase.cc batchqueueentry.cc - batchqueue.cc lwbutton.cc lwbuttonset.cc + batchqueue.cc lwbutton.cc lwbuttonset.cc batchqueuebuttonset.cc browserfilter.cc exiffiltersettings.cc profilestore.cc partialpastedlg.cc) IF (WIN32) - SET (EXTRA_LIBDIR "../lib") - SET (EXTRA_INCDIR "../winclude") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib") + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude") SET (EXTRA_SRC "windirmonitor.cc myicon.o") SET (EXTRA_LIB "ws2_32") @@ -48,53 +48,79 @@ link_directories (. ../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIB add_executable (rth windirmonitor.cc myicon.o ${BASESOURCEFILES}) -ELSE (WIN32) - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET (EXTRA_INCDIR "../rawzor_lin32") - SET (EXTRA_LIBDIR "../rawzor_lin32") - ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8) - SET (EXTRA_INCDIR "../rawzor_lin64") - SET (EXTRA_LIBDIR "../rawzor_lin64") - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) + set(IPTCDATA_LIBRARIES iptcdata) + set(LCMS_LIBRARIES liblcms.a) + set(GTHREAD_LIBRARIES gthread-2.0) + set(GOBJECTLIBRARIES gobject-2.0) + set(JPEG_LIBRARIES libjpeg.a) + set(ZLIB_LIBRARIES libz.a) + set(TIFF_LIBRARIES libtiff.a) + set(PNG_LIBRARIES libpng.a) -include_directories (/usr/local/lib ../rtengine . ../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} - ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS}) -link_directories (. ../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} - ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS} ${GIOMM_LIBRARY_DIRS}) +ELSE (WIN32) + pkg_check_modules (IPTCDATA REQUIRED libiptcdata) + pkg_check_modules (LCMS REQUIRED lcms) + pkg_check_modules (PNG REQUIRED libpng) + pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16) + pkg_check_modules (GOBJECT REQUIRED gobject-2.0>=2.16) + find_library(JPEG_LIBRARIES NAMES jpeg) + if (NOT JPEG_LIBRARIES) + message(SEND_ERROR "libjpeg was not found!") + endif (NOT JPEG_LIBRARIES) + find_library(TIFF_LIBRARIES NAMES tiff) + if (NOT TIFF_LIBRARIES) + message(SEND_ERROR "libtiff was not found!") + endif (NOT TIFF_LIBRARIES) + find_library(ZLIB_LIBRARIES NAMES z) + if (NOT ZLIB_LIBRARIES) + message(SEND_ERROR "libz was not found!") + endif (NOT ZLIB_LIBRARIES) + if (WITH_RAWZOR) + IF (CMAKE_SIZEOF_VOID_P EQUAL 4) + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") + ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8) + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") + ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) + endif (WITH_RAWZOR) + +include_directories (/usr/local/lib ${CMAKE_CURRENT_SOURCE_DIR}/../rtengine . ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} + ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ) +link_directories (. ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} + ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS} ${GIOMM_LIBRARY_DIRS} ${IPTCDATA_LIBRARY_DIRS} ${LCMS_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS} ${GOBJECT_LIBRARY_DIRS}) add_executable (rth ${BASESOURCEFILES}) ENDIF (WIN32) -set_target_properties (rth PROPERTIES COMPILE_FLAGS "-O3") -target_link_libraries (rth rtengine liblcms.a iptcdata libjpeg.a libpng.a libz.a libtiff.a ${EXTRA_LIB} gthread-2.0 gobject-2.0 - ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES}) +set_target_properties (rth PROPERTIES COMPILE_FLAGS "-O3" OUTPUT_NAME rt) +target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES} + ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES}) IF (WIN32) - install (FILES rth.exe DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - RENAME rt.exe) - install (FILES ../rawzor_win/rwz_sdk_s.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release + install (FILES rth.exe DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) - install (FILES ../options.win DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release + install (FILES ../rawzor_win/rwz_sdk_s.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) + install (FILES ../options.win DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME options) ELSE (WIN32) - install (FILES rth DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - RENAME rt) - install (FILES ../options.lin DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release + install (FILES rt DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) + install (FILES ../options.lin DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME options) - install (FILES ../rtstart DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release + install (FILES ../rtstart DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) IF (CMAKE_SIZEOF_VOID_P EQUAL 4) install (FILES ../rawzor_lin32/librwz_sdk.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME rwz_sdk.so) ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8) install (FILES ../rawzor_lin64/librwz_sdk.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME rwz_sdk.so) ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) ENDIF (WIN32) diff --git a/rtgui/main.cc b/rtgui/main.cc index 13d153e9f..ddc36e69c 100755 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -71,7 +71,10 @@ int main(int argc, char **argv) Options::load (); - Gtk::RC::add_default_file (argv0+"/themes/"+options.theme); +// Gtk::RC::add_default_file (argv0+"/themes/"+options.theme); + std::vector rcfiles; + rcfiles.push_back (argv0+"/themes/"+options.theme); + Gtk::RC::set_default_files (rcfiles); Gtk::Main m(&argc, &argv); // MainWindow *MainWindow = new class MainWindow();