Use lower case cmake keywords

diff --git a/cmake/modules/CPackInstallConfig.cmake b/cmake/modules/CPackInstallConfig.cmake
index bf47cbbcc35cd6d68f0bce33d750b5acd5f627c3..aa8285efbb162d39971d35db3decb8a9650467bb 100644 (file)
--- a/cmake/modules/CPackInstallConfig.cmake
+++ b/cmake/modules/CPackInstallConfig.cmake
@@ -2,36 +2,36 @@
 if (DBUS_INSTALL_SYSTEM_LIBS)
     if (MINGW)
     else (MINGW)
-        INCLUDE(InstallRequiredSystemLibraries)
+        include(InstallRequiredSystemLibraries)
     endif (MINGW)
         install(FILES ${LIBEXPAT_LIBRARIES} DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif (DBUS_INSTALL_SYSTEM_LIBS)
 
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "D-BUS For Windows")
-SET(CPACK_PACKAGE_VENDOR "D-BUS Windows Team")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "D-BUS For Windows")
+set(CPACK_PACKAGE_VENDOR "D-BUS Windows Team")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 # duplicated from VERSION
-SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
 #SET(CPACK_PACKAGE_INSTALL_DIRECTORY "dbus ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "dbus")
-IF(WIN32 AND NOT UNIX)
-  SET(CPACK_GENERATOR NSIS ZIP)     # can be NSIS, STGZ, TBZ2, TGZ, TZ and ZIP
-  SET(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "dbus")
+if(WIN32 AND NOT UNIX)
+  set(CPACK_GENERATOR NSIS ZIP)     # can be NSIS, STGZ, TBZ2, TGZ, TZ and ZIP
+  set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
   # There is a bug in NSI that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
 # SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
-  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\dbus-launch.bat")
-  SET(CPACK_NSIS_DISPLAY_NAME "D-Bus for Windows")
-  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\sourceforge.net/projects/windbus")
-  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\sourceforge.net/projects/windbus")
-  SET(CPACK_NSIS_CONTACT "me@my-personal-home-page.com")
-  SET(CPACK_NSIS_MODIFY_PATH ON)
-ELSE(WIN32 AND NOT UNIX)
-  SET(CPACK_STRIP_FILES "bin/MyExecutable")
-  SET(CPACK_SOURCE_STRIP_FILES "")
-ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "dbus-launch" "D-Bus Daemon")
-INCLUDE(CPack)
+  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\dbus-launch.bat")
+  set(CPACK_NSIS_DISPLAY_NAME "D-Bus for Windows")
+  set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\sourceforge.net/projects/windbus")
+  set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\sourceforge.net/projects/windbus")
+  set(CPACK_NSIS_CONTACT "me@my-personal-home-page.com")
+  set(CPACK_NSIS_MODIFY_PATH ON)
+else(WIN32 AND NOT UNIX)
+  set(CPACK_STRIP_FILES "bin/MyExecutable")
+  set(CPACK_SOURCE_STRIP_FILES "")
+endif(WIN32 AND NOT UNIX)
+set(CPACK_PACKAGE_EXECUTABLES "dbus-launch" "D-Bus Daemon")
+include(CPack)

diff --git a/cmake/modules/MacroGetenvWinPath.cmake b/cmake/modules/MacroGetenvWinPath.cmake
index b18f7f639a071acf3a86bc73e08303de74329337..4a020a3d0e3f442f3823678a0518bf534cfa2485 100644 (file)
--- a/cmake/modules/MacroGetenvWinPath.cmake
+++ b/cmake/modules/MacroGetenvWinPath.cmake
@@ -1,5 +1,5 @@
 
-MACRO (MACRO_GETENV_WIN_PATH var name)
-   set(${var} $ENV{${name}})
-   STRING(REGEX REPLACE "\\\\" "/" ${var} "${${var}}")
-ENDMACRO (MACRO_GETENV_WIN_PATH var name)
+macro(MACRO_GETENV_WIN_PATH var name)
+    set(${var} $ENV{${name}})
+    string(REGEX REPLACE "\\\\" "/" ${var} "${${var}}")
+endmacro(MACRO_GETENV_WIN_PATH var name)

