diff -r 576ca9b3c7d8 -r ccc99eebdac2 misc/physfs/CMakeLists.txt --- a/misc/physfs/CMakeLists.txt Wed Nov 21 11:26:30 2012 +0100 +++ b/misc/physfs/CMakeLists.txt Wed Nov 21 12:03:40 2012 +0100 @@ -3,13 +3,9 @@ # # Please see the file LICENSE.txt in the source's root directory. -CMAKE_MINIMUM_REQUIRED(VERSION 2.4) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -PROJECT(PhysicsFS) +#lines overridden by Hedgewars configuration +#CMAKE_MINIMUM_REQUIRED(VERSION 2.4) +#PROJECT(PhysicsFS) SET(PHYSFS_VERSION 2.1.0) # Increment this if/when we break backwards compatibility. @@ -264,9 +260,11 @@ ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_ISO9660=1) ENDIF(PHYSFS_ARCHIVE_ISO9660) +#as needed by Hedgewars configuration IF(WINDOWS) OPTION(PHYSFS_BUILD_STATIC "Build static library" FALSE) OPTION(PHYSFS_BUILD_SHARED "Build shared library" TRUE) + SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} ${SDL_LIBRARY}) ELSE(WINDOWS) OPTION(PHYSFS_BUILD_STATIC "Build static library" TRUE) OPTION(PHYSFS_BUILD_SHARED "Build shared library" FALSE) @@ -284,7 +282,7 @@ ADD_LIBRARY(physfs SHARED ${PHYSFS_SRCS}) SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) - TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS} ${SDL_LIBRARY}) + TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) SET(PHYSFS_LIB_TARGET physfs) SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") ENDIF(PHYSFS_BUILD_SHARED)