diff options
Diffstat (limited to 'build_files/cmake/Modules')
| -rw-r--r-- | build_files/cmake/Modules/FindGLEW.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenCOLLADA.cmake | 5 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenColorIO.cmake | 13 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenEXR.cmake | 6 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenGLES.cmake | 1 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenImageIO.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenJPEG.cmake | 2 |
7 files changed, 29 insertions, 2 deletions
diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 8589e143ada..2f098d5d9a4 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -75,3 +75,5 @@ MARK_AS_ADVANCED( GLEW_LIBRARY GLEW_MX_LIBRARY ) + +UNSET(_glew_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index 84aead58b60..1c10d5a71de 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -140,3 +140,8 @@ IF(OPENCOLLADA_FOUND) SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES}) SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES}) ENDIF(OPENCOLLADA_FOUND) + +UNSET(COMPONENT) +UNSET(UPPERCOMPONENT) +UNSET(_opencollada_LIBRARIES) +UNSET(_opencollada_INCLUDES) diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index e152f0f81d9..bd1ecac0a39 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -63,11 +63,12 @@ FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib ) - if(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) + IF(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY) LIST(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}") - endif() + ENDIF() ENDFOREACH() + # handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) @@ -82,5 +83,13 @@ ENDIF(OPENCOLORIO_FOUND) MARK_AS_ADVANCED( OPENCOLORIO_INCLUDE_DIR OPENCOLORIO_LIBRARY + OPENCOLORIO_OPENCOLORIO_LIBRARY + OPENCOLORIO_TINYXML_LIBRARY + OPENCOLORIO_YAML-CPP_LIBRARY ) +UNSET(COMPONENT) +UNSET(UPPERCOMPONENT) +UNSET(_opencolorio_FIND_COMPONENTS) +UNSET(_opencolorio_LIBRARIES) +UNSET(_opencolorio_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index 1c59ef49e59..8554da14f31 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -137,3 +137,9 @@ FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS}) STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT) MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY) ENDFOREACH() + +UNSET(COMPONENT) +UNSET(UPPERCOMPONENT) +UNSET(_openexr_FIND_COMPONENTS) +UNSET(_openexr_LIBRARIES) +UNSET(_openexr_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenGLES.cmake b/build_files/cmake/Modules/FindOpenGLES.cmake index 1bb06c2f31c..9efb9408141 100644 --- a/build_files/cmake/Modules/FindOpenGLES.cmake +++ b/build_files/cmake/Modules/FindOpenGLES.cmake @@ -74,3 +74,4 @@ MARK_AS_ADVANCED( OPENGLES_INCLUDE_DIR ) +UNSET(_opengles_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 9b8c8b075b1..39049981385 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -69,3 +69,5 @@ MARK_AS_ADVANCED( OPENIMAGEIO_INCLUDE_DIR OPENIMAGEIO_LIBRARY ) + +UNSET(_openimageio_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index 8bd1a584ac7..d765103638b 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -69,3 +69,5 @@ MARK_AS_ADVANCED( OPENJPEG_INCLUDE_DIR OPENJPEG_LIBRARY ) + +UNSET(_openjpeg_SEARCH_DIRS) |