iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

- try to fix with cmake 2.8 & cmake 3.0

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

Former-commit-id: 5583070cbeadccab9c8ba8572492732332fd4ffb
Former-commit-id: 6bc88d51664b1fcfabd1ab699c3a0920bebadc64
This commit is contained in:
torcs-ng 2015-03-24 12:38:37 +00:00
parent 72f292a5c2
commit df8ffc15c8
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/internaldeps.cmake
View file

@ -228,8 +228,11 @@ 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)
IF(CMAKE_MAJOR_VERSION GREATER 2)
cmake_policy(SET CMP0026 OLD)
cmake_policy(SET CMP0045 OLD)
ENDIF()
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})

7
cmake/macros.cmake
View file

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