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

Merge Beep6581/dev

Browse Source
This commit is contained in:
Mattia Verga
2017-06-05 18:16:38 +02:00
parent 6b81411561 982b291a64
commit 7f4b9e2aa7
546 changed files with 37437 additions and 27784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/modules/FindMacIntegration.cmake
View File

@@ -12,12 +12,12 @@
# Copyright 2010 henrik andersson
#=============================================================================
SET(MACINTEGRATION_FIND_REQUIRED ${MacIntegration_FIND_REQUIRED})
set(MACINTEGRATION_FIND_REQUIRED ${MacIntegration_FIND_REQUIRED})
find_path(MACINTEGRATION_INCLUDE_DIR gtkosxapplication.h PATH_SUFFIXES gtkmacintegration gtkmacintegration-gtk2)
find_path(MACINTEGRATION_INCLUDE_DIR gtkosxapplication.h PATH_SUFFIXES gtkmacintegration gtkmacintegration-gtk3)
mark_as_advanced(MACINTEGRATION_INCLUDE_DIR)
set(MACINTEGRATION_NAMES ${MACINTEGRATION_NAMES} gtkmacintegration libgtkmacintegration gtkmacintegration-gtk2 libgtkmacintegration-gtk2)
set(MACINTEGRATION_NAMES ${MACINTEGRATION_NAMES} gtkmacintegration libgtkmacintegration gtkmacintegration-gtk3 libgtkmacintegration-gtk3)
find_library(MACINTEGRATION_LIBRARY NAMES ${MACINTEGRATION_NAMES})
mark_as_advanced(MACINTEGRATION_LIBRARY)
@@ -26,7 +26,7 @@ mark_as_advanced(MACINTEGRATION_LIBRARY)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MACINTEGRATION DEFAULT_MSG MACINTEGRATION_LIBRARY MACINTEGRATION_INCLUDE_DIR)
IF(MACINTEGRATION_FOUND)
SET(MacIntegration_LIBRARIES ${MACINTEGRATION_LIBRARY})
SET(MacIntegration_INCLUDE_DIRS ${MACINTEGRATION_INCLUDE_DIR})
ENDIF(MACINTEGRATION_FOUND)
if(MACINTEGRATION_FOUND)
set(MacIntegration_LIBRARIES ${MACINTEGRATION_LIBRARY})
set(MacIntegration_INCLUDE_DIRS ${MACINTEGRATION_INCLUDE_DIR})
endif()