summaryrefslogtreecommitdiffstats
path: root/Modules/FindGLUT.cmake
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2002-06-13 18:45:46 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2002-06-13 18:45:46 (GMT)
commit35f6b648f20c85f488c06629456893c64ca873bf (patch)
tree377e7011c206c8835160366f5692bb4ef99d6690 /Modules/FindGLUT.cmake
parent5380afe02b0fa1f7d212e8639981e0df524315ac (diff)
downloadCMake-35f6b648f20c85f488c06629456893c64ca873bf.zip
CMake-35f6b648f20c85f488c06629456893c64ca873bf.tar.gz
CMake-35f6b648f20c85f488c06629456893c64ca873bf.tar.bz2
FIX: comply with the way OpenGL libs are set in FindOpenGL and FindGLU
Diffstat (limited to 'Modules/FindGLUT.cmake')
-rw-r--r--Modules/FindGLUT.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index c8c0329..101f19f 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -7,8 +7,7 @@
#
IF (WIN32)
- FIND_LIBRARY(GLUT_LIBRARY glut32)
-
+ SET (GLUT_LIBRARY glut32 CACHE STRING "GLUT library for win32")
ELSE (WIN32)
FIND_PATH(GLUT_INCLUDE_PATH GL/glut.h
/usr/include
generated by cgit v0.12 at 2025-01-15 06:41:54 (GMT)
4
-rw-r--r--src/cmake/modules/FindSDL_net.cmake4
-rw-r--r--src/cmake/modules/FindSDL_sound.cmake4
-rw-r--r--src/cmake/modules/FindSDL_ttf.cmake4
-rw-r--r--src/cmake/modules/FindTIFF.cmake2
-rw-r--r--src/devil-1-fixes.patch2
-rw-r--r--src/ghostscript-1-fixes.patch2
-rw-r--r--src/hamlib-test.c2
-rw-r--r--src/hamlib.mk2
-rw-r--r--src/minizip-1-unzOpenBuffer.patch2
-rw-r--r--src/ocaml-core.mk2
-rw-r--r--src/ocaml-xml-light.mk2
-rw-r--r--src/opencv-3-fixes-pkgconfig.patch2
-rw-r--r--src/postgresql.mk2
-rw-r--r--src/qt-1-cherrypicks.patch2
-rwxr-xr-xtools/build-pkg.lua2
22 files changed, 26 insertions, 26 deletions
diff --git a/docs/index.html b/docs/index.html
index a610b90..fc24ab5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2660,7 +2660,7 @@ endef</pre>
<a href="https://savannah.nongnu.org/projects/mingw-cross-env">Entry on Savannah</a>
</li>
<li>
- <a href="https://lists.debian.org/debian-embedded/2007/06/msg00007.html">First release anouncement</a>
+ <a href="https://lists.debian.org/debian-embedded/2007/06/msg00007.html">First release announcement</a>
and the discussion around it
</li>
</ul>
diff --git a/plugins/README.md b/plugins/README.md
index 6200938..2347be8 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -111,7 +111,7 @@ This type of package will also work with normal MXE features such as updates
and patches.
The customisation style (override/overlay) can be trickier since any arbitrary
-`make` statements can be used. Most normal variables should be overriden with
+`make` statements can be used. Most normal variables should be overridden with
[simply expanded variables](https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors)
i.e. using `:=` instead of `=`. For example, to change a package version:
diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch
index 4d9cbab..422ac79 100644
--- a/plugins/apps/qbittorrent-1-fixes.patch
+++ b/plugins/apps/qbittorrent-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 30 Aug 2015 00:28:50 +0200
-Subject: [PATCH] do not check qmake existance
+Subject: [PATCH] do not check qmake existence
Fix ./configure error:
diff --git a/src/cmake/modules/FindFriBiDi.cmake b/src/cmake/modules/FindFriBiDi.cmake
index 6dbfdf8..e09b460 100644
--- a/src/cmake/modules/FindFriBiDi.cmake
+++ b/src/cmake/modules/FindFriBiDi.cmake
@@ -8,7 +8,7 @@ endif()
pkg_check_modules(FRIBIDI fribidi)
-# for backward compatiblity
+# for backward compatibility
set(FRIBIDI_LIBRARY ${FRIBIDI_LIBRARIES})
set(FRIBIDI_INCLUDE_DIR ${FRIBIDI_INCLUDE_DIRS})
set(FRIBIDI_VERSION_STRING ${FRIBIDI_VERSION})
diff --git a/src/cmake/modules/FindSDL.cmake b/src/cmake/modules/FindSDL.cmake
index ed238c8..aeea71c 100644
--- a/src/cmake/modules/FindSDL.cmake
+++ b/src/cmake/modules/FindSDL.cmake
@@ -8,7 +8,7 @@ endif()
pkg_check_modules(SDL sdl)
-# for backward compatiblity
+# for backward compatibility
set(SDL_LIBRARY ${SDL_LIBRARIES})
set(SDL_INCLUDE_DIR ${SDL_INCLUDE_DIRS})
set(SDL_VERSION_STRING ${SDL_VERSION})
diff --git a/src/cmake/modules/FindSDL_image.cmake b/src/cmake/modules/FindSDL_image.cmake
index 8395403..865f143 100644
--- a/src/cmake/modules/FindSDL_image.cmake
+++ b/src/cmake/modules/FindSDL_image.cmake
@@ -8,7 +8,7 @@ endif()
pkg_check_modules(SDL_IMAGE SDL_image)
-# for backward compatiblity
+# for backward compatibility
set(SDLIMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES})
set(SDL_IMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES})
set(SDLIMAGE_INCLUDE_DIR ${SDL_IMAGE_INCLUDE_DIRS})
diff --git a/src/cmake/modules/FindSDL_mixer.cmake b/src/cmake/modules/FindSDL_mixer.cmake
index 9e4986b..27d453c 100644
--- a/src/cmake/modules/FindSDL_mixer.cmake
+++ b/src/cmake/modules/FindSDL_mixer.cmake
@@ -8,10 +8,10 @@ endif()
pkg_check_modules(SDL_MIXER SDL_mixer)
-#compatiblity
+#compatibility
set(SDL_MIXER_VERSION_STRING ${SDL_MIXER_VERSION})
-# for backward compatiblity
+# for backward compatibility
set(SDLMIXER_LIBRARY ${SDL_MIXER_LIBRARIES})
set(SDLMIXER_INCLUDE_DIR ${SDL_MIXER_INCLUDE_DIRS})
set(SDLMIXER_FOUND ${SDL_MIXER_FOUND})
diff --git a/src/cmake/modules/FindSDL_net.cmake b/src/cmake/modules/FindSDL_net.cmake
index 99f70ba..7ef91cf 100644
--- a/src/cmake/modules/FindSDL_net.cmake
+++ b/src/cmake/modules/FindSDL_net.cmake
@@ -8,10 +8,10 @@ endif()
pkg_check_modules(SDL_NET SDL_net)
-#compatiblity
+#compatibility
set(SDL_NET_VERSION_STRING ${SDL_NET_VERSION})
-# for backward compatiblity
+# for backward compatibility
set(SDLNET_LIBRARY ${SDL_NET_LIBRARIES})
set(SDLNET_INCLUDE_DIR ${SDL_NET_INCLUDE_DIRS})
set(SDLNET_FOUND ${SDL_NET_FOUND})
diff --git a/src/cmake/modules/FindSDL_sound.cmake b/src/cmake/modules/FindSDL_sound.cmake
index 58bb776..e0b44e6 100644
--- a/src/cmake/modules/FindSDL_sound.cmake
+++ b/src/cmake/modules/FindSDL_sound.cmake
@@ -8,9 +8,9 @@ endif()
pkg_check_modules(SDL_SOUND SDL_sound)
-#compatiblity
+#compatibility
set(SDL_SOUND_VERSION_STRING ${SDL_SOUND_VERSION})
set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS};${SDL_SOUND_LIBRARIES})
-# for backward compatiblity
+# for backward compatibility
set(SDL_SOUND_LIBRARY ${SDL_SOUND_LIBRARIES})
diff --git a/src/cmake/modules/FindSDL_ttf.cmake b/src/cmake/modules/FindSDL_ttf.cmake
index 6427cdc..8301637 100644
--- a/src/cmake/modules/FindSDL_ttf.cmake
+++ b/src/cmake/modules/FindSDL_ttf.cmake
@@ -8,10 +8,10 @@ endif()
pkg_check_modules(SDL_TTF SDL_ttf)
-#compatiblity
+#compatibility
set(SDL_TTF_VERSION_STRING ${SDL_TTF_VERSION})
-# for backward compatiblity
+# for backward compatibility
set(SDLTTF_LIBRARY ${SDL_TTF_LIBRARIES})
set(SDLTTF_INCLUDE_DIR ${SDL_TTF_INCLUDE_DIRS})
set(SDLTTF_FOUND ${SDL_TTF_FOUND})
diff --git a/src/cmake/modules/FindTIFF.cmake b/src/cmake/modules/FindTIFF.cmake
index a5a4996..8c4dbf0 100644
--- a/src/cmake/modules/FindTIFF.cmake
+++ b/src/cmake/modules/FindTIFF.cmake
@@ -8,7 +8,7 @@ endif()
pkg_check_modules(TIFF libtiff-4)
-# for backward compatiblity
+# for backward compatibility
set(TIFF_LIBRARY ${TIFF_LIBRARIES})
set(TIFF_INCLUDE_DIR ${TIFF_INCLUDE_DIRS})
set(TIFF_VERSION_STRING ${TIFF_VERSION})
diff --git a/src/devil-1-fixes.patch b/src/devil-1-fixes.patch
index d9e9764..d8ea25f 100644
--- a/src/devil-1-fixes.patch
+++ b/src/devil-1-fixes.patch
@@ -57,7 +57,7 @@ From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 20 Jul 2017 16:34:51 +1000
Subject: [PATCH] fix resource paths
-DevIL/src-IL/msvc/IL.rc has wierd EOL issues and patches don't
+DevIL/src-IL/msvc/IL.rc has weird EOL issues and patches don't
apply - use $(SED) in build rule instead
diff --git a/src/ghostscript-1-fixes.patch b/src/ghostscript-1-fixes.patch
index ffa30e7..4e21201 100644
--- a/src/ghostscript-1-fixes.patch
+++ b/src/ghostscript-1-fixes.patch
@@ -1298,7 +1298,7 @@ index 1111111..2222222 100644
+EXEEXTAUX="$EXEEXT"
+CROSS_COMPILING=no
+
-+AC_ARG_VAR(CCAUX, [auxilliary C compiler])
++AC_ARG_VAR(CCAUX, [auxiliary C compiler])
+
+if test "$cross_compiling" = yes ; then
+ CROSS_COMPILING=yes
diff --git a/src/hamlib-test.c b/src/hamlib-test.c
index 4248c30..ee382f7 100644
--- a/src/hamlib-test.c
+++ b/src/hamlib-test.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[]) {
}
/* Try to detect rig */
- /* may be overriden by backend probe */
+ /* may be overridden by backend probe */
myport.type.rig = RIG_PORT_SERIAL;
myport.parm.serial.rate = 9600;
myport.parm.serial.data_bits = 8;
diff --git a/src/hamlib.mk b/src/hamlib.mk
index 13c5417..d2571ab 100644
--- a/src/hamlib.mk
+++ b/src/hamlib.mk
@@ -15,7 +15,7 @@ $(PKG)_URL_2 := https://github.com/N0NB/$(PKG)/archive/$($(PKG)_VERSION).tar.
$(PKG)_DEPS := gcc libltdl libusb1 libxml2 pthreads
# grabbing version from sourceforge
-# prefered by Nate N0NB
+# preferred by Nate N0NB
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://sourceforge.net/projects/hamlib/files/hamlib/' | \
$(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
diff --git a/src/minizip-1-unzOpenBuffer.patch b/src/minizip-1-unzOpenBuffer.patch
index f8d1f28..34ce536 100644
--- a/src/minizip-1-unzOpenBuffer.patch
+++ b/src/minizip-1-unzOpenBuffer.patch
@@ -3,7 +3,7 @@ This file is part of MXE. See LICENSE.md for licensing information.
This patch has been taken from:
https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-zlib
-Modifications have been made to accomodate for commit.
+Modifications have been made to accommodate for commit.
nmoinvaz/minizip@9bccc22efb2d.
From c162a3620a3d0d317f59af8ddc2d1605bf5ee4b3 Mon Sep 17 00:00:00 2001
diff --git a/src/ocaml-core.mk b/src/ocaml-core.mk
index 751cb85..74eed3f 100644
--- a/src/ocaml-core.mk
+++ b/src/ocaml-core.mk
@@ -41,7 +41,7 @@ define $(PKG)_BUILD
# overwriting the binary versions which ship with the compiler with
# ones that contain the filename-win32-dirsep patch.
$(MAKE) -C '$(1)' -j 1 coreboot
- # second time, otherwise Segfault in some cases (depending on the runing system?)
+ # second time, otherwise Segfault in some cases (depending on the running system?)
$(MAKE) -C '$(1)' -j 1 coreboot
$(MAKE) -C '$(1)' -j 1 all
# install ocamldoc and camlp4 (non cross versions)
diff --git a/src/ocaml-xml-light.mk b/src/ocaml-xml-light.mk