Skip to content

Commit

Permalink
CMake: make feature enabling explicit
Browse files Browse the repository at this point in the history
  • Loading branch information
kmilos committed Feb 19, 2024
1 parent 018de4a commit 632a7a5
Show file tree
Hide file tree
Showing 5 changed files with 165 additions and 180 deletions.
10 changes: 3 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,9 @@ message(STATUS "All external programs found")

# The path can be modified by setting CMAKE_INSTALL_LOCALEDIR
if(USE_NLS)
find_package(Gettext)
if(GETTEXT_MSGFMT_EXECUTABLE)
message(STATUS "Found msgfmt to convert .po file. Translation enabled")
add_subdirectory(po)
else()
message(STATUS "Cannot find msgfmt to convert .po file. Translation won't be enabled")
endif()
find_package(Gettext REQUIRED)

add_subdirectory(po)
endif(USE_NLS)

# needed to generate file "preferences_gen.h" accordingly
Expand Down
2 changes: 1 addition & 1 deletion DefineOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ option(USE_WEBP "Enable WebP support" ON)
option(USE_AVIF "Enable AVIF support" ON)
option(USE_HEIF "Enable HEIF/HEIC support" ON)
option(USE_XCF "Enable XCF support" ON)
option(USE_ISOBMFF "Enable ISOBMFF support" ON)
option(USE_LIBRAW "Enable LibRaw support" ON)
option(DONT_USE_INTERNAL_LIBRAW "If possible, use system instead of intree copy of LibRaw" OFF)
option(BUILD_CMSTEST "Build a test program to check your system's color management setup" ON)
option(USE_IMATH "Enable Imath half float support" ON)
option(USE_OPENEXR "Enable OpenEXR support" ON)
option(BUILD_PRINT "Build the print module" ON)
option(BUILD_RS_IDENTIFY "Build the darktable-rs-identify debug aid" ON)
Expand Down
5 changes: 3 additions & 2 deletions cmake/modules/FindLensFun.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LensFun DEFAULT_MSG LensFun_LIBRARY LensFun_INCLUDE_DIR)

IF(LensFun_FOUND)
SET(LensFun_LIBRARIES ${LensFun_LIBRARY})
SET(LensFun_INCLUDE_DIRS ${LensFun_INCLUDE_DIR})
set(LensFun_LIBRARIES ${LensFun_LIBRARY})
set(LensFun_INCLUDE_DIRS ${LensFun_INCLUDE_DIR})
set(LensFun_VERSION ${LensFun_PKGCONF_VERSION})
ENDIF(LensFun_FOUND)
Loading

0 comments on commit 632a7a5

Please sign in to comment.