diff --git a/cmake/modules/MacroLibrary.cmake b/cmake/modules/MacroLibrary.cmake
index 6523530cacd8abebf5b2c4ace61fe6245c7918d0..d2134e0a037f873ed615280e08d22c534ad6fd03 100644 (file)
--- a/cmake/modules/MacroLibrary.cmake
+++ b/cmake/modules/MacroLibrary.cmake
@@ -1,7 +1,7 @@
 # - include MacroLibrary offers a collection of macros which extend the built-in cmake commands
 # OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
 
-INCLUDE(MacroOptionalFindPackage)
+include(MacroOptionalFindPackage)
 #INCLUDE(MacroAdditionalCleanFiles)
 #INCLUDE(MacroAddFileDependencies)
 #INCLUDE(MacroGetenvWinPath)

diff --git a/cmake/modules/MacrosAutotools.cmake b/cmake/modules/MacrosAutotools.cmake
index d770b949dde8542038d8ccb117082750777ff11e..1f9b942c2a69b5d510bcfcef5a958b86d9908595 100644 (file)
--- a/cmake/modules/MacrosAutotools.cmake
+++ b/cmake/modules/MacrosAutotools.cmake
@@ -12,8 +12,8 @@ macro(autoinit config)
     file(READ ${config} _configure_ac_raw)
     # Convert file contents into a CMake list (where each element in the list
     # is one line of the file)
-    STRING(REGEX REPLACE ";" "\\\\;" _configure_ac "${_configure_ac_raw}")
-    STRING(REGEX REPLACE "\n" ";" _configure_ac "${_configure_ac}")
+    string(REGEX REPLACE ";" "\\\\;" _configure_ac "${_configure_ac_raw}")
+    string(REGEX REPLACE "\n" ";" _configure_ac "${_configure_ac}")
 endmacro()
 
 # extracts version information from autoconf config file
@@ -120,8 +120,8 @@ macro(autoheaderchecks config_h_in configure_checks_file config_h_cmake)
     file(READ ${configure_checks_file} configure_checks_file_raw)
     file(READ ${config_h_in} _config_h_in_raw)
     file(READ ${config_h_cmake} _config_h_cmake_raw)
-    STRING(REGEX REPLACE ";" "\\\\;" _config_h_in "${_config_h_in_raw}")
-    STRING(REGEX REPLACE "\n" ";" _config_h_in "${_config_h_in}")
+    string(REGEX REPLACE ";" "\\\\;" _config_h_in "${_config_h_in_raw}")
+    string(REGEX REPLACE "\n" ";" _config_h_in "${_config_h_in}")
     foreach(line ${_config_h_in})
         #message(STATUS ${line})
         if(line MATCHES ".*HAVE_.*_H.*")
@@ -158,8 +158,8 @@ macro(autoconfig template output)
     file(READ ${template} contents)
     # Convert file contents into a CMake list (where each element in the list
     # is one line of the file)
-    STRING(REGEX REPLACE ";" "\\\\;" contents "${contents}")
-    STRING(REGEX REPLACE "\n" ";" contents "${contents}")
+    string(REGEX REPLACE ";" "\\\\;" contents "${contents}")
+    string(REGEX REPLACE "\n" ";" contents "${contents}")
     foreach(line contents)
         message(STATUS ${line})
         # find #undef lines

diff --git a/cmake/modules/Win32Macros.cmake b/cmake/modules/Win32Macros.cmake
index 03f1ee59f21ec38adac1cf566fa72c838e55b134..a95727614ddb00eadeda3d154d8183ef5cf352c1 100644 (file)
--- a/cmake/modules/Win32Macros.cmake
+++ b/cmake/modules/Win32Macros.cmake
@@ -16,7 +16,7 @@ if (WIN32)
     # opens the related .sln file with paths setting specified at 
     # configure time. 
     #
-    MACRO (addExplorerWrapper _projectname)
+    macro(addExplorerWrapper _projectname)
         # write explorer wrappers
         get_filename_component(CMAKE_BIN_PATH ${CMAKE_COMMAND} PATH)
         set (ADD_PATH "${CMAKE_BIN_PATH}")
@@ -40,5 +40,5 @@ if (WIN32)
                 write_file (${CMAKE_BINARY_DIR}/${_projectname}-sln.bat "set PATH=${ADD_PATH};%PATH%\nstart ${_projectname}.sln")
             endif (CMAKE_BUILD_TOOL STREQUAL  "nmake")
         endif (MINGW)
-    ENDMACRO (addExplorerWrapper)
+    endmacro(addExplorerWrapper)
 endif(WIN32)