[evolution-data-server/wip/cmake] Replace 'cmake' calls with '${CMAKE_COMMAND}'

[Milan Crha <mcrha src gnome org>]

commit a437ed80d2c89280b50f8d1f21fbab65d71e48a3
Author: Milan Crha <mcrha redhat com>
Date:   Thu Sep 29 15:55:56 2016 +0200

    Replace 'cmake' calls with '${CMAKE_COMMAND}'

 cmake/modules/FindIntltool.cmake       |    2 +-
 cmake/modules/GLibTools.cmake          |    8 ++++----
 cmake/modules/GtkDoc.cmake             |    2 +-
 tests/book-migration/CMakeLists.txt    |    8 ++++----
 tests/book-migration/db/CMakeLists.txt |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/cmake/modules/FindIntltool.cmake b/cmake/modules/FindIntltool.cmake
index 1ddde6b..17b1718 100644
--- a/cmake/modules/FindIntltool.cmake
+++ b/cmake/modules/FindIntltool.cmake
@@ -88,7 +88,7 @@ macro(intltool_add_pot_file_target)
        endif(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
 
        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${GETTEXT_PACKAGE}.pot
-               COMMAND cmake -E env INTLTOOL_EXTRACT="${INTLTOOL_EXTRACT}" XGETTEXT="${XGETTEXT}" 
srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
+               COMMAND ${CMAKE_COMMAND} -E env INTLTOOL_EXTRACT="${INTLTOOL_EXTRACT}" XGETTEXT="${XGETTEXT}" 
srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
        )
 
        add_custom_target(pot-file
diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
index b8c5b22..b247238 100644
--- a/cmake/modules/GLibTools.cmake
+++ b/cmake/modules/GLibTools.cmake
@@ -187,7 +187,7 @@ macro(add_gsettings_schemas _target _schema0)
                add_custom_command(
                        OUTPUT ${_outputfile}
                        COMMAND ${GLIB_COMPILE_SCHEMAS} --strict --dry-run --schema-file=${_schema_fullname}
-                       COMMAND cmake -E copy_if_different "${_schema_fullname}" 
"${CMAKE_CURRENT_BINARY_DIR}/${_outputfile}"
+                       COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_schema_fullname}" 
"${CMAKE_CURRENT_BINARY_DIR}/${_outputfile}"
                        DEPENDS ${_schema_fullname}
                        VERBATIM
                )
@@ -198,7 +198,7 @@ macro(add_gsettings_schemas _target _schema0)
                        # because there is no better way in CMake to run a code/script after
                        # the whole `make install`
                        set(_install_code "${_install_code}
-                               COMMAND cmake -E copy_if_different \"${_schema_fullname}\" 
\"${GSETTINGS_SCHEMAS_DIR}\""
+                               COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${_schema_fullname}\" 
\"${GSETTINGS_SCHEMAS_DIR}\""
                        )
                endif(ENABLE_SCHEMAS_COMPILE)
 
@@ -211,7 +211,7 @@ macro(add_gsettings_schemas _target _schema0)
                # Compile gsettings schemas and ensure that all of them are in the place.
                install(CODE
                        "execute_process(${_install_code}
-                               COMMAND cmake -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" 
\"${GSETTINGS_SCHEMAS_DIR}\"
+                               COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" 
\"${GSETTINGS_SCHEMAS_DIR}\"
                        )")
        endif(_install_code)
 endmacro(add_gsettings_schemas)
@@ -225,7 +225,7 @@ endmacro(add_gsettings_schemas)
 #
 if(ENABLE_SCHEMAS_COMPILE)
        add_custom_command(TARGET uninstall POST_BUILD
-               COMMAND cmake -E chdir . "${GLIB_COMPILE_SCHEMAS}" "${GSETTINGS_SCHEMAS_DIR}"
+               COMMAND ${CMAKE_COMMAND} -E chdir . "${GLIB_COMPILE_SCHEMAS}" "${GSETTINGS_SCHEMAS_DIR}"
                COMMENT "Recompile GSettings schemas in '${GSETTINGS_SCHEMAS_DIR}'"
        )
 endif(ENABLE_SCHEMAS_COMPILE)
diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
index 8545bf4..3f4cb17 100644
--- a/cmake/modules/GtkDoc.cmake
+++ b/cmake/modules/GtkDoc.cmake
@@ -65,7 +65,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
 
        set(_mkhtml_prefix "")
        if(APPLE)
-               set(_mkhtml_prefix "cmake -E env XML_CATALOG_FILES=\"/usr/local/etc/xml/catalog\"")
+               set(_mkhtml_prefix "${CMAKE_COMMAND} -E env XML_CATALOG_FILES=\"/usr/local/etc/xml/catalog\"")
        endif(APPLE)
 
        add_custom_command(OUTPUT html/index.html
diff --git a/tests/book-migration/CMakeLists.txt b/tests/book-migration/CMakeLists.txt
index 8164ea1..93a6571 100644
--- a/tests/book-migration/CMakeLists.txt
+++ b/tests/book-migration/CMakeLists.txt
@@ -82,14 +82,14 @@ build_only_installable_test(setup-migration-test
 # manually compiled and used with older builds of EDS.
 set(_use_db_version "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 add_custom_target(setup-migration
-       COMMAND cmake -E echo "Setting up new migration sandbox in 
${CMAKE_SOURCE_DIR}/tests/book-migration/db/${_use_db_version}..."
+       COMMAND ${CMAKE_COMMAND} -E echo "Setting up new migration sandbox in 
${CMAKE_SOURCE_DIR}/tests/book-migration/db/${_use_db_version}..."
        COMMAND ${CMAKE_BINARY_DIR}/tests/book-migration/setup-migration-test
                --use-test-sandbox --book-id ${_use_db_version}
                --contacts-directory ${CMAKE_SOURCE_DIR}/tests/book-migration/vcards
-       COMMAND cmake -E make_directory ${CMAKE_SOURCE_DIR}/tests/book-migration/db/${_use_db_version}
-       COMMAND cmake -E copy 
${CMAKE_BINARY_DIR}/tests/test-server-utils/cache/evolution/addressbook/${_use_db_version}/contacts.db
+       COMMAND ${CMAKE_COMMAND} -E make_directory 
${CMAKE_SOURCE_DIR}/tests/book-migration/db/${_use_db_version}
+       COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_BINARY_DIR}/tests/test-server-utils/cache/evolution/addressbook/${_use_db_version}/contacts.db
                ${CMAKE_SOURCE_DIR}/tests/book-migration/db/${_use_db_version}/
-       COMMAND cmake -E echo "Done."
+       COMMAND ${CMAKE_COMMAND} -E echo "Done."
        DEPENDS setup-migration-test
 )
 
diff --git a/tests/book-migration/db/CMakeLists.txt b/tests/book-migration/db/CMakeLists.txt
index e684701..38a9d8d 100644
--- a/tests/book-migration/db/CMakeLists.txt
+++ b/tests/book-migration/db/CMakeLists.txt
@@ -11,7 +11,7 @@ if(HAVE_DB_LOAD)
 
        foreach(_ver ${GENERATED_DBS_VERSIONS})
                add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_ver}/addressbook.db
-                       COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${_ver}
+                       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${_ver}
                        COMMAND ${DB_LOAD} -f ${CMAKE_CURRENT_SOURCE_DIR}/${_ver}/addressbook.dump 
${CMAKE_CURRENT_BINARY_DIR}/${_ver}/addressbook.db
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_ver}/addressbook.dump
                )