osgeo4w: fix lrelease lookup

jef-n · jef-n · commit 74b2e194342e · 2018-09-19T19:22:08.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -393,12 +393,6 @@ IF(WITH_CORE)
   # Disable automatic conversion from QString to ASCII 8-bit strings (char *)
   # (Keeps code compatible with Qt/Mac/64bit)
   ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII)
-
-  FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
-    NAMES lrelease
-    PATHS ${QT_BINARY_DIR}
-    NO_DEFAULT_PATH
-  )
 ENDIF(WITH_CORE)
 
 # build our version of astyle
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
@@ -1,4 +1,4 @@
-Find_Program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
+FIND_PROGRAM(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
 
 MACRO(ADD_TRANSLATION_FILES _sources )
 
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -156,7 +156,6 @@ cmake -G "%CMAKEGEN%" ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python3.exe ^
 	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python36/include ^
 	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python36/libs/python36.lib ^
-	-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
 	-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
 	-D QT_HEADERS_DIR=%O4W_ROOT%/apps/qt5/include ^
 	-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -162,7 +162,6 @@ cmake -G "%CMAKEGEN%" ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python3.exe ^
 	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python36/include ^
 	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python36/libs/python36.lib ^
-	-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
 	-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
 	-D QT_HEADERS_DIR=%O4W_ROOT%/apps/qt5/include ^
 	-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Find_Program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)`
	`1`	`+FIND_PROGRAM(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)`
`2`	`2`
`3`	`3`	`MACRO(ADD_TRANSLATION_FILES _sources )`
`4`	`4`