[Bf-blender-cvs] [fa4260c] master: Code Cleanup: use cmake case matching other find modules
Campbell Barton
noreply at git.blender.org
Sat Jan 4 02:48:29 CET 2014
Commit: fa4260ced97832eb2b7d1c74b0a94fc916a7ab0f
Author: Campbell Barton
Date: Sat Jan 4 12:46:18 2014 +1100
https://developer.blender.org/rBfa4260ced97832eb2b7d1c74b0a94fc916a7ab0f
Code Cleanup: use cmake case matching other find modules
===================================================================
M build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake
index dad96bc..c794dd0 100644
--- a/build_files/cmake/Modules/FindOpenEXR.cmake
+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -52,25 +52,25 @@ FIND_PATH(OPENEXR_INCLUDE_DIR
)
# If the headers were found, get the version from config file, if not already set.
-if (OPENEXR_INCLUDE_DIR)
- if (NOT OPENEXR_VERSION)
+IF(OPENEXR_INCLUDE_DIR)
+ IF(NOT OPENEXR_VERSION)
FILE(STRINGS "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h" OPENEXR_BUILD_SPECIFICATION
REGEX "^[ \t]*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
- if(OPENEXR_BUILD_SPECIFICATION)
- message(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
- string(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
+ IF(OPENEXR_BUILD_SPECIFICATION)
+ MESSAGE(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
+ STRING(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
"\\1" XYZ ${OPENEXR_BUILD_SPECIFICATION})
- set("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
- else()
+ SET("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
+ ELSE()
# Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though.
- message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
- set("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
- endif()
- endif()
-endif ()
+ MESSAGE(WARNING "Could not determine ILMBase library version, assuming 2.0.")
+ SET("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
+ ENDIF()
+ ENDIF()
+ENDIF()
-if (${OPENEXR_VERSION} VERSION_LESS "2.1")
+IF(${OPENEXR_VERSION} VERSION_LESS "2.1")
SET(_openexr_FIND_COMPONENTS
Half
Iex
@@ -78,8 +78,8 @@ if (${OPENEXR_VERSION} VERSION_LESS "2.1")
IlmThread
Imath
)
-else ()
- string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
+ELSE()
+ STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
SET(_openexr_FIND_COMPONENTS
Half
Iex-${_openexr_libs_ver}
@@ -87,7 +87,7 @@ else ()
IlmThread-${_openexr_libs_ver}
Imath-${_openexr_libs_ver}
)
-endif ()
+ENDIF()
SET(_openexr_LIBRARIES)
FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
More information about the Bf-blender-cvs
mailing list