diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-04-20 16:36:06 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-04-20 16:46:38 +0000 |
| commit | 4e9ff477d90bad4ecbdaa9d39af872cd21eda858 (patch) | |
| tree | 120fcffb9b03fe5554dd61182fc6d436f7b7cc1f /cmake | |
| parent | 262625b7ba566950bc4f80a97ec7b6f35c6e4718 (diff) | |
CMake minor updates
Fix up generation messages for Windows build
Remove some superfluous Lua messages
Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9
Reviewed-on: https://code.wireshark.org/review/8138
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindASCIIDOC.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindLUA.cmake | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake index 10019dfec5..73d29f16e6 100644 --- a/cmake/modules/FindASCIIDOC.cmake +++ b/cmake/modules/FindASCIIDOC.cmake @@ -19,7 +19,7 @@ FIND_PROGRAM(A2X_EXECUTABLE string( TOLOWER "${CYGWIN_INSTALL_PATH}" l_cyg_path) string( TOLOWER "${A2X_EXECUTABLE}" l_a2x_ex) if (NOT "${CYGWIN_INSTALL_PATH}" STREQUAL "" AND "${l_a2x_ex}" MATCHES "${l_cyg_path}") - message("-- Using Cygwin a2x") + message(STATUS "Using Cygwin a2x") # We have most likely found a symlink to a2x.py. This won't work from the Windows shell. FIND_PROGRAM(CYGPATH_EXECUTABLE NAMES cygpath diff --git a/cmake/modules/FindLUA.cmake b/cmake/modules/FindLUA.cmake index 472572adaf..68ee4c975b 100644 --- a/cmake/modules/FindLUA.cmake +++ b/cmake/modules/FindLUA.cmake @@ -49,8 +49,6 @@ string( REGEX REPLACE ".*[/\\]lua(.+)$" "\\1" LUA_INC_SUFFIX "${LUA_INCLUDE_DIR} if ( LUA_INCLUDE_DIR STREQUAL LUA_INC_SUFFIX ) set( LUA_INC_SUFFIX "") endif() -message("LUA INCLUDE SUFFIX: ${LUA_INC_SUFFIX}") - FIND_LIBRARY(LUA_LIBRARY NAMES lua${LUA_INC_SUFFIX} lua52 lua5.2 lua51 lua5.1 lua @@ -74,7 +72,6 @@ INCLUDE(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE FIND_PACKAGE_HANDLE_STANDARD_ARGS(LUA DEFAULT_MSG LUA_LIBRARY LUA_INCLUDE_DIR) -message("LUA INCLUDEs version: ${LUA_VERSION}") IF(LUA_LIBRARY) SET( LUA_LIBRARIES "${LUA_LIBRARY}") |