From 054ccf564d3c227afb4ec3c404c5da3b2ccdb5e4 Mon Sep 17 00:00:00 2001 From: shlomos1 Date: Sun, 27 Mar 2022 12:39:54 +0000 Subject: [PATCH] build: use correct 3rdparty aliases on linux --- CMakeModules/Find3rdPartyDependencies.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeModules/Find3rdPartyDependencies.cmake b/CMakeModules/Find3rdPartyDependencies.cmake index 02394d1eab9..deb1f0bb656 100644 --- a/CMakeModules/Find3rdPartyDependencies.cmake +++ b/CMakeModules/Find3rdPartyDependencies.cmake @@ -73,22 +73,24 @@ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN) MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2) SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}") ENDIF(FREETYPE_FOUND) - FIND_DEPENDENCY(CURL curl/curl.h "libcurl;curllib;libcurl_imp" ${OSG_3RDPARTY_BIN} "D" "") - FIND_DEPENDENCY(JPEG jpeglib.h "libjpeg;jpeg" ${OSG_3RDPARTY_BIN} "D" "") + FIND_DEPENDENCY(CURL curl/curl.h "libcurl;curllib;libcurl_imp;curl" ${OSG_3RDPARTY_BIN} "D" "") + FIND_DEPENDENCY(JPEG jpeglib.h "libjpeg;jpeg" ${OSG_3RDPARTY_BIN} "d" "") FIND_DEPENDENCY(GDAL gdal.h "gdal;gdal16" ${OSG_3RDPARTY_BIN} "d" "_i") - FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "D" "") + FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "d" "") FIND_DEPENDENCY(GLEW GL/glew.h "libglew;libGLEW;libglew32;libGLEW32;glew;GLEW" ${OSG_3RDPARTY_BIN} "d" "") IF(GLUT_FOUND) #forcing subsequent FindGlut stuff to not search for other variables.... kind of a hack SET(GLUT_glut_LIBRARY ${GLUT_LIBRARY} CACHE FILEPATH "") MARK_AS_ADVANCED(GLUT_glut_LIBRARY) ENDIF(GLUT_FOUND) - FIND_DEPENDENCY(GIFLIB gif_lib.h "ungif;libungif;giflib" ${OSG_3RDPARTY_BIN} "D" "") - FIND_DEPENDENCY(ZLIB zlib.h "z;zlib;zlib1" ${OSG_3RDPARTY_BIN} "D" "") + FIND_DEPENDENCY(GIFLIB gif_lib.h "ungif;libungif;giflib" ${OSG_3RDPARTY_BIN} "d" "") + FIND_DEPENDENCY(ZLIB zlib.h "z;zlib;zlib1" ${OSG_3RDPARTY_BIN} "d" "") + message(STATUS ${ZLIB_FOUND}) IF(ZLIB_FOUND) - FIND_DEPENDENCY(PNG png.h "libpng;libpng13;libpng15;libpng16" ${OSG_3RDPARTY_BIN} "D" "") + FIND_DEPENDENCY(PNG png.h "libpng;libpng13;libpng15;libpng16;png;png15;png16" ${OSG_3RDPARTY_BIN} "d" "") IF(PNG_FOUND) #forcing subsequent FindPNG stuff to not search for other variables.... kind of a hack + SET(PNG_INCLUDE_DIRS ${PNG_INCLUDE_DIR} CACHE FILEPATH "") SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE FILEPATH "") MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR) ENDIF(PNG_FOUND)