[Bf-blender-cvs] [300f33a] master: Cleanup: style (match other find modules)

Campbell Barton noreply at git.blender.org
Thu Aug 6 05:11:08 CEST 2015


Commit: 300f33a8eaf6bed64b61f2341de9ba85f1737f5a
Author: Campbell Barton
Date:   Thu Aug 6 12:55:54 2015 +1000
Branches: master
https://developer.blender.org/rB300f33a8eaf6bed64b61f2341de9ba85f1737f5a

Cleanup: style (match other find modules)

===================================================================

M	build_files/cmake/Modules/FindAudaspace.cmake

===================================================================

diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake
index 5d0c765..08c48bc 100644
--- a/build_files/cmake/Modules/FindAudaspace.cmake
+++ b/build_files/cmake/Modules/FindAudaspace.cmake
@@ -12,96 +12,96 @@
 #  AUDASPACE_PY_LIBRARIES - link these to use audaspace's python binding
 
 IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
-	SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
+ SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
 ENDIF()
 
 SET(_audaspace_SEARCH_DIRS
-	${AUDASPACE_ROOT_DIR}
-	/usr/local
-	/sw # Fink
-	/opt/local # DarwinPorts
-	/opt/csw # Blastwave
+  ${AUDASPACE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
 )
 
 # Use pkg-config to get hints about paths
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-	pkg_check_modules(AUDASPACE_PKGCONF audaspace)
-endif(PKG_CONFIG_FOUND)
+FIND_PACKAGE(PkgConfig)
+IF(PKG_CONFIG_FOUND)
+  PKG_CHECK_MODULES(AUDASPACE_PKGCONF audaspace)
+ENDIF(PKG_CONFIG_FOUND)
 
 # Include dir
-find_path(AUDASPACE_INCLUDE_DIR
-	NAMES ISound.h
-	HINTS ${_audaspace_SEARCH_DIRS}
-	PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
+FIND_PATH(AUDASPACE_INCLUDE_DIR
+  NAMES ISound.h
+  HINTS ${_audaspace_SEARCH_DIRS}
+  PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
 )
 
 # Library
-find_library(AUDASPACE_LIBRARY
-	NAMES audaspace
-	HINTS ${_audaspace_SEARCH_DIRS}
-	PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
+FIND_LIBRARY(AUDASPACE_LIBRARY
+  NAMES audaspace
+  HINTS ${_audaspace_SEARCH_DIRS}
+  PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
 )
 
 # Include dir
-find_path(AUDASPACE_C_INCLUDE_DIR
-	NAMES AUD_Sound.h
-	HINTS ${_audaspace_SEARCH_DIRS}
-	PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
+FIND_PATH(AUDASPACE_C_INCLUDE_DIR
+  NAMES AUD_Sound.h
+  HINTS ${_audaspace_SEARCH_DIRS}
+  PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
 )
 
 # Library
-find_library(AUDASPACE_C_LIBRARY
-	NAMES audaspace-c
-	HINTS ${_audaspace_SEARCH_DIRS}
-	PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
+FIND_LIBRARY(AUDASPACE_C_LIBRARY
+  NAMES audaspace-c
+  HINTS ${_audaspace_SEARCH_DIRS}
+  PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
 )
 
 # Include dir
-find_path(AUDASPACE_PY_INCLUDE_DIR
-	NAMES python/PyAPI.h
-	HINTS ${_audaspace_SEARCH_DIRS}
-	PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
+FIND_PATH(AUDASPACE_PY_INCLUDE_DIR
+  NAMES python/PyAPI.h
+  HINTS ${_audaspace_SEARCH_DIRS}
+  PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
 )
 
 # Library
-find_library(AUDASPACE_PY_LIBRARY
-	NAMES audaspace-py
-	HINTS ${_audaspace_SEARCH_DIRS}
-	PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
+FIND_LIBRARY(AUDASPACE_PY_LIBRARY
+  NAMES audaspace-py
+  HINTS ${_audaspace_SEARCH_DIRS}
+  PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
 )
 
-find_package(PackageHandleStandardArgs)
-find_package_handle_standard_args(Audaspace  DEFAULT_MSG  AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR)
-find_package_handle_standard_args(Audaspace_C  DEFAULT_MSG  AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR)
-find_package_handle_standard_args(Audaspace_Py  DEFAULT_MSG  AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR)
+FIND_PACKAGE(PackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace  DEFAULT_MSG  AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_C  DEFAULT_MSG  AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_Py  DEFAULT_MSG  AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR)
 
-if(AUDASPACE_FOUND)
-	set(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY})
-	set(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR})
-endif(AUDASPACE_FOUND)
+IF(AUDASPACE_FOUND)
+  SET(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY})
+  SET(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR})
+ENDIF(AUDASPACE_FOUND)
 
-if(AUDASPACE_C_FOUND)
-	set(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY})
-	set(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR})
-endif(AUDASPACE_C_FOUND)
+IF(AUDASPACE_C_FOUND)
+  SET(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY})
+  SET(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR})
+ENDIF(AUDASPACE_C_FOUND)
 
-if(AUDASPACE_PY_FOUND)
-	set(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY})
-	set(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR})
-endif(AUDASPACE_PY_FOUND)
+IF(AUDASPACE_PY_FOUND)
+  SET(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY})
+  SET(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR})
+ENDIF(AUDASPACE_PY_FOUND)
 
-mark_as_advanced(
-	AUDASPACE_LIBRARY
-	AUDASPACE_LIBRARIES
-	AUDASPACE_INCLUDE_DIR
-	AUDASPACE_INCLUDE_DIRS
-	AUDASPACE_C_LIBRARY
-	AUDASPACE_C_LIBRARIES
-	AUDASPACE_C_INCLUDE_DIR
-	AUDASPACE_C_INCLUDE_DIRS
-	AUDASPACE_PY_LIBRARY
-	AUDASPACE_PY_LIBRARIES
-	AUDASPACE_PY_INCLUDE_DIR
-	AUDASPACE_PY_INCLUDE_DIRS
+MARK_AS_ADVANCED(
+  AUDASPACE_LIBRARY
+  AUDASPACE_LIBRARIES
+  AUDASPACE_INCLUDE_DIR
+  AUDASPACE_INCLUDE_DIRS
+  AUDASPACE_C_LIBRARY
+  AUDASPACE_C_LIBRARIES
+  AUDASPACE_C_INCLUDE_DIR
+  AUDASPACE_C_INCLUDE_DIRS
+  AUDASPACE_PY_LIBRARY
+  AUDASPACE_PY_LIBRARIES
+  AUDASPACE_PY_INCLUDE_DIR
+  AUDASPACE_PY_INCLUDE_DIRS
 )




More information about the Bf-blender-cvs mailing list