Skip to content

Commit

Permalink
fix_966_macosx_libintl_mono_framework
Browse files Browse the repository at this point in the history
(cherry picked from commit 3ad2c8a)
  • Loading branch information
clanmills authored and mergify-bot committed Jul 28, 2019
1 parent 6562aee commit 5b64464
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion cmake/findDependencies.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# set include path for FindXXX.cmake files
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")

# don't use Frameworks on the Mac (#966)
if (APPLE)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()

# Check if the conan file exist to find the dependencies
if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
set(USING_CONAN ON)
Expand Down Expand Up @@ -37,7 +42,11 @@ endif()


if (EXIV2_ENABLE_NLS)
find_package(Intl REQUIRED)
find_package(Intl)
if ( NOT ${Intl_FOUND} )
message(WARNING "*** EXIV2_ENABLE_NLS has been disabled because libintl is not available ***")
set(EXIV2_ENABLE_NLS Off)
endif()
endif( )

find_package(Iconv)
Expand Down

0 comments on commit 5b64464

Please sign in to comment.