Skip to content
Permalink
Browse files

osgeo4w: fix lrelease lookup

  • Loading branch information
jef-n committed Sep 19, 2018
1 parent fde813c commit 74b2e194342e8a89d0113de9a65ce6e372aa7c34
Showing with 1 addition and 9 deletions.
  1. +0 −6 CMakeLists.txt
  2. +1 −1 i18n/CMakeLists.txt
  3. +0 −1 ms-windows/osgeo4w/package-nightly.cmd
  4. +0 −1 ms-windows/osgeo4w/package.cmd
@@ -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
@@ -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 )

@@ -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% ^
@@ -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% ^

0 comments on commit 74b2e19

Please sign in to comment.
You can’t perform that action at this time.