2
0
Эх сурвалжийг харах

Use default install for everything.

Cameron Hart 14 жил өмнө
parent
commit
1b1bdf97ce

+ 11 - 19
CMake/ExternalAssimp.cmake

@@ -3,6 +3,15 @@ INCLUDE(ExternalProject)
 
 SET(assimp_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/assimp)
 
+SET(assimp_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_DEBUG_POSTFIX=d 
+    -DENABLE_BOOST_WORKAROUND=ON 
+    -DBUILD_ASSIMP_TOOLS=OFF 
+    -DBUILD_TESTS=OFF
+)
+
 ExternalProject_Add(assimp
     PREFIX ${assimp_PREFIX}
 
@@ -11,23 +20,6 @@ ExternalProject_Add(assimp
     URL http://download.sourceforge.net/assimp/assimp--2.0.863-sdk.zip
     URL_MD5 9f41662501bd9d9533c4cf03b7c25d5b
 
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DENABLE_BOOST_WORKAROUND=ON -DBUILD_ASSIMP_TOOLS=OFF -DBUILD_TESTS=OFF
+    INSTALL_DIR ${POLYCODE_DEPS_TOOLS_PREFIX} 
+    CMAKE_ARGS ${assimp_CMAKE_ARGS}
 )
-
-# install built files
-ExternalProject_Get_Property(assimp install_dir)
-
-# install includes
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_TOOLS_PREFIX}/Include)
-
-# install debug lib
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}assimp${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_TOOLS_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME assimpd${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-# install release lib
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}assimp${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_TOOLS_PREFIX}/Lib
-    CONFIGURATIONS Release)

+ 5 - 20
CMake/ExternalBox2D.cmake

@@ -9,6 +9,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 SET(box2d_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_DEBUG_POSTFIX=_d 
     -DBOX2D_INSTALL=ON 
     -DBOX2D_BUILD_EXAMPLES=OFF 
     ${box2d_CXX_ARGS}
@@ -24,24 +26,7 @@ ExternalProject_Add(box2d
 
     # Box2D's source isn't in the top level directory so add a dummy file to set cmake right
     PATCH_COMMAND cmake -E echo ADD_SUBDIRECTORY(Box2D) > <SOURCE_DIR>/CMakeLists.txt
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBOX2D_INSTALL=ON -DBOX2D_BUILD_EXAMPLES=OFF ${box2d_CXX_ARGS}
-)
-
-ExternalProject_Get_Property(box2d install_dir)
-
-# install built files
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Include
-    FILES_MATCHING PATTERN "*.h")
     
-# install debug lib
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME Box2D_d${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-# install release lib
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
+    INSTALL_DIR ${POLYCODE_DEPS_MODULES_PREFIX}
+    CMAKE_ARGS ${box2d_CMAKE_ARGS}
+)

+ 3 - 45
CMake/ExternalBullet.cmake

