From 6739c3094137fa4f62ba2a8a8f3b9145481c013e Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Fri, 23 Jul 2021 16:04:25 +0200
Subject: [PATCH] fixed some var refs

---
 cmake/MapnikInstall.cmake     |  6 +++---
 utils/ogrindex/CMakeLists.txt | 10 +---------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/cmake/MapnikInstall.cmake b/cmake/MapnikInstall.cmake
index 6f0cfd553..5e9cd1349 100644
--- a/cmake/MapnikInstall.cmake
+++ b/cmake/MapnikInstall.cmake
@@ -4,20 +4,20 @@ function(mapnik_install)
     set(multiValueArgs)
     cmake_parse_arguments(MAPNIK_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    if(NOT ${MAPNIK_INSTALL_ALREADY_INSTALLED} AND NOT ${MAPNIK_INSTALL_IS_PLUGIN})
+    if(NOT MAPNIK_INSTALL_ALREADY_INSTALLED AND NOT MAPNIK_INSTALL_IS_PLUGIN)
         install(TARGETS ${MAPNIK_INSTALL_TARGET}
             LIBRARY DESTINATION ${MAPNIK_LIB_DIR}
             ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR}
             RUNTIME DESTINATION ${MAPNIK_BIN_DIR}
         )
-    elseif(NOT ${MAPNIK_INSTALL_ALREADY_INSTALLED} AND ${MAPNIK_INSTALL_IS_PLUGIN})
+    elseif(NOT MAPNIK_INSTALL_ALREADY_INSTALLED AND MAPNIK_INSTALL_IS_PLUGIN)
         install(TARGETS ${MAPNIK_INSTALL_TARGET}
             LIBRARY DESTINATION ${PLUGINS_INSTALL_DIR}
             ARCHIVE DESTINATION ${PLUGINS_INSTALL_DIR}
             RUNTIME DESTINATION ${PLUGINS_INSTALL_DIR}
         )
     endif()
-    if(NOT ${MAPNIK_INSTALL_IS_PLUGIN})
+    if(NOT MAPNIK_INSTALL_IS_PLUGIN)
         message(STATUS "${MAPNIK_INSTALL_TARGET}")
         get_target_property(TARGET_TYPE "${MAPNIK_INSTALL_TARGET}" TYPE)
         if (TARGET_TYPE STREQUAL "EXECUTABLE")
diff --git a/utils/ogrindex/CMakeLists.txt b/utils/ogrindex/CMakeLists.txt
index afc13541b..771b2c592 100644
--- a/utils/ogrindex/CMakeLists.txt
+++ b/utils/ogrindex/CMakeLists.txt
@@ -2,14 +2,6 @@ project(ogrindex)
 
 add_executable(ogrindex ogrindex.cpp)
 
-
 target_link_libraries(ogrindex PRIVATE mapnik::core mapnik::mapnik)
 
-install(TARGETS ogrindex
-    EXPORT MapnikTargets
-    LIBRARY DESTINATION ${MAPNIK_LIB_DIR}
-    ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR}
-    RUNTIME DESTINATION ${MAPNIK_BIN_DIR}
-)
-
-mapnik_install(TARGET mapnik-ogrindex)
+mapnik_install(TARGET ogrindex)