cmake: Fix code style for consistency

Indentation to 4 spaces
Prefer lower case for functions and macros

(bzr r14596)

1 files changed, 75 insertions, 91 deletions

diff --git a/CMakeScripts/UsePkgConfig.cmake b/CMakeScripts/UsePkgConfig.cmake
index f80e01ba8..86c2425f7 100644
--- a/CMakeScripts/UsePkgConfig.cmake
+++ b/CMakeScripts/UsePkgConfig.cmake
@@ -23,97 +23,81 @@
 # Calling PKGCONFIG_DEFINITION will fill the definition (e.g -D_REENTRANT) into the argument,
 # e.g. PKGCONFIG_DEFINITION(libart-2.0 LIBART_DEFINITION)
 
-FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
-
-MACRO(STRIP_NEWLINES _string_var)
-  STRING(REGEX REPLACE "[\n\r]+" "" ${_string_var} ${${_string_var}})
-ENDMACRO(STRIP_NEWLINES _string_var)
-
-MACRO(PKGCONFIG_FOUND _package _found)
-  # reset the variable at the beginning
-  SET(${_found})
-
-  # if pkg-config has been found
-  IF(PKGCONFIG_EXECUTABLE)
-
-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --print-errors --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+find_program(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
+
+macro(STRIP_NEWLINES _string_var)
+    string(REGEX REPLACE "[\n\r]+" "" ${_string_var} ${${_string_var}})
+endmacro(STRIP_NEWLINES _string_var)
+
+macro(PKGCONFIG_FOUND _package _found)
+    # reset the variable at the beginning
+    set(${_found})
+
+    # if pkg-config has been found
+    if(PKGCONFIG_EXECUTABLE)
+	exec_program(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --print-errors --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+	if(${_pkgconfigDevNull})
+	    message(STATUS "${_pkgconfigDevNull}")
+	endif(${_pkgconfigDevNull})
     
-    IF(${_pkgconfigDevNull})
-      MESSAGE(STATUS "${_pkgconfigDevNull}")
-    ENDIF(${_pkgconfigDevNull})
-    
-    IF(NOT _return_VALUE)
-      SET(${_found} "TRUE")
-    ENDIF(NOT _return_VALUE)
-  ENDIF(PKGCONFIG_EXECUTABLE)
-
-ENDMACRO(PKGCONFIG_FOUND _found)
-
-MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
-  # reset the variables at the beginning
-  SET(${_include_DIR})
-  SET(${_link_DIR})
-  SET(${_link_FLAGS})
-  SET(${_cflags})
-
-  # if pkg-config has been found
-  IF(PKGCONFIG_EXECUTABLE)
-
-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+	if(NOT _return_VALUE)
+	    set(${_found} "TRUE")
+	endif(NOT _return_VALUE)
+    endif(PKGCONFIG_EXECUTABLE)
+endmacro(PKGCONFIG_FOUND _found)
+
+macro(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
+    # reset the variables at the beginning
+    set(${_include_DIR})
+    set(${_link_DIR})
+    set(${_link_FLAGS})
+    set(${_cflags})
+
+    # if pkg-config has been found
+    if(PKGCONFIG_EXECUTABLE)
+	exec_program(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
 
     # and if the package of interest also exists for pkg-config, then get the information
-    IF(NOT _return_VALUE)
-
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} )
-
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} )
-
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} )
-
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
-
-      STRIP_NEWLINES(${_cflags})
-
-    ENDIF(NOT _return_VALUE)
-
-  ENDIF(PKGCONFIG_EXECUTABLE)
-
-ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
-
-MACRO(PKGCONFIG_VERSION _package _version)
-  # reset the variables at the beginning
-  SET(${_version})
-
-  # if pkg-config has been found
-  IF(PKGCONFIG_EXECUTABLE)
-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-
-    # and if the package of interest also exists for pkg-config, then get the information
-    IF(NOT _return_VALUE)
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --modversion OUTPUT_VARIABLE ${_version} )
-    ENDIF(NOT _return_VALUE)
-
-  ENDIF(PKGCONFIG_EXECUTABLE)
-
-ENDMACRO(PKGCONFIG_VERSION _package _version)
-
-MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
-
-MACRO(PKGCONFIG_DEFINITION _package _definition)
-  # reset the variables at the beginning
-  SET(${_definition})
-
-  # if pkg-config has been found
-  IF(PKGCONFIG_EXECUTABLE)
-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-
-    # and if the package of interest also exists for pkg-config, then get the information
-    IF(NOT _return_VALUE)
-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --cflags-only-other OUTPUT_VARIABLE ${_definition} )
-    ENDIF(NOT _return_VALUE)
-
-  ENDIF(PKGCONFIG_EXECUTABLE)
-
-ENDMACRO(PKGCONFIG_DEFINITION _package _definition)
-
-MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
+    if(NOT _return_VALUE)
+      exec_program(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} )
+      exec_program(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} )
+      exec_program(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} )
+      exec_program(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
+      strip_newlines(${_cflags})
+    endif(NOT _return_VALUE)
+  endif(PKGCONFIG_EXECUTABLE)
+endmacro(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
+
+macro(PKGCONFIG_VERSION _package _version)
+    # reset the variables at the beginning
+    set(${_version})
+
+    # if pkg-config has been found
+    if(PKGCONFIG_EXECUTABLE)
+	exec_program(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+
+	# and if the package of interest also exists for pkg-config, then get the information
+	if(NOT _return_VALUE)
+	    exec_program(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --modversion OUTPUT_VARIABLE ${_version} )
+	endif(NOT _return_VALUE)
+    endif(PKGCONFIG_EXECUTABLE)
+endmacro(PKGCONFIG_VERSION _package _version)
+
+mark_as_advanced(PKGCONFIG_EXECUTABLE)
+
+macro(PKGCONFIG_DEFINITION _package _definition)
+    # reset the variables at the beginning
+    set(${_definition})
+
+    # if pkg-config has been found
+    if(PKGCONFIG_EXECUTABLE)
+	exec_program(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+
+	# and if the package of interest also exists for pkg-config, then get the information
+	if(NOT _return_VALUE)
+	    exec_program(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --cflags-only-other OUTPUT_VARIABLE ${_definition} )
+	endif(NOT _return_VALUE)
+    endif(PKGCONFIG_EXECUTABLE)
+endmacro(PKGCONFIG_DEFINITION _package _definition)
+
+mark_as_advanced(PKGCONFIG_EXECUTABLE)