Skip to content

Commit

Permalink
osgeo4w: fix lrelease lookup
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Sep 19, 2018
1 parent fde813c commit 74b2e19
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 9 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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 )

Expand Down
1 change: 0 additions & 1 deletion ms-windows/osgeo4w/package-nightly.cmd
Expand Up @@ -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% ^
Expand Down
1 change: 0 additions & 1 deletion ms-windows/osgeo4w/package.cmd
Expand Up @@ -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% ^
Expand Down

0 comments on commit 74b2e19

Please sign in to comment.