@@ -4,6 +4,8 @@ SET(bullet_PREFIX ${PROJECT_BINARY_DIR}/bullet)
 
 SET(bullet_CMAKE_ARGS 
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_DEBUG_POSTFIX=_d
     -DINSTALL_LIBS=ON
     -DBUILD_DEMOS=OFF
     -DBUILD_EXTRAS=OFF
@@ -23,50 +25,6 @@ ExternalProject_Add(bullet
     URL http://bullet.googlecode.com/files/bullet-2.78.zip
     URL_MD5 99d4070864c9f73521481ba9cda25038
 
+    INSTALL_DIR ${POLYCODE_DEPS_MODULES_PREFIX} 
     CMAKE_ARGS ${bullet_CMAKE_ARGS}
 )
-
-ExternalProject_Get_Property(bullet install_dir)
-
-# install includes
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Include
-    FILES_MATCHING PATTERN "*.h")
-
-# install debug libs
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME BulletDynamics_d${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME BulletCollision_d${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME BulletSoftBody_d${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME LinearMath_d${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-# install release libs
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
-    CONFIGURATIONS Release)

+ 7 - 18
CMake/ExternalFreetype.cmake

@@ -3,6 +3,11 @@ INCLUDE(ExternalProject)
 
 SET(freetype_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/freetype)
 
+SET(freetype_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+)
+
 EXTERNALPROJECT_ADD(freetype
     PREFIX ${freetype_PREFIX}
 
@@ -12,22 +17,6 @@ EXTERNALPROJECT_ADD(freetype
 
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PolycodeDependencies_SOURCE_DIR}/../CMake/freetype.cmake <SOURCE_DIR>/CMakeLists.txt
 
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
+    CMAKE_ARGS ${freetype_CMAKE_ARGS}
 )
-
-ExternalProject_Get_Property(freetype install_dir)
-
-# install built files
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Include
-    FILES_MATCHING PATTERN "*.h")
-
-# install debug libs
-INSTALL(FILES ${install_dir}/lib/freetype_d${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug)
-
-# install release lib
-INSTALL(FILES ${install_dir}/lib/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)

+ 2 - 2
CMake/ExternalGLExt.cmake

@@ -1,12 +1,12 @@
 # download some headers missing from Windows
-SET(GLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/Include/GL/glext.h)
+SET(GLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/include/GL/glext.h)
 IF(NOT EXISTS ${GLEXT_H})
     FILE(DOWNLOAD http://www.opengl.org/registry/api/glext.h 
         ${GLEXT_H}
         SHOW_PROGRESS)
 ENDIF(NOT EXISTS ${GLEXT_H})
 
-SET(WGLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/Include/GL/wglext.h)
+SET(WGLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/include/GL/wglext.h)
 IF(NOT EXISTS ${WGLEXT_H})
     FILE(DOWNLOAD http://www.opengl.org/registry/api/wglext.h 
         ${WGLEXT_H}

+ 9 - 61
CMake/ExternalOggVorbis.cmake

@@ -3,6 +3,11 @@ INCLUDE(ExternalProject)
 
 SET(oggvorbis_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/oggvorbis)
 
+SET(oggvorbis_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+)
+
 EXTERNALPROJECT_ADD(libogg
     PREFIX ${oggvorbis_PREFIX}
 
@@ -12,7 +17,8 @@ EXTERNALPROJECT_ADD(libogg
 
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PolycodeDependencies_SOURCE_DIR}/../CMake/libogg.cmake <SOURCE_DIR>/CMakeLists.txt
 
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
+    CMAKE_ARGS ${oggvorbis_CMAKE_ARGS}
 )
 
 ExternalProject_Get_Property(libogg install_dir)
@@ -27,64 +33,6 @@ EXTERNALPROJECT_ADD(libvorbis
 
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PolycodeDependencies_SOURCE_DIR}/../CMake/libvorbis.cmake <SOURCE_DIR>/CMakeLists.txt
 
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${install_dir} # to find libogg
+    INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
+    CMAKE_ARGS ${oggvorbis_CMAKE_ARGS} -DCMAKE_PREFIX_PATH=${install_dir} # to find libogg
 )
-
-ExternalProject_Get_Property(libvorbis install_dir)
-
-# install built files
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Include
-    FILES_MATCHING PATTERN "*.h")
-
-# install debug libs
-INSTALL(FILES ${install_dir}/lib/liboggd${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug)
-
-INSTALL(FILES ${install_dir}/lib/libvorbisd${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug)
-
-INSTALL(FILES ${install_dir}/lib/libvorbisfiled${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug)
-
-# install release lib
-INSTALL(FILES ${install_dir}/lib/libogg${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/lib/libvorbis${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/lib/libvorbisfile${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-# install debug shared library
-INSTALL(FILES ${install_dir}/bin/liboggd${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Debug)
-
-INSTALL(FILES ${install_dir}/bin/libvorbisd${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Debug)
-
-INSTALL(FILES ${install_dir}/bin/libvorbisfiled${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Debug)
-
-# install release shared library
-INSTALL(FILES ${install_dir}/bin/libogg${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/bin/libvorbis${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/bin/libvorbisfile${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Release)

+ 9 - 30
CMake/ExternalOpenAL.cmake

@@ -3,6 +3,12 @@ INCLUDE(ExternalProject)
 
 SET(openal_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/openal)
 
+SET(openal_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_DEBUG_POSTFIX=d
+)
+
 ExternalProject_Add(openal
     PREFIX ${openal_PREFIX}
 
@@ -10,34 +16,7 @@ ExternalProject_Add(openal
 
     URL http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2
     URL_MD5 58b7d2809790c70681b825644c5f3614
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    
+    INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
+    CMAKE_ARGS ${openal_CMAKE_ARGS}
 )
-
-ExternalProject_Get_Property(openal install_dir)
-
-# install built files
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Include
-    FILES_MATCHING PATTERN "*.h")
-
-# install debug lib
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME OpenAL32d${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-# install release lib
-INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-# install debug shared library
-INSTALL(FILES ${install_dir}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Debug
-    RENAME OpenAL32d${CMAKE_SHARED_LIBRARY_SUFFIX})
-
-# install release shared library
-INSTALL(FILES ${install_dir}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Release)

+ 13 - 48
CMake/ExternalPNG.cmake

@@ -1,10 +1,16 @@
 # Build a local version of zlib and libpng
 INCLUDE(ExternalProject)
 
-SET(png_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/png)
+SET(libpng_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libpng)
+
+SET(libpng_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DSKIP_INSTALL_FILES=1
+)
 
 EXTERNALPROJECT_ADD(zlib
-    PREFIX ${png_PREFIX}
+    PREFIX ${libpng_PREFIX}
 
     DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
     URL http://zlib.net/zlib-1.2.5.tar.gz
@@ -12,61 +18,20 @@ EXTERNALPROJECT_ADD(zlib
 
     PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
 
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
+    CMAKE_ARGS ${libpng_CMAKE_ARGS}
 )
 
 ExternalProject_Get_Property(zlib install_dir)
 
 EXTERNALPROJECT_ADD(libpng
     DEPENDS zlib
-    PREFIX ${png_PREFIX}
+    PREFIX ${libpng_PREFIX}
 
     DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
     URL ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.4.tar.gz
     URL_MD5 dea4d1fd671160424923e92ff0cdda78
 
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${install_dir} # to find zlib
+    INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
+    CMAKE_ARGS ${libpng_CMAKE_ARGS} -DCMAKE_PREFIX_PATH=${install_dir} # to find zlib
 )
-
-ExternalProject_Get_Property(libpng install_dir)
-
-# install built files
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Include
-    FILES_MATCHING PATTERN "*.h")
-
-# install debug libs
-INSTALL(FILES ${install_dir}/lib/zlibd${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug)
-
-INSTALL(FILES ${install_dir}/lib/libpng15d${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug)
-
-# install release lib
-INSTALL(FILES ${install_dir}/lib/zlib${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/lib/libpng15${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-# install debug shared library
-INSTALL(FILES ${install_dir}/bin/zlibd1${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Debug)
-
-INSTALL(FILES ${install_dir}/bin/libpng15d${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Debug)
-
-# install release shared library
-INSTALL(FILES ${install_dir}/bin/zlib1${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Release)
-
-INSTALL(FILES ${install_dir}/bin/libpng15${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Release)

+ 8 - 31
CMake/ExternalPhysFS.cmake

@@ -3,6 +3,12 @@ INCLUDE(ExternalProject)
 
 SET(physfs_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/physfs)
 
+SET(physfs_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_DEBUG_POSTFIX=d
+)
+
 ExternalProject_Add(physfs
     PREFIX ${physfs_PREFIX}
 
@@ -11,38 +17,9 @@ ExternalProject_Add(physfs
     URL http://offload1.icculus.org:9090/physfs/downloads/physfs-2.0.2.tar.gz
     URL_MD5 4e8927c3d30279b03e2592106eb9184a
 
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
+    CMAKE_ARGS ${physfs_CMAKE_ARGS}
 )
 
-ExternalProject_Get_Property(physfs install_dir)
-
-# install built files
-INSTALL(DIRECTORY ${install_dir}/include/
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Include
-    FILES_MATCHING PATTERN "*.h")
-
-# install debug lib
-INSTALL(FILES ${install_dir}/lib/physfs${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Debug
-    RENAME physfsd${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-# install release lib
-INSTALL(FILES ${install_dir}/lib/physfs${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
-    CONFIGURATIONS Release)
-
-# install debug shared library
-INSTALL(FILES ${install_dir}/bin/physfs${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Debug
-    RENAME physfsd${CMAKE_SHARED_LIBRARY_SUFFIX})
-
-# install release shared library
-INSTALL(FILES ${install_dir}/bin/physfs${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
-    CONFIGURATIONS Release)
-
-