From 4afe9678ddd633225db851c31a14d5e63b160611 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 1 Feb 2018 00:09:31 +0100 Subject: [PATCH] run crssync on install (fixes #17993) --- postinstall/CMakeLists.txt | 6 ++++++ postinstall/PostInstall.cmake.in | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/postinstall/CMakeLists.txt b/postinstall/CMakeLists.txt index 3b3972aa767..9aefab5cabf 100644 --- a/postinstall/CMakeLists.txt +++ b/postinstall/CMakeLists.txt @@ -2,5 +2,11 @@ # for included scripts that set policies INSTALL (CODE "cmake_policy(SET CMP0011 NEW)") +IF(MSVC AND NOT USING_NMAKE) + SET(CRSSYNC "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/crssync.exe") +ELSE(MSVC AND NOT USING_NMAKE) + SET(CRSSYNC "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync") +ENDIF(MSVC AND NOT USING_NMAKE) + CONFIGURE_FILE("PostInstall.cmake.in" "PostInstall.cmake" @ONLY) INSTALL(SCRIPT "${CMAKE_BINARY_DIR}/postinstall/PostInstall.cmake") diff --git a/postinstall/PostInstall.cmake.in b/postinstall/PostInstall.cmake.in index 7d8be5ef1e6..da6d2e8d10d 100644 --- a/postinstall/PostInstall.cmake.in +++ b/postinstall/PostInstall.cmake.in @@ -5,5 +5,8 @@ CMAKE_POLICY(SET CMP0012 NEW) IF(@WITH_PY_COMPILE@) MESSAGE(STATUS "Byte-compiling core Python utilities and plugins...") # exclude Python 3 modules in PyQt4.uic package - EXECUTE_PROCESS(COMMAND @PYTHON_EXECUTABLE@ -m compileall -q -x ".*uic.port_v3.*" "@CMAKE_INSTALL_PREFIX@/@QGIS_DATA_DIR@/python") + EXECUTE_PROCESS(COMMAND @PYTHON_EXECUTABLE@ -m compileall -q -x ".*uic.port_v3.*" "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/@QGIS_DATA_DIR@/python") ENDIF(@WITH_PY_COMPILE@) + +set(ENV{QGIS_PREFIX_PATH} "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@") +EXECUTE_PROCESS(COMMAND "@CRSSYNC@")