Some fixes to build process
authorunc0rr
Wed, 21 Nov 2012 11:57:14 +0400
changeset 8084 e723e95c11f1
parent 8082 675372256a01
child 8085 6c059add1560
Some fixes to build process
misc/physfs/CMakeLists.txt
project_files/frontlib/CMakeLists.txt
--- a/misc/physfs/CMakeLists.txt	Wed Nov 21 01:48:10 2012 +0100
+++ b/misc/physfs/CMakeLists.txt	Wed Nov 21 11:57:14 2012 +0400
@@ -5,6 +5,10 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+    
 PROJECT(PhysicsFS)
 SET(PHYSFS_VERSION 2.1.0)
 
@@ -504,11 +508,11 @@
 ENDIF(PHYSFS_BUILD_RUBY)
 
 
-INSTALL(TARGETS ${PHYSFS_INSTALL_TARGETS}
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib${LIB_SUFFIX}
-        ARCHIVE DESTINATION lib${LIB_SUFFIX})
-INSTALL(FILES src/physfs.h DESTINATION include)
+#INSTALL(TARGETS ${PHYSFS_INSTALL_TARGETS}
+#        RUNTIME DESTINATION bin
+#        LIBRARY DESTINATION lib${LIB_SUFFIX}
+#        ARCHIVE DESTINATION lib${LIB_SUFFIX})
+#INSTALL(FILES src/physfs.h DESTINATION include)
 
 IF(UNIX)
     SET(PHYSFS_TARBALL "${CMAKE_CURRENT_SOURCE_DIR}/../physfs-${PHYSFS_VERSION}.tar.gz")
--- a/project_files/frontlib/CMakeLists.txt	Wed Nov 21 01:48:10 2012 +0100
+++ b/project_files/frontlib/CMakeLists.txt	Wed Nov 21 11:57:14 2012 +0400
@@ -1,5 +1,6 @@
 find_package(SDL REQUIRED)
 find_package(SDL_net REQUIRED)
+find_package(ZLIB REQUIRED)
 
 add_definitions("-std=c99")
 
@@ -15,5 +16,6 @@
 
 include_directories(${SDL_INCLUDE_DIR})
 include_directories(${SDLNET_INCLUDE_DIR})
+include_directories(${ZLIB_INCLUDE_DIR})
 
 add_library(frontlib STATIC ${frontlib_src})