From f2586846661fd2ef1a999765108298ca41b57256 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 14 Jan 2006 20:15:30 +0000 Subject: -simple cmake modules for detecting libart, OpenSSL, FAM, jasper and PCRE -major improvement of am2cmake: add libtool .la files found in LIBADD to TARGET_LINK_LIBRARIES and fix the loop for adding the libs Alex svn path=/trunk/KDE/kdesdk/cmake/; revision=498154 --- modules/FindOpenEXR.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 modules/FindOpenEXR.cmake (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake new file mode 100644 index 00000000..615d9ac7 --- /dev/null +++ b/modules/FindOpenEXR.cmake @@ -0,0 +1,12 @@ + +FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h +/usr/include +/usr/local/include +) + + + +IF(OPENEXR_INCLUDE_DIR) + SET(OPENEXR_FOUND TRUE) +ENDIF(OPENEXR_INCLUDE_DIR) + -- cgit v1.2.1 From 933faee513f4b74ad2ca2d9fbdf4f0844c4931e2 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 13 Feb 2006 17:07:42 +0000 Subject: Try to fix search openexr. (How to debug it ?) svn path=/trunk/KDE/kdelibs/; revision=509073 --- modules/FindOpenEXR.cmake | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 615d9ac7..b78cd17f 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -1,12 +1,39 @@ +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +INCLUDE(UsePkgConfig) + +PKGCONFIG(OpenEXR _OPENEXRIncDir _OPENEXRLinkDir _OPENEXRLinkFlags _OPENEXRCflags) + FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h +${_OPENEXRIncDir} /usr/include /usr/local/include ) +FIND_LIBRARY(OPENEXR_LIBRARIES NAMES Half Iex IlmImf Imath + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib +) - -IF(OPENEXR_INCLUDE_DIR) +IF(OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) SET(OPENEXR_FOUND TRUE) -ENDIF(OPENEXR_INCLUDE_DIR) +ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) + + + +IF(OPENEXR_FOUND) + IF(NOT OPENEXR_FIND_QUIETLY) + MESSAGE(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") + ENDIF(NOT OPENEXR_FIND_QUIETLY) +ELSE(OPENEXR_FOUND) + IF(OPENEXR_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find OPENEXR") + ENDIF(OPENEXR_FIND_REQUIRED) +ENDIF(OPENEXR_FOUND) + +MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES) + -- cgit v1.2.1 From 26b817a2afadfbd3b72fd77ca59c58a591bfa5f5 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 13 Feb 2006 19:49:14 +0000 Subject: fix some typos Alex svn path=/trunk/KDE/kdelibs/; revision=509144 --- modules/FindOpenEXR.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index b78cd17f..4d1ca712 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -24,15 +24,15 @@ ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -IF(OPENEXR_FOUND) - IF(NOT OPENEXR_FIND_QUIETLY) +IF (OPENEXR_FOUND) + IF (NOT OpenEXR_FIND_QUIETLY) MESSAGE(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") - ENDIF(NOT OPENEXR_FIND_QUIETLY) -ELSE(OPENEXR_FOUND) - IF(OPENEXR_FIND_REQUIRED) + ENDIF (NOT OpenEXR_FIND_QUIETLY) +ELSE (OPENEXR_FOUND) + IF (OpenEXR_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find OPENEXR") - ENDIF(OPENEXR_FIND_REQUIRED) -ENDIF(OPENEXR_FOUND) + ENDIF (OpenEXR_FIND_REQUIRED) +ENDIF (OPENEXR_FOUND) MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES) -- cgit v1.2.1 From 5e100faf4de6cf5293b672f5cf8ec119555691c7 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 14 Feb 2006 09:48:01 +0000 Subject: Fix detect openexr svn path=/trunk/KDE/kdelibs/; revision=509305 --- modules/FindOpenEXR.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 4d1ca712..ed55daee 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -3,21 +3,25 @@ # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) -PKGCONFIG(OpenEXR _OPENEXRIncDir _OPENEXRLinkDir _OPENEXRLinkFlags _OPENEXRCflags) +PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) + +#PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h -${_OPENEXRIncDir} +${_OpenEXRIncDir} +${_OpenEXRIncDir}/OpenEXR/ /usr/include /usr/local/include ) -FIND_LIBRARY(OPENEXR_LIBRARIES NAMES Half Iex IlmImf Imath +FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmImf PATHS ${_OPENEXRLinkDir} /usr/lib /usr/local/lib ) + IF(OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) SET(OPENEXR_FOUND TRUE) ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -- cgit v1.2.1 From aad4c0da1b886a743d56e6a542e2a9918979c66f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 14 Feb 2006 12:36:44 +0000 Subject: Now exr plugins compiles fine svn path=/trunk/KDE/kdelibs/; revision=509347 --- modules/FindOpenEXR.cmake | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index ed55daee..ef3d60f2 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -14,7 +14,23 @@ ${_OpenEXRIncDir}/OpenEXR/ /usr/local/include ) -FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmImf + +FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib +) + + +FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib +) + +FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS ${_OPENEXRLinkDir} /usr/lib @@ -22,9 +38,19 @@ FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmImf ) -IF(OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) +FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib +) + +SET( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} + ${OPENEXR_IMATH__LIBRARY}...) +IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) SET(OPENEXR_FOUND TRUE) -ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) + SET( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARIES} ${OPENEXR_ILMIMF_LIBRARIES} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) +ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From 24b5ce778a5c25f887d24d8a6a99cbb6ab1db995 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 15 Feb 2006 07:26:06 +0000 Subject: Fix typo. Now exr compiles fine svn path=/trunk/KDE/kdelibs/; revision=509573 --- modules/FindOpenEXR.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index ef3d60f2..da539972 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -14,6 +14,7 @@ ${_OpenEXRIncDir}/OpenEXR/ /usr/local/include ) +MESSAGE(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS @@ -45,11 +46,13 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf /usr/local/lib ) +MESSAGE(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") + SET( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH__LIBRARY}...) IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) SET(OPENEXR_FOUND TRUE) - SET( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARIES} ${OPENEXR_ILMIMF_LIBRARIES} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) + SET( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:47:36 +0000 Subject: Lowercase some common keywords to improve readability svn path=/trunk/KDE/kdelibs/; revision=509624 --- modules/FindOpenEXR.cmake | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index da539972..23ae39a5 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -14,7 +14,7 @@ ${_OpenEXRIncDir}/OpenEXR/ /usr/local/include ) -MESSAGE(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") +message(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS @@ -46,26 +46,26 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf /usr/local/lib ) -MESSAGE(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") +message(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") -SET( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} +set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH__LIBRARY}...) -IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - SET(OPENEXR_FOUND TRUE) - SET( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) -ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - - - -IF (OPENEXR_FOUND) - IF (NOT OpenEXR_FIND_QUIETLY) - MESSAGE(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") - ENDIF (NOT OpenEXR_FIND_QUIETLY) -ELSE (OPENEXR_FOUND) - IF (OpenEXR_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find OPENEXR") - ENDIF (OpenEXR_FIND_REQUIRED) -ENDIF (OPENEXR_FOUND) +if(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + set(OPENEXR_FOUND TRUE) + set( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) +endif(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + + + +if (OPENEXR_FOUND) + if (not OpenEXR_FIND_QUIETLY) + message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") + endif (not OpenEXR_FIND_QUIETLY) +else (OPENEXR_FOUND) + if (OpenEXR_FIND_REQUIRED) + message(FATAL_ERROR "Could not find OPENEXR") + endif (OpenEXR_FIND_REQUIRED) +endif (OPENEXR_FOUND) MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES) -- cgit v1.2.1 From eaad615ee85800bedbf2088326399027c95d0740 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:49:53 +0000 Subject: Hmm, "NOT" can't be lowercased. I tested before lowercasing that last one, of course... svn path=/trunk/KDE/kdelibs/; revision=509625 --- modules/FindOpenEXR.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 23ae39a5..5539fa59 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -58,12 +58,12 @@ endif(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY A if (OPENEXR_FOUND) - if (not OpenEXR_FIND_QUIETLY) + if (NOT OpenEXR_FIND_QUIETLY) message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") - endif (not OpenEXR_FIND_QUIETLY) + endif (NOT OpenEXR_FIND_QUIETLY) else (OPENEXR_FOUND) if (OpenEXR_FIND_REQUIRED) - message(FATAL_ERROR "Could not find OPENEXR") + message(FATAL_ERROR "Could NOT find OPENEXR") endif (OpenEXR_FIND_REQUIRED) endif (OPENEXR_FOUND) -- cgit v1.2.1 From ea2ead5dd6634cdc05757af0730216b3d7e03232 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 16 Feb 2006 21:50:11 +0000 Subject: -replace -fexceptions with ${KDE4_ENABLE_EXCEPTIONS} (I'm not sure this is a good name for the variable) -add install rules for the cmake files in kdelibs/cmake/modules/ -remove debug output and fix typo in FindOpenEXR.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=510319 --- modules/FindOpenEXR.cmake | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 5539fa59..91ca3621 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -8,14 +8,12 @@ PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflag #PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h -${_OpenEXRIncDir} -${_OpenEXRIncDir}/OpenEXR/ -/usr/include -/usr/local/include + ${_OpenEXRIncDir} + ${_OpenEXRIncDir}/OpenEXR/ + /usr/include + /usr/local/include ) -message(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") - FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS ${_OPENEXRLinkDir} @@ -46,14 +44,12 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf /usr/local/lib ) -message(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") +set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) -set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} - ${OPENEXR_IMATH__LIBRARY}...) -if(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - set(OPENEXR_FOUND TRUE) +if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + set( OPENEXR_FOUND TRUE) set( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) -endif(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) +endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From f4dc9185d276557ffec05c6287aa2b9383f558c2 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 17 Feb 2006 17:23:48 +0000 Subject: -give kdelibs a project name ("kdelibs") -remove the unused "install_icon" targets -mark more variables as "ADVANCED" Alex svn path=/trunk/KDE/kdelibs/; revision=510649 --- modules/FindOpenEXR.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 91ca3621..80a1445f 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -63,6 +63,12 @@ else (OPENEXR_FOUND) endif (OpenEXR_FIND_REQUIRED) endif (OPENEXR_FOUND) -MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES) +MARK_AS_ADVANCED( + OPENEXR_INCLUDE_DIR + OPENEXR_LIBRARIES + OPENEXR_ILMIMF_LIBRARY + OPENEXR_IMATH_LIBRARY + OPENEXR_IEX_LIBRARY + OPENEXR_HALF_LIBRARY ) -- cgit v1.2.1 From 191846e3e21c697c28bd5c8a166edeb4072161e3 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 20 Mar 2006 21:05:37 +0000 Subject: minor cleanups: indenting, adding newline to end of file, etc. svn path=/trunk/KDE/kdelibs/; revision=520790 --- modules/FindOpenEXR.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 80a1445f..db0aa3be 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -44,11 +44,11 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf /usr/local/lib ) -set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) +set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - set( OPENEXR_FOUND TRUE) - set( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) + set(OPENEXR_FOUND TRUE) + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From 2b43aad081d13bdeb2ed8a65f65fbecfb470da0d Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 18 Apr 2006 11:22:38 +0000 Subject: More use of the cache; fixing previous commit to not recheck everytime when something isn't available (e.g. agg for me). svn path=/trunk/KDE/kdelibs/; revision=531000 --- modules/FindOpenEXR.cmake | 156 +++++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 72 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index db0aa3be..a139a430 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -1,74 +1,86 @@ -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls -INCLUDE(UsePkgConfig) - -PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) - -#PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags) - -FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h - ${_OpenEXRIncDir} - ${_OpenEXRIncDir}/OpenEXR/ - /usr/include - /usr/local/include -) - -FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half - PATHS - ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib -) - - -FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex - PATHS - ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib -) - -FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath - PATHS - ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib -) - - -FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf - PATHS - ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib -) - -set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) - -if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - set(OPENEXR_FOUND TRUE) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) -endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - - - -if (OPENEXR_FOUND) - if (NOT OpenEXR_FIND_QUIETLY) - message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") - endif (NOT OpenEXR_FIND_QUIETLY) -else (OPENEXR_FOUND) - if (OpenEXR_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find OPENEXR") - endif (OpenEXR_FIND_REQUIRED) -endif (OPENEXR_FOUND) - -MARK_AS_ADVANCED( - OPENEXR_INCLUDE_DIR - OPENEXR_LIBRARIES - OPENEXR_ILMIMF_LIBRARY - OPENEXR_IMATH_LIBRARY - OPENEXR_IEX_LIBRARY - OPENEXR_HALF_LIBRARY ) - +IF (DEFINED CACHED_OPENEXR) + + # in cache already + IF ("${CACHED_OPENEXR}" STREQUAL "YES") + SET(OPENEXR_FOUND TRUE) + ENDIF ("${CACHED_OPENEXR}" STREQUAL "YES") + +ELSE (DEFINED CACHED_OPENEXR) + + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + + PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) + + FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h + ${_OpenEXRIncDir} + ${_OpenEXRIncDir}/OpenEXR/ + /usr/include + /usr/local/include + ) + + FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib + ) + + + FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib + ) + + FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib + ) + + + FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib + ) + + set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) + + if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + set(OPENEXR_FOUND TRUE) + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + + + + if (OPENEXR_FOUND) + set(CACHED_OPENEXR "YES") + if (NOT OpenEXR_FIND_QUIETLY) + message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") + endif (NOT OpenEXR_FIND_QUIETLY) + else (OPENEXR_FOUND) + set(CACHED_OPENEXR "NO") + if (OpenEXR_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find OPENEXR") + endif (OpenEXR_FIND_REQUIRED) + endif (OPENEXR_FOUND) + + MARK_AS_ADVANCED( + OPENEXR_INCLUDE_DIR + OPENEXR_LIBRARIES + OPENEXR_ILMIMF_LIBRARY + OPENEXR_IMATH_LIBRARY + OPENEXR_IEX_LIBRARY + OPENEXR_HALF_LIBRARY ) + + set(CACHED_OPENEXR ${CACHED_OPENEXR} CACHE INTERNAL "If openexr was checked") + +ENDIF (DEFINED CACHED_OPENEXR) -- cgit v1.2.1 From a1cd53cff402332c1bcf7a625b33d9330a247608 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 11 May 2006 16:56:59 +0000 Subject: Remove my CACHED_ hacks which break when people install libxml2 after seeing the error message about it - only use the cache when the check was previously successful, as discussed. svn path=/trunk/KDE/kdelibs/; revision=539759 --- modules/FindOpenEXR.cmake | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index a139a430..34620674 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -1,13 +1,16 @@ +# Try to find the OpenEXR libraries +# This check defines: +# +# OPENEXR_FOUND - system has OpenEXR +# OPENEXR_INCLUDE_DIR - OpenEXR include directory +# OPENEXR_LIBRARIES - Libraries needed to use OpenEXR -IF (DEFINED CACHED_OPENEXR) - +if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) # in cache already - IF ("${CACHED_OPENEXR}" STREQUAL "YES") - SET(OPENEXR_FOUND TRUE) - ENDIF ("${CACHED_OPENEXR}" STREQUAL "YES") + SET(OPENEXR_FOUND TRUE) -ELSE (DEFINED CACHED_OPENEXR) +else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls @@ -52,9 +55,7 @@ ELSE (DEFINED CACHED_OPENEXR) /usr/local/lib ) - set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) - - if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) @@ -62,12 +63,10 @@ ELSE (DEFINED CACHED_OPENEXR) if (OPENEXR_FOUND) - set(CACHED_OPENEXR "YES") if (NOT OpenEXR_FIND_QUIETLY) message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") endif (NOT OpenEXR_FIND_QUIETLY) else (OPENEXR_FOUND) - set(CACHED_OPENEXR "NO") if (OpenEXR_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find OPENEXR") endif (OpenEXR_FIND_REQUIRED) @@ -81,6 +80,4 @@ ELSE (DEFINED CACHED_OPENEXR) OPENEXR_IEX_LIBRARY OPENEXR_HALF_LIBRARY ) - set(CACHED_OPENEXR ${CACHED_OPENEXR} CACHE INTERNAL "If openexr was checked") - -ENDIF (DEFINED CACHED_OPENEXR) +endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindOpenEXR.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 34620674..81627b7e 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -4,6 +4,11 @@ # OPENEXR_FOUND - system has OpenEXR # OPENEXR_INCLUDE_DIR - OpenEXR include directory # OPENEXR_LIBRARIES - Libraries needed to use OpenEXR +# +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -- cgit v1.2.1 From 491b73d5a0712517b0be22ef7657b91a078ec08c Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 20 Nov 2006 09:34:10 +0000 Subject: Don't try to use pkg-config under Windows svn path=/trunk/KDE/kdelibs/; revision=606389 --- modules/FindOpenEXR.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 81627b7e..36950b83 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -16,13 +16,13 @@ if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) SET(OPENEXR_FOUND TRUE) else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) - +IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) - +ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h ${_OpenEXRIncDir} ${_OpenEXRIncDir}/OpenEXR/ -- cgit v1.2.1 From a7c4888bb864b525568df10219915c3925d3dd61 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Aug 2007 18:53:48 +0000 Subject: Remove not necessary path svn path=/trunk/KDE/kdelibs/; revision=697081 --- modules/FindOpenEXR.cmake | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 36950b83..fafde519 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -26,38 +26,28 @@ ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h ${_OpenEXRIncDir} ${_OpenEXRIncDir}/OpenEXR/ - /usr/include - /usr/local/include ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From 371e2b8e20c2fe891f5fc83b90d0d1e097cb49b4 Mon Sep 17 00:00:00 2001 From: Brad Hards Date: Tue, 21 Aug 2007 16:21:34 +0000 Subject: Change the way we search to make sure that if we have more than one copy of OpenEXR (say 1.4 in /usr/lib and 1.6 in /usr/local/lib) that the paths given by pkg-config are actually used. svn path=/trunk/KDE/kdelibs/; revision=702948 --- modules/FindOpenEXR.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index fafde519..bfdb471d 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -27,27 +27,31 @@ ENDIF (NOT WIN32) ${_OpenEXRIncDir} ${_OpenEXRIncDir}/OpenEXR/ ) - + FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS - ${_OPENEXRLinkDir} + ${_OpenEXRLinkDir} + NO_DEFAULT_PATH ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From f87d0f4ea71c055601957db2a41195476405f224 Mon Sep 17 00:00:00 2001 From: Brad Hards Date: Mon, 27 Aug 2007 15:18:10 +0000 Subject: Add fallback search for EXR libraries, so we can work on platforms where there is no pkg-config support. Thanks to Alex for pointing out the problem and helping with the solution. CCMAIL: neundorf@kde.org svn path=/trunk/KDE/kdelibs/; revision=705247 --- modules/FindOpenEXR.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index bfdb471d..f7f78bf9 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -33,6 +33,7 @@ ENDIF (NOT WIN32) ${_OpenEXRLinkDir} NO_DEFAULT_PATH ) + FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex @@ -40,19 +41,21 @@ ENDIF (NOT WIN32) ${_OpenEXRLinkDir} NO_DEFAULT_PATH ) + FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS ${_OpenEXRLinkDir} NO_DEFAULT_PATH ) - + FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS ${_OpenEXRLinkDir} NO_DEFAULT_PATH ) + FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) -- cgit v1.2.1 From f488ef88726de28d2596c2bed13b470e601c9908 Mon Sep 17 00:00:00 2001 From: Adrian Page Date: Mon, 10 Sep 2007 20:27:04 +0000 Subject: - Look for OpenEXR headers in the standard sub-directory of default paths too. - OPENEXR_DLL must be defined to use OpenEXR on windows. svn path=/trunk/KDE/kdelibs/; revision=710757 --- modules/FindOpenEXR.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index f7f78bf9..33560ff5 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -4,6 +4,7 @@ # OPENEXR_FOUND - system has OpenEXR # OPENEXR_INCLUDE_DIR - OpenEXR include directory # OPENEXR_LIBRARIES - Libraries needed to use OpenEXR +# OPENEXR_DEFINITIONS - definitions required to use OpenEXR # # Copyright (c) 2006, Alexander Neundorf, # @@ -25,7 +26,7 @@ IF (NOT WIN32) ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h ${_OpenEXRIncDir} - ${_OpenEXRIncDir}/OpenEXR/ + PATH_SUFFIXES /OpenEXR/ ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half @@ -60,6 +61,15 @@ ENDIF (NOT WIN32) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + + if (WIN32) + set(_OPENEXR_DEFINITIONS -DOPENEXR_DLL) + else (WIN32) + set(_OPENEXR_DEFINITIONS) + endif (WIN32) + + set(OPENEXR_DEFINITIONS ${_OPENEXR_DEFINITIONS} CACHE STRING "Definitions needed to use OpenEXR") + endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) @@ -80,6 +90,7 @@ ENDIF (NOT WIN32) OPENEXR_ILMIMF_LIBRARY OPENEXR_IMATH_LIBRARY OPENEXR_IEX_LIBRARY - OPENEXR_HALF_LIBRARY ) + OPENEXR_HALF_LIBRARY + OPENEXR_DEFINITIONS ) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -- cgit v1.2.1 From 4099fe2a9b0b1b5f73968d06441a52574bad6de2 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Fri, 16 Nov 2007 14:36:47 +0000 Subject: newer OpenEXR has a libIlmThread svn path=/trunk/KDE/kdelibs/; revision=737558 --- modules/FindOpenEXR.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 33560ff5..655080b4 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -58,9 +58,16 @@ ENDIF (NOT WIN32) ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf ) + FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib + ) + if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") if (WIN32) set(_OPENEXR_DEFINITIONS -DOPENEXR_DLL) @@ -88,6 +95,7 @@ ENDIF (NOT WIN32) OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY + OPENEXR_ILMTHREAD_LIBRARY OPENEXR_IMATH_LIBRARY OPENEXR_IEX_LIBRARY OPENEXR_HALF_LIBRARY -- cgit v1.2.1 From ebc642883711e18259ccee50451fec0852a7a17d Mon Sep 17 00:00:00 2001 From: Valentin Rusu Date: Fri, 16 Nov 2007 21:39:21 +0000 Subject: fix for build on systmes that do not have OPENEXR_ILMTHREAD_LIBRARY svn path=/trunk/KDE/kdelibs/; revision=737656 --- modules/FindOpenEXR.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 655080b4..66c57194 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -67,7 +67,11 @@ ENDIF (NOT WIN32) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + if (OPENEXR_ILMTHREAD_LIBRARY) + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + else (OPENEXR_ILMTHREAD_LIBRARY) + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + endif (OPENEXR_ILMTHREAD_LIBRARY) if (WIN32) set(_OPENEXR_DEFINITIONS -DOPENEXR_DLL) -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindOpenEXR.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 66c57194..cd443c0a 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -5,7 +5,7 @@ # OPENEXR_INCLUDE_DIR - OpenEXR include directory # OPENEXR_LIBRARIES - Libraries needed to use OpenEXR # OPENEXR_DEFINITIONS - definitions required to use OpenEXR -# + # Copyright (c) 2006, Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From 479eff683c78e06073afcbe008f35ba7eb348068 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 14 Apr 2008 19:51:24 +0000 Subject: remove CACHE STRING, which can cause problems. per Brad King. svn path=/trunk/KDE/kdelibs/; revision=797050 --- modules/FindOpenEXR.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index cd443c0a..ac58b345 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -68,9 +68,9 @@ ENDIF (NOT WIN32) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) if (OPENEXR_ILMTHREAD_LIBRARY) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ) else (OPENEXR_ILMTHREAD_LIBRARY) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ) endif (OPENEXR_ILMTHREAD_LIBRARY) if (WIN32) -- cgit v1.2.1 From 9215cdab458b5fdc16343157dacd78ef82245ae1 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Wed, 16 Apr 2008 20:37:25 +0000 Subject: don't put set variables into the CACHE, per Brad King svn path=/trunk/KDE/kdelibs/; revision=797757 --- modules/FindOpenEXR.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index ac58b345..35b7e001 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -79,7 +79,7 @@ ENDIF (NOT WIN32) set(_OPENEXR_DEFINITIONS) endif (WIN32) - set(OPENEXR_DEFINITIONS ${_OPENEXR_DEFINITIONS} CACHE STRING "Definitions needed to use OpenEXR") + set(OPENEXR_DEFINITIONS ${_OPENEXR_DEFINITIONS}) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From 7ab5b5f8cb7a33937cc17f73d25713e29048bf8b Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 11 Nov 2008 12:27:23 +0000 Subject: Port it svn path=/trunk/KDE/kdelibs/; revision=882776 --- modules/FindOpenEXR.cmake | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 35b7e001..7b7a03f0 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -20,18 +20,18 @@ else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - - PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) + find_package(PkgConfig) + pkg_check_modules(OPENEXR OpenEXR) + ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h - ${_OpenEXRIncDir} + ${OPENEXR_INCLUDE_DIRS} PATH_SUFFIXES /OpenEXR/ ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half ) @@ -39,30 +39,28 @@ ENDIF (NOT WIN32) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf ) FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread PATHS - ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib + ${OPENEXR_LIBRARY_DIRS} ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1 From 6f0bf4d857818abe898ec635ea5de0aacf6e5814 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 2 Dec 2008 20:26:47 +0000 Subject: -make pkgconfig working and optional Alex Boudewijn: can you please let me know if this one works for you know ? CCMAIL: boud@valdyas.org svn path=/trunk/KDE/kdelibs/; revision=891754 --- modules/FindOpenEXR.cmake | 56 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 29 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 7b7a03f0..eb3829cb 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -14,53 +14,52 @@ if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) # in cache already - SET(OPENEXR_FOUND TRUE) + set(OPENEXR_FOUND TRUE) else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -IF (NOT WIN32) + # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(OPENEXR OpenEXR) - -ENDIF (NOT WIN32) + pkg_check_modules(PC_OPENEXR OpenEXR) + FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h - ${OPENEXR_INCLUDE_DIRS} - PATH_SUFFIXES /OpenEXR/ + HINTS + ${PC_OPENEXR_INCLUDEDIR} + ${PC_OPENEXR_INCLUDE_DIRS} + PATH_SUFFIXES OpenEXR ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half - PATHS - ${OPENEXR_LIBRARY_DIRS} - NO_DEFAULT_PATH + HINTS + ${PC_OPENEXR_LIBDIR} + ${PC_OPENEXR_LIBRARY_DIRS} ) - FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half ) - - + + FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS - ${OPENEXR_LIBRARY_DIRS} - NO_DEFAULT_PATH + ${PC_OPENEXR_LIBDIR} + ${PC_OPENEXR_LIBRARY_DIRS} ) - FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex ) - + FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath - PATHS - ${OPENEXR_LIBRARY_DIRS} + HINTS + ${PC_OPENEXR_LIBDIR} + ${PC_OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) - FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath ) - + FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf - PATHS - ${OPENEXR_LIBRARY_DIRS} - NO_DEFAULT_PATH + HINTS + ${PC_OPENEXR_LIBDIR} + ${PC_OPENEXR_LIBRARY_DIRS} ) - FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf ) FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread - PATHS - ${OPENEXR_LIBRARY_DIRS} + HINTS + ${PC_OPENEXR_LIBDIR} + ${PC_OPENEXR_LIBRARY_DIRS} ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) @@ -82,7 +81,6 @@ ENDIF (NOT WIN32) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - if (OPENEXR_FOUND) if (NOT OpenEXR_FIND_QUIETLY) message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") @@ -93,7 +91,7 @@ ENDIF (NOT WIN32) endif (OpenEXR_FIND_REQUIRED) endif (OPENEXR_FOUND) - MARK_AS_ADVANCED( + mark_as_advanced( OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY -- cgit v1.2.1 From ac954219018fac1c1cae99b6e69be9438e452233 Mon Sep 17 00:00:00 2001 From: David Jarvie Date: Wed, 11 Mar 2009 22:39:22 +0000 Subject: Suppress 'not found' messages from pkgconfig when the module subsequently attempts to locate the package by other means. svn path=/trunk/KDE/kdelibs/; revision=938476 --- modules/FindOpenEXR.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index eb3829cb..405b892d 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -21,7 +21,7 @@ else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(PC_OPENEXR OpenEXR) + pkg_check_modules(PC_OPENEXR QUIET OpenEXR) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h HINTS -- cgit v1.2.1