liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing missing output Profiles bug + disabling rt-cli (see #3691)

Browse Source
This commit is contained in:
Hombre
2017-03-19 03:31:33 +01:00
parent 50bdf91a23
commit 99f0d723b5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/iccstore.cc
View File

@@ -70,7 +70,7 @@ void loadProfiles(
const Glib::ustring extension = rtengine::getFileExtension(fileName); const Glib::ustring extension = rtengine::getFileExtension(fileName);
if (extension != ".icc" && extension != ".icm") { if (extension != "icc" && extension != "icm") {
continue; continue;
} }
@@ -131,7 +131,7 @@ bool loadProfile(
const Glib::ustring extension = rtengine::getFileExtension(fileName); const Glib::ustring extension = rtengine::getFileExtension(fileName);
if (extension != ".icc" && extension != ".icm") { if (extension != "icc" && extension != "icm") {
continue; continue;
} }

14
rtgui/CMakeLists.txt
View File

@@ -69,25 +69,25 @@ configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINAR
# create new executables targets # create new executables targets
add_executable (rth ${EXTRA_SRC_NONCLI} ${NONCLISOURCEFILES}) add_executable (rth ${EXTRA_SRC_NONCLI} ${NONCLISOURCEFILES})
add_executable (rth-cli ${EXTRA_SRC_CLI} ${CLISOURCEFILES}) #add_executable (rth-cli ${EXTRA_SRC_CLI} ${CLISOURCEFILES})
# add dependencies to executables targets # add dependencies to executables targets
add_dependencies (rth UpdateInfo) add_dependencies (rth UpdateInfo)
add_dependencies (rth-cli UpdateInfo) #add_dependencies (rth-cli UpdateInfo)
# set executables targets properties, i.e. output filename and compile flags # set executables targets properties, i.e. output filename and compile flags
set_target_properties (rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee) set_target_properties (rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee)
set_target_properties (rth-cli PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee-cli) #set_target_properties (rth-cli PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee-cli)
# add linked libraries dependencies to executables targets # add linked libraries dependencies to executables targets
target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES} target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${EXPAT_LIBRARIES} ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${EXPAT_LIBRARIES}
${FFTW3F_LIBRARIES} ${IPTCDATA_LIBRARIES} ${CANBERRA-GTK_LIBRARIES} ${EXTRA_LIB_RTGUI}) ${FFTW3F_LIBRARIES} ${IPTCDATA_LIBRARIES} ${CANBERRA-GTK_LIBRARIES} ${EXTRA_LIB_RTGUI})
target_link_libraries (rth-cli rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES} #target_link_libraries (rth-cli rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${CAIROMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${EXPAT_LIBRARIES} # ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${CAIROMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${EXPAT_LIBRARIES}
${FFTW3F_LIBRARIES} ${IPTCDATA_LIBRARIES} ${EXTRA_LIB_RTGUI}) # ${FFTW3F_LIBRARIES} ${IPTCDATA_LIBRARIES} ${EXTRA_LIB_RTGUI})
# install executables # install executables
install (TARGETS rth DESTINATION ${BINDIR}) install (TARGETS rth DESTINATION ${BINDIR})
install (TARGETS rth-cli DESTINATION ${BINDIR}) #install (TARGETS rth-cli DESTINATION ${BINDIR})