mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-06 22:30:07 -05:00
Merge topic 'cygwin-patches'
ecc1961768FindTclsh: Drop Cygwin-specific behavior and use POSIX code pathaf666acdf4FindOpenGL: Drop Cygwin-specific behavior and use POSIX code path8edbc59e46install: Use case-sensitive pattern matching on Cygwin24482499eaFindPerlLibs: Add versioned perl library name for Cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5092
This commit is contained in:
@@ -132,19 +132,7 @@ endforeach()
|
||||
|
||||
set(_OpenGL_CACHE_VARS)
|
||||
|
||||
if (CYGWIN)
|
||||
find_path(OPENGL_INCLUDE_DIR GL/gl.h )
|
||||
list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR)
|
||||
|
||||
find_library(OPENGL_gl_LIBRARY opengl32 )
|
||||
find_library(OPENGL_glu_LIBRARY glu32 )
|
||||
|
||||
list(APPEND _OpenGL_CACHE_VARS
|
||||
OPENGL_INCLUDE_DIR
|
||||
OPENGL_gl_LIBRARY
|
||||
OPENGL_glu_LIBRARY
|
||||
)
|
||||
elseif (WIN32)
|
||||
if (WIN32)
|
||||
|
||||
if(BORLAND)
|
||||
set (OPENGL_gl_LIBRARY import32 CACHE STRING "OpenGL library for win32")
|
||||
|
||||
@@ -108,6 +108,9 @@ if (PERL_EXECUTABLE)
|
||||
if (NOT PERL_POSSIBLE_LIBRARY_NAMES)
|
||||
set(PERL_POSSIBLE_LIBRARY_NAMES perl${PERL_VERSION_STRING} perl)
|
||||
endif()
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
|
||||
list (APPEND PERL_POSSIBLE_LIBRARY_NAMES perl${PERL_VERSION_STRING})
|
||||
endif()
|
||||
if (CMAKE_SYSTEM_NAME MATCHES "MSYS|CYGWIN")
|
||||
# on MSYS and CYGWIN environments, current perl -V:libperl gives shared library name
|
||||
# rather than the import library. So, extends possible library names
|
||||
|
||||
@@ -15,15 +15,8 @@ library is. This code sets the following variables:
|
||||
|
||||
TCLSH_FOUND = TRUE if tclsh has been found
|
||||
TCL_TCLSH = the path to the tclsh executable
|
||||
|
||||
In cygwin, look for the cygwin version first. Don't look for it later
|
||||
to avoid finding the cygwin version on a Win32 build.
|
||||
#]=======================================================================]
|
||||
|
||||
if(CYGWIN)
|
||||
find_program(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
|
||||
endif()
|
||||
|
||||
get_filename_component(TK_WISH_PATH "${TK_WISH}" PATH)
|
||||
get_filename_component(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
|
||||
string(REGEX REPLACE
|
||||
|
||||
@@ -1157,7 +1157,7 @@ bool HandleDirectoryMode(std::vector<std::string> const& args,
|
||||
} else if (doing == DoingRegex) {
|
||||
literal_args += " REGEX \"";
|
||||
// Match rules are case-insensitive on some platforms.
|
||||
#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
|
||||
#if defined(_WIN32) || defined(__APPLE__)
|
||||
std::string regex = cmSystemTools::LowerCase(args[i]);
|
||||
#else
|
||||
std::string regex = args[i];
|
||||
|
||||
Reference in New Issue
Block a user