diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-07 15:05:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-07 15:05:39 (GMT) |
| commit | d8f7a05b372f36c62e770dac37f5641c7ce0780b (patch) | |
| tree | 6d5d09d292bf2224073be03c5089d0652e212230 | |
| parent | 304f159af4ce956c5c1bd77c9e2d240d23245cbe (diff) | |
| parent | ecc19617686f29429e9b4dd10ff2bbc8e8572d5e (diff) | |
| download | CMake-d8f7a05b372f36c62e770dac37f5641c7ce0780b.zip CMake-d8f7a05b372f36c62e770dac37f5641c7ce0780b.tar.gz CMake-d8f7a05b372f36c62e770dac37f5641c7ce0780b.tar.bz2 | |
Merge topic 'cygwin-patches'
ecc1961768 FindTclsh: Drop Cygwin-specific behavior and use POSIX code path
af666acdf4 FindOpenGL: Drop Cygwin-specific behavior and use POSIX code path
8edbc59e46 install: Use case-sensitive pattern matching on Cygwin
24482499ea FindPerlLibs: Add versioned perl library name for Cygwin
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5092
| -rw-r--r-- | Modules/FindOpenGL.cmake | 14 | ||||
| -rw-r--r-- | Modules/FindPerlLibs.cmake | 3 | ||||
| -rw-r--r-- | Modules/FindTclsh.cmake | 7 | ||||
| -rw-r--r-- | Source/cmInstallCommand.cxx | 2 |
4 files changed, 5 insertions, 21 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 74392da..e1271d4 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -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") diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake index 7e27f31..d576b86 100644 --- a/Modules/FindPerlLibs.cmake +++ b/Modules/FindPerlLibs.cmake @@ -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 diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index 82be473..f306d5b 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -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 diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index ddd6c22..83609e2 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -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]; |