summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindArmadillo.cmake2
-rw-r--r--Modules/FindCUDA.cmake2
-rw-r--r--Modules/FindDevIL.cmake21
-rw-r--r--Modules/FindFLTK.cmake10
-rw-r--r--Modules/FindFLTK2.cmake14
-rw-r--r--Modules/FindLua50.cmake6
-rw-r--r--Modules/FindLua51.cmake4
-rw-r--r--Modules/FindOpenAL.cmake4
-rw-r--r--Modules/FindPhysFS.cmake4
-rw-r--r--Modules/FindProducer.cmake4
-rw-r--r--Modules/FindSDL_image.cmake4
-rw-r--r--Modules/FindSDL_mixer.cmake4
-rw-r--r--Modules/FindSDL_net.cmake4
-rw-r--r--Modules/FindSDL_sound.cmake20
-rw-r--r--Modules/FindSDL_ttf.cmake4
-rw-r--r--Modules/FindSquish.cmake8
-rw-r--r--Modules/FindTCL.cmake4
-rw-r--r--Modules/FindTclStub.cmake2
-rw-r--r--Modules/FindwxWindows.cmake2
19 files changed, 25 insertions, 98 deletions
diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake
index 50eb787..84ed3ca 100644
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@ -74,7 +74,7 @@ endif (ARMADILLO_INCLUDE_DIR)
#======================
-# Checks 'RECQUIRED', 'QUIET' and versions.
+# Checks 'REQUIRED', 'QUIET' and versions.
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Armadillo
REQUIRED_VARS ARMADILLO_LIBRARY ARMADILLO_INCLUDE_DIR
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 9f8d575..56a92c1 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -540,7 +540,7 @@ set (CUDA_INCLUDE_DIRS ${CUDA_TOOLKIT_INCLUDE})
macro(FIND_LIBRARY_LOCAL_FIRST _var _names _doc)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- # CUDA 3.2+ on Windows moved the library directoryies, so we need the new
+ # CUDA 3.2+ on Windows moved the library directories, so we need the new
# and old paths.
set(_cuda_64bit_lib_dir "lib/x64" "lib64" )
endif()
diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake
index 0e21284..4a0fbe0 100644
--- a/Modules/FindDevIL.cmake
+++ b/Modules/FindDevIL.cmake
@@ -2,11 +2,22 @@
# http://openil.sourceforge.net/
#
# This module sets:
-# IL_LIBRARIES the name of the IL library. These include the full path to the core DevIL library. This one has to be linked into the application.
-# ILU_LIBRARIES the name of the ILU library. Again, the full path. This library is for filters and effects, not actual loading. It doesn't have to be linked if the functionality it provides is not used.
-# ILUT_LIBRARIES the name of the ILUT library. Full path. This part of the library interfaces with OpenGL. It is not strictly needed in applications.
-# IL_INCLUDE_DIR where to find the il.h, ilu.h and ilut.h files.
-# IL_FOUND this is set to TRUE if all the above variables were set. This will be set to false if ILU or ILUT are not found, even if they are not needed. In most systems, if one library is found all the others are as well. That's the way the DevIL developers release it.
+# IL_LIBRARIES - the name of the IL library. These include the full path to
+# the core DevIL library. This one has to be linked into the
+# application.
+# ILU_LIBRARIES - the name of the ILU library. Again, the full path. This
+# library is for filters and effects, not actual loading. It
+# doesn't have to be linked if the functionality it provides
+# is not used.
+# ILUT_LIBRARIES - the name of the ILUT library. Full path. This part of the
+# library interfaces with OpenGL. It is not strictly needed
+# in applications.
+# IL_INCLUDE_DIR - where to find the il.h, ilu.h and ilut.h files.
+# IL_FOUND - this is set to TRUE if all the above variables were set.
+# This will be set to false if ILU or ILUT are not found,
+# even if they are not needed. In most systems, if one
+# library is found all the others are as well. That's the
+# way the DevIL developers release it.
#=============================================================================
# Copyright 2008-2009 Kitware, Inc.
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index bb18a2e..bdea95b 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -79,18 +79,14 @@ SET(FLTK_DIR_STRING "directory containing FLTKConfig.cmake. This is either the
# Search only if the location is not already known.
IF(NOT FLTK_DIR)
# Get the system search path as a list.
- IF(UNIX)
- STRING(REGEX MATCHALL "[^:]+" FLTK_DIR_SEARCH1 "$ENV{PATH}")
- ELSE(UNIX)
- STRING(REGEX REPLACE "\\\\" "/" FLTK_DIR_SEARCH1 "$ENV{PATH}")
- ENDIF(UNIX)
- STRING(REGEX REPLACE "/;" ";" FLTK_DIR_SEARCH2 ${FLTK_DIR_SEARCH1})
+ FILE(TO_CMAKE_PATH "$ENV{PATH}" FLTK_DIR_SEARCH2)
# Construct a set of paths relative to the system search path.
SET(FLTK_DIR_SEARCH "")
FOREACH(dir ${FLTK_DIR_SEARCH2})
SET(FLTK_DIR_SEARCH ${FLTK_DIR_SEARCH} "${dir}/../lib/fltk")
ENDFOREACH(dir)
+ STRING(REPLACE "//" "/" FLTK_DIR_SEARCH "${FLTK_DIR_SEARCH}")
#
# Look for an installation or build tree.
@@ -105,8 +101,6 @@ IF(NOT FLTK_DIR)
# Look in standard UNIX install locations.
/usr/local/lib/fltk
/usr/lib/fltk
- /usr/local/include
- /usr/include
/usr/local/fltk
/usr/X11R6/include
diff --git a/Modules/FindFLTK2.cmake b/Modules/FindFLTK2.cmake
index 436e280..9164745 100644
--- a/Modules/FindFLTK2.cmake
+++ b/Modules/FindFLTK2.cmake
@@ -59,18 +59,14 @@ SET(FLTK2_DIR_STRING "directory containing FLTK2Config.cmake. This is either th
# Search only if the location is not already known.
IF(NOT FLTK2_DIR)
# Get the system search path as a list.
- IF(UNIX)
- STRING(REGEX MATCHALL "[^:]+" FLTK2_DIR_SEARCH1 "$ENV{PATH}")
- ELSE(UNIX)
- STRING(REGEX REPLACE "\\\\" "/" FLTK2_DIR_SEARCH1 "$ENV{PATH}")
- ENDIF(UNIX)
- STRING(REGEX REPLACE "/;" ";" FLTK2_DIR_SEARCH2 ${FLTK2_DIR_SEARCH1})
+ FILE(TO_CMAKE_PATH "$ENV{PATH}" FLTK2_DIR_SEARCH2)
# Construct a set of paths relative to the system search path.
SET(FLTK2_DIR_SEARCH "")
FOREACH(dir ${FLTK2_DIR_SEARCH2})
SET(FLTK2_DIR_SEARCH ${FLTK2_DIR_SEARCH} "${dir}/../lib/fltk")
ENDFOREACH(dir)
+ STRING(REPLACE "//" "/" FLTK2_DIR_SEARCH "${FLTK2_DIR_SEARCH}")
#
# Look for an installation or build tree.
@@ -85,8 +81,6 @@ IF(NOT FLTK2_DIR)
# Look in standard UNIX install locations.
/usr/local/lib/fltk2
/usr/lib/fltk2
- /usr/local/include
- /usr/include
/usr/local/fltk2
/usr/X11R6/include
@@ -193,8 +187,6 @@ IF(FLTK2_DIR)
ENDIF(FLTK2_FLUID_EXECUTABLE)
SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
- /usr/local/include
- /usr/include
/usr/local/fltk2
/usr/X11R6/include
)
@@ -202,8 +194,6 @@ IF(FLTK2_DIR)
FIND_PATH(FLTK2_INCLUDE_DIR fltk/run.h ${FLTK2_INCLUDE_SEARCH_PATH})
SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
- /usr/lib
- /usr/local/lib
/usr/local/fltk2/lib
/usr/X11R6/lib
${FLTK2_INCLUDE_DIR}/lib
diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake
index ee8b84e..9a5cc17 100644
--- a/Modules/FindLua50.cmake
+++ b/Modules/FindLua50.cmake
@@ -31,8 +31,6 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -47,8 +45,6 @@ FIND_LIBRARY(LUA_LIBRARY_lua
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
@@ -67,8 +63,6 @@ ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
$ENV{LUA_DIR}
PATH_SUFFIXES lib64 lib
PATHS
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
index b67dd4c..e111d36 100644
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@@ -32,8 +32,6 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -48,8 +46,6 @@ FIND_LIBRARY(LUA_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index bcba6e2..cb3ce48 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,8 +68,6 @@ FIND_PATH(OPENAL_INCLUDE_DIR al.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -85,8 +83,6 @@ FIND_LIBRARY(OPENAL_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake
index 80dfd51..2e3ac14 100644
--- a/Modules/FindPhysFS.cmake
+++ b/Modules/FindPhysFS.cmake
@@ -30,8 +30,6 @@ FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -46,8 +44,6 @@ FIND_LIBRARY(PHYSFS_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake
index 39a9436..26c804a 100644
--- a/Modules/FindProducer.cmake
+++ b/Modules/FindProducer.cmake
@@ -51,8 +51,6 @@ FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local/include
- /usr/include
/sw/include # Fink
/opt/local/include # DarwinPorts
/opt/csw/include # Blastwave
@@ -69,8 +67,6 @@ FIND_LIBRARY(PRODUCER_LIBRARY
$ENV{OSGDIR}
PATH_SUFFIXES lib64 lib
PATHS
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake
index 9a130fa..f215bda 100644
--- a/Modules/FindSDL_image.cmake
+++ b/Modules/FindSDL_image.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -60,8 +58,6 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
index ce1ae9e..7cc1a6b 100644
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -60,8 +58,6 @@ FIND_LIBRARY(SDLMIXER_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake
index b5ada54..ca1de79 100644
--- a/Modules/FindSDL_net.cmake
+++ b/Modules/FindSDL_net.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -59,8 +57,6 @@ FIND_LIBRARY(SDLNET_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 8edf6ca..35294a5 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -86,8 +86,6 @@ FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -106,8 +104,6 @@ FIND_LIBRARY(SDL_SOUND_LIBRARY
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
PATHS
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -222,8 +218,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -245,8 +239,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -271,8 +263,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -293,8 +283,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -317,8 +305,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -341,8 +327,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -368,8 +352,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -395,8 +377,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake
index 3d07ab7..184b6c3 100644
--- a/Modules/FindSDL_ttf.cmake
+++ b/Modules/FindSDL_ttf.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -59,8 +57,6 @@ FIND_LIBRARY(SDLTTF_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index b0b6b2f..48d195a 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -43,18 +43,14 @@ SET(SQUISH_CLIENT_EXECUTABLE_STRING "The squishclient executable program.")
# Search only if the location is not already known.
IF(NOT SQUISH_INSTALL_DIR)
# Get the system search path as a list.
- IF(UNIX)
- STRING(REGEX MATCHALL "[^:]+" SQUISH_INSTALL_DIR_SEARCH1 "$ENV{PATH}")
- ELSE(UNIX)
- STRING(REGEX REPLACE "\\\\" "/" SQUISH_INSTALL_DIR_SEARCH1 "$ENV{PATH}")
- ENDIF(UNIX)
- STRING(REGEX REPLACE "/;" ";" SQUISH_INSTALL_DIR_SEARCH2 ${SQUISH_INSTALL_DIR_SEARCH1})
+ FILE(TO_CMAKE_PATH "$ENV{PATH}" SQUISH_INSTALL_DIR_SEARCH2)
# Construct a set of paths relative to the system search path.
SET(SQUISH_INSTALL_DIR_SEARCH "")
FOREACH(dir ${SQUISH_INSTALL_DIR_SEARCH2})
SET(SQUISH_INSTALL_DIR_SEARCH ${SQUISH_INSTALL_DIR_SEARCH} "${dir}/../lib/fltk")
ENDFOREACH(dir)
+ STRING(REPLACE "//" "/" SQUISH_INSTALL_DIR_SEARCH "${SQUISH_INSTALL_DIR_SEARCH}")
# Look for an installation
FIND_PATH(SQUISH_INSTALL_DIR bin/squishrunner
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index f2c776f..7f6d3a7 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -82,8 +82,6 @@ SET(TCLTK_POSSIBLE_LIB_PATHS
"${TK_LIBRARY_PATH}"
"${TCL_TCLSH_PATH_PARENT}/lib"
"${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
)
IF(WIN32)
@@ -162,8 +160,6 @@ SET(TCLTK_POSSIBLE_INCLUDE_PATHS
${TK_FRAMEWORK_INCLUDES}
"${TCL_TCLSH_PATH_PARENT}/include"
"${TK_WISH_PATH_PARENT}/include"
- /usr/include
- /usr/local/include
/usr/include/tcl${TK_LIBRARY_VERSION}
/usr/include/tcl${TCL_LIBRARY_VERSION}
/usr/include/tcl8.6
diff --git a/Modules/FindTclStub.cmake b/Modules/FindTclStub.cmake
index 4db2716..79d14ae 100644
--- a/Modules/FindTclStub.cmake
+++ b/Modules/FindTclStub.cmake
@@ -66,8 +66,6 @@ SET(TCLTK_POSSIBLE_LIB_PATHS
"${TK_LIBRARY_PATH}"
"${TCL_TCLSH_PATH_PARENT}/lib"
"${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
)
IF(WIN32)
diff --git a/Modules/FindwxWindows.cmake b/Modules/FindwxWindows.cmake
index f55cf00..dfb28ff 100644
--- a/Modules/FindwxWindows.cmake
+++ b/Modules/FindwxWindows.cmake
@@ -139,7 +139,7 @@ IF(WIN32_STYLE_FIND)
## find libs for combination of static/shared with release/debug
## be careful if you add something here,
## avoid mixing of headers and libs of different wx versions,
- ## there may be multiple WX version s installed.
+ ## there may be multiple WX versions installed.
SET (WXWINDOWS_POSSIBLE_LIB_PATHS
"${WXWINDOWS_ROOT_DIR}/lib"
)
generated by cgit v0.12 at 2025-01-23 19:10:45 (GMT)