diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index 527dae568..a78304c09 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -70,7 +70,7 @@ void loadProfiles( const Glib::ustring extension = rtengine::getFileExtension(fileName); - if (extension != ".icc" && extension != ".icm") { + if (extension != "icc" && extension != "icm") { continue; } @@ -131,7 +131,7 @@ bool loadProfile( const Glib::ustring extension = rtengine::getFileExtension(fileName); - if (extension != ".icc" && extension != ".icm") { + if (extension != "icc" && extension != "icm") { continue; } diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt index bc12ea6aa..98382bf07 100644 --- a/rtgui/CMakeLists.txt +++ b/rtgui/CMakeLists.txt @@ -69,25 +69,25 @@ configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINAR # create new executables targets 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 (rth UpdateInfo) -add_dependencies (rth-cli UpdateInfo) +#add_dependencies (rth-cli UpdateInfo) # 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-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 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} ${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} - ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${CAIROMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${EXPAT_LIBRARIES} - ${FFTW3F_LIBRARIES} ${IPTCDATA_LIBRARIES} ${EXTRA_LIB_RTGUI}) +#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} +# ${FFTW3F_LIBRARIES} ${IPTCDATA_LIBRARIES} ${EXTRA_LIB_RTGUI}) # install executables install (TARGETS rth DESTINATION ${BINDIR}) -install (TARGETS rth-cli DESTINATION ${BINDIR}) +#install (TARGETS rth-cli DESTINATION ${BINDIR})