anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: remove warnings with newer cmake

Browse Source 
Omit using empty defines in find_path() and find_library()
This commit is contained in:
Kornel Benko 2013-08-23 00:02:56 +02:00
parent 3ebdbe65d3
commit f697e50fd3
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
development/cmake/modules/FindZLIB.cmake
View File

@ -9,10 +9,12 @@ if (ZLIB_INCLUDE_DIR)
set(ZLIB_FIND_QUIETLY TRUE)
endif()
find_path(ZLIB_INCLUDE_DIR zlib.h PATHS
/usr/include
/usr/local/include
"${GNUWIN32_DIR}"/include)
set(zlibsearch "/usr/include" "/usr/local/include")
if (GNUWIN32_DIR)
list(APPEND zlibsearch "${GNUWIN32_DIR}/include")
endif()
find_path(ZLIB_INCLUDE_DIR zlib.h PATHS ${zlibsearch})
find_file(ZLIB_HEADER zlib.h
PATHS ${ZLIB_INCLUDE_DIR} NO_DEFAULT_PATH)
@ -25,11 +27,15 @@ find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
NO_DEFAULT_PATH)
set(zlibsearch "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib")
if(SYSTEM_LIB_DIRS)
list(APPEND zlibsearch ${SYSTEM_LIB_DIRS})
endif()
if(GNUWIN32_DIR)
list(APPEND zlibsearch "${GNUWIN32_DIR}/lib")
endif()
find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
PATHS
"C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
${SYSTEM_LIB_DIRS}
"${GNUWIN32_DIR}"/lib)
PATHS ${zlibsearch})
if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
set(ZLIB_FOUND TRUE)