speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions 6

- Update cmake/internaldeps.cmake

Browse source 
- Update cmake/macros.cmake

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5924 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 07d67ef504416625f3dbfa1ef1b5d49ee530c031
Former-commit-id: 2f1aab2c0f54d565ed51081d7cb071a9def615ef
This commit is contained in:
torcs-ng 2015-03-23 23:17:26 +00:00
parent 701eae46e7
commit 540a4e67f9
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/customthirdparty.cmake
View file

@ -167,7 +167,7 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
# Expat : Replaces bundled libs/txml (that will soon be removed).
IF(OPTION_3RDPARTY_EXPAT)
_FIND_3RDPARTY_DEPENDENCY(EXPAT expat.h "" expat ${ROOT_DIR} "")
_FIND_3RDPARTY_DEPENDENCY(EXPAT expat.h "" "expat;expat-1" ${ROOT_DIR} "")
ENDIF(OPTION_3RDPARTY_EXPAT)
# FreeSOLID : Replaces bundled modules/simu/.../SOLID2.0 (that will soon be removed).
@ -180,7 +180,7 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
ENDIF(OPTION_3RDPARTY_SOLID)
# JPEG.
_FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" "jpeg_s;jpeg" ${ROOT_DIR} "")
_FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" "jpeg_s;jpeg;jpeg-8;jpeg-9" ${ROOT_DIR} "")
# ZLib.
_FIND_3RDPARTY_DEPENDENCY(ZLIB zlib.h "" "z;zlib;zlib1" ${ROOT_DIR} "D")
@ -374,7 +374,7 @@ MACRO(SD_INSTALL_CUSTOM_3RDPARTY TARGET_NAME)
ENDIF(OPTION_3RDPARTY_SOLID)
_FIND_3RDPARTY_DLL("${ZLIB_LIBRARY}" "zlib" "lib" _DLL_PATHNAME)
_FIND_3RDPARTY_DLL("${ZLIB_LIBRARY}" "zlib;zlib1" "lib" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
_FIND_3RDPARTY_DLL("${PNG_LIBRARY}" "png;png15;png16" "lib" _DLL_PATHNAME)

2
cmake/internaldeps.cmake
View file

@ -228,6 +228,8 @@ MACRO(ADD_SDLIB_LIBRARY TARGET)
SET(SDLIB_EXTRA_LIBRARY "")
#Use IF(TARGET ${SDLIB_LIB}) from CMake 2.6
cmake_policy(SET CMP0026 OLD)
cmake_policy(SET CMP0045 OLD)
GET_TARGET_PROPERTY(SDLIB_TARGET_LOCATION ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX} LOCATION)
IF(NOT SDLIB_TARGET_LOCATION STREQUAL "NOTFOUND")
SET(SDLIB_LIBRARIES ${SDLIB_LIBRARIES} ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX})

3
cmake/macros.cmake
View file

@ -239,7 +239,8 @@ MACRO(SD_ADD_LIBRARY TARGET_NAME TARGET_TYPE)
ENDIF()
ELSEIF(${TARGET_TYPE} STREQUAL "MODULE")
cmake_policy(SET CMP0026 OLD)
cmake_policy(SET CMP0045 OLD)
GET_TARGET_PROPERTY(_TGT_LOC ${TARGET_NAME} LOCATION)
GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_LOC} PATH)
GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_TYPE} PATH)