[Bf-blender-cvs] [41e930ac666] master: Cleanup: CMake whitespace
Campbell Barton
noreply at git.blender.org
Tue Jan 23 07:17:30 CET 2018
Commit: 41e930ac666fc310e9573bc2d623c16ad8cf323a
Author: Campbell Barton
Date: Tue Jan 23 17:25:09 2018 +1100
Branches: master
https://developer.blender.org/rB41e930ac666fc310e9573bc2d623c16ad8cf323a
Cleanup: CMake whitespace
===================================================================
M build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
M build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
M build_files/cmake/macros.cmake
===================================================================
diff --git a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
index f1a45228128..de4c0aba48c 100644
--- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
@@ -21,9 +21,9 @@
# ILMBASE_FOUND - True if IlmBase was found.
# Other standarnd issue macros
-include (FindPackageHandleStandardArgs)
-include (FindPackageMessage)
-include (SelectLibraryConfigurations)
+include(FindPackageHandleStandardArgs)
+include(FindPackageMessage)
+include(SelectLibraryConfigurations)
if( ILMBASE_USE_STATIC_LIBS )
@@ -36,42 +36,42 @@ if( ILMBASE_USE_STATIC_LIBS )
endif()
# Macro to assemble a helper state variable
-macro (SET_STATE_VAR varname)
- set (tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
- separate_arguments (tmp_ilmbaselibs)
- set (tmp_lst
+macro(SET_STATE_VAR varname)
+ set(tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
+ separate_arguments(tmp_ilmbaselibs)
+ set(tmp_lst
${ILMBASE_CUSTOM} | ${tmp_ilmbaselibs} |
${ILMBASE_HOME} | ${ILMBASE_VERSION} | ${ILMBASE_LIB_AREA}
)
- set (${varname} "${tmp_lst}")
- unset (tmp_ilmbaselibs)
- unset (tmp_lst)
-endmacro ()
+ set(${varname} "${tmp_lst}")
+ unset(tmp_ilmbaselibs)
+ unset(tmp_lst)
+endmacro()
# To enforce that find_* functions do not use inadvertently existing versions
-if (ILMBASE_CUSTOM)
- set (ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
-endif ()
+if(ILMBASE_CUSTOM)
+ set(ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
+endif()
# Macro to search for an include directory
-macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
- string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
+macro(PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
+ string(TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
find_path(${tmp_varname} ${includefile}
HINTS ${${libpath_var}}
PATH_SUFFIXES include
${ILMBASE_FIND_OPTIONS}
)
- if (${tmp_varname})
- mark_as_advanced (${tmp_varname})
- endif ()
- unset (tmp_varname)
-endmacro ()
+ if(${tmp_varname})
+ mark_as_advanced(${tmp_varname})
+ endif()
+ unset(tmp_varname)
+endmacro()
# Macro to search for the given library and adds the cached
# variable names to the specified list
-macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
- string (TOUPPER ${prefix}_${libname} tmp_prefix)
+macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
+ string(TOUPPER ${prefix}_${libname} tmp_prefix)
# Handle new library names for OpenEXR 2.1 build via cmake
string(REPLACE "." "_" _ILMBASE_VERSION ${ILMBASE_VERSION})
string(SUBSTRING ${_ILMBASE_VERSION} 0 3 _ILMBASE_VERSION )
@@ -89,86 +89,90 @@ macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
${ILMBASE_FIND_OPTIONS}
)
# Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
- select_library_configurations (${tmp_prefix})
- list (APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
+ select_library_configurations(${tmp_prefix})
+ list(APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
# Add to the list of variables which should be reset
- list (APPEND ${cachelist_var}
+ list(APPEND ${cachelist_var}
${tmp_prefix}_LIBRARY
${tmp_prefix}_LIBRARY_RELEASE
${tmp_prefix}_LIBRARY_DEBUG)
- mark_as_advanced (
+ mark_as_advanced(
${tmp_prefix}_LIBRARY
${tmp_prefix}_LIBRARY_RELEASE
${tmp_prefix}_LIBRARY_DEBUG)
- unset (tmp_prefix)
-endmacro ()
+ unset(tmp_prefix)
+endmacro()
# Encode the current state of the external variables into a string
-SET_STATE_VAR (ILMBASE_CURRENT_STATE)
+SET_STATE_VAR(ILMBASE_CURRENT_STATE)
# If the state has changed, clear the cached variables
-if (ILMBASE_CACHED_STATE AND
+if(ILMBASE_CACHED_STATE AND
NOT ILMBASE_CACHED_STATE STREQUAL ILMBASE_CURRENT_STATE)
- foreach (libvar ${ILMBASE_CACHED_VARS})
- unset (${libvar} CACHE)
- endforeach ()
-endif ()
+ foreach(libvar ${ILMBASE_CACHED_VARS})
+ unset(${libvar} CACHE)
+ endforeach()
+endif()
# Generic search paths
-set (IlmBase_generic_include_paths
+set(IlmBase_generic_include_paths
${ILMBASE_CUSTOM_INCLUDE_DIR}
/usr/include
/usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/include
/sw/include
- /opt/local/include)
-set (IlmBase_generic_library_paths
+ /opt/local/include
+)
+set(IlmBase_generic_library_paths
${ILMBASE_CUSTOM_LIB_DIR}
/usr/lib
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/lib
/usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/sw/lib
- /opt/local/lib)
+ /opt/local/lib
+)
# Search paths for the IlmBase files
-if (ILMBASE_HOME)
- if (ILMBASE_VERSION)
- set (IlmBase_include_paths
+if(ILMBASE_HOME)
+ if(ILMBASE_VERSION)
+ set(IlmBase_include_paths
${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/include
- ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION})
- set (IlmBase_library_paths
+ ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION}
+ )
+ set(IlmBase_library_paths
${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/lib
- ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION})
+ ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION}
+ )
endif()
- list (APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
- set (IlmBase_library_paths
+ list(APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
+ set(IlmBase_library_paths
${ILMBASE_HOME}/lib
${ILMBASE_HOME}/lib64
${ILMBASE_LIB_AREA}
${IlmBase_library_paths})
-endif ()
-list (APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
-list (APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
+endif()
+list(APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
+list(APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
# Locate the header files
-PREFIX_FIND_INCLUDE_DIR (IlmBase
+PREFIX_FIND_INCLUDE_DIR(IlmBase
OpenEXR/IlmBaseConfig.h IlmBase_include_paths)
-if (ILMBASE_INCLUDE_DIR)
+if(ILMBASE_INCLUDE_DIR)
# Get the version from config file, if not already set.
- if (NOT ILMBASE_VERSION)
+ if(NOT ILMBASE_VERSION)
FILE(STRINGS "${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h" ILMBASE_BUILD_SPECIFICATION
REGEX "^[ \t]*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
if(ILMBASE_BUILD_SPECIFICATION)
- if (NOT IlmBase_FIND_QUIETLY)
+ if(NOT IlmBase_FIND_QUIETLY)
message(STATUS "${ILMBASE_BUILD_SPECIFICATION}")
- endif ()
+ endif()
string(REGEX REPLACE ".*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
"\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
@@ -178,71 +182,71 @@ if (ILMBASE_INCLUDE_DIR)
set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
endif()
endif()
-endif ()
+endif()
-if (ILMBASE_CUSTOM)
- if (NOT ILMBASE_CUSTOM_LIBRARIES)
- message (FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
+if(ILMBASE_CUSTOM)
+ if(NOT ILMBASE_CUSTOM_LIBRARIES)
+ message(FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
endif()
- set (IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
+ set(IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
separate_arguments(IlmBase_Libraries)
-else ()
-#elseif (${ILMBASE_VERSION} VERSION_LESS "2.1")
- set (IlmBase_Libraries Half Iex Imath IlmThread)
-#else ()
+else()
+#elseif(${ILMBASE_VERSION} VERSION_LESS "2.1")
+ set(IlmBase_Libraries Half Iex Imath IlmThread)
+#else()
# string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
-# set (IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
-endif ()
+# set(IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
+endif()
# Locate the IlmBase libraries
-set (IlmBase_libvars "")
-set (IlmBase_cachevars "")
-foreach (ilmbase_lib ${IlmBase_Libraries})
- PREFIX_FIND_LIB (IlmBase ${ilmbase_lib}
+set(IlmBase_libvars "")
+set(IlmBase_cachevars "")
+foreach(ilmbase_lib ${IlmBase_Libraries})
+ PREFIX_FIND_LIB(IlmBase ${ilmbase_lib}
IlmBase_library_paths IlmBase_libvars IlmBase_cachevars)
-endforeach ()
+endforeach()
# Create the list of variables that might need to be cleared
-set (ILMBASE_CACHED_VARS
+set(ILMBASE_CACHED_VARS
ILMBASE_INCLUDE_DIR ${IlmBase_cachevars}
CACHE INTERNAL "Variables set by FindIlmBase.cmake" FORCE)
# Store the current state so that variables might be cleared if required
-set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
+set(ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
# Link with pthreads if required
-if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
- file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
+if(NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
+ file(STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
ILMBASE_HAVE_PTHREAD
REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
)
- if (ILMBASE_HAVE_PTHREAD)
- find_package (Threads)
- if (CMAKE_USE_PTHREADS_INIT)
- set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
- endif ()
- endif ()
-endif ()
+ if(ILMBASE_HAVE_PTHREAD)
+ find_package(Threads)
+ if(CMAKE_USE_PTHREADS_INIT)
+ set(ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+ endif()
+ endif()
+endif()
# Use the standard function to handle ILMBASE_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (IlmBase DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(IlmBase DEFAULT_MSG
ILMBASE_INCLUDE_DIR ${IlmBase_libvars})
-if (ILMBASE_FOUND)
- set (ILMBASE_LIBRARIES "")
- foreach (tmplib ${IlmBase_libvars})
- list (APPEND ILMBASE_LIBRARIES ${${tmplib}})
- endforeach ()
- list (APPEND ILMBASE_LIBRARIES ${ILMBASE_PTHREADS})
- if (NOT IlmBase_FIND_QUIETLY)
- FIND_PACKAGE_MESSAGE (ILMBASE
+if(ILMBASE_FOUND)
+ set(ILMBASE_LIBRARIES "")
+ foreach(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list