diff --git a/.gitignore b/.gitignore index 74edb149e..65ab78055 100644 --- a/.gitignore +++ b/.gitignore @@ -6,11 +6,15 @@ boost_1_57_0/project-config.jam boost_1_57_0/stage/ boost_1_57_0/tools/build/src/engine/bin*/ boost_1_57_0/tools/build/src/engine/bootstrap/ -hdf5-1.8.14/build/ +hdf5-1.8.14/release/ +hdf5-1.8.14/debug/ hdf5-1.8.14/stage/ -spatialindex-src-1.8.5/build/ +spatialindex-src-1.8.5/release/ +spatialindex-src-1.8.5/debug/ spatialindex-src-1.8.5/stage/ -zlib-1.2.8/build/ +zlib-1.2.8/release/ +zlib-1.2.8/debug/ zlib-1.2.8/stage/ -lpng1615/build/ +lpng1615/release/ +lpng1615/debug/ lpng1615/stage/ diff --git a/build.cmake b/build.cmake deleted file mode 100644 index 7690d6ff8..000000000 --- a/build.cmake +++ /dev/null @@ -1,24 +0,0 @@ -set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "") - -set(CMAKE_INSTALL_PREFIX "../stage" CACHE PATH "") - -set(Boost_USE_STATIC_LIBS ON CACHE BOOL "") -set(BOOST_ROOT "${CMAKE_CURRENT_LIST_DIR}/boost_1_57_0" CACHE PATH "") - -set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/zlib-1.2.8/stage/include" CACHE PATH "") -set(ZLIB_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/zlib-1.2.8/stage/lib/zlibstatic.lib" CACHE FILEPATH "") - -set(HDF5_BUILD_CPP_LIB ON CACHE BOOL "") -set(HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "") -set(HDF5_DIR "${CMAKE_CURRENT_LIST_DIR}/hdf5-1.8.14/stage/cmake/hdf5" CACHE PATH "") - -set(PNG_PNG_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/lpng1615/stage/include" CACHE PATH "") -set(PNG_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/lpng1615/stage/lib/libpng16_static.lib" CACHE FILEPATH "") - -set(OSGEO4W_ROOT "${CMAKE_CURRENT_LIST_DIR}/spatialindex-src-1.8.5/stage" CACHE PATH "") - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/eigen-3.2.2/cmake" CACHE PATH "") -set(EIGEN3_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/eigen-3.2.2" CACHE PATH "") - - - diff --git a/build_others.bat b/build_others.bat index e37f96d2d..6eab01a1a 100644 --- a/build_others.bat +++ b/build_others.bat @@ -1,39 +1,62 @@ @echo off -pushd "%~dp0/eigen-3.2.2" -mkdir build -cd build -cmake -G"NMake Makefiles" -C"..\..\build.cmake" %* .. 2> nul +pushd "%~dp0/zlib-1.2.8" +mkdir build_release +pushd build_release +cmake -G"NMake Makefiles" -C"..\..\release.cmake" %* .. 2> nul nmake install popd - -pushd "%~dp0/zlib-1.2.8" -mkdir build -cd build -cmake -G"NMake Makefiles" -C"..\..\build.cmake" %* .. +mkdir build_debug +pushd build_debug +cmake -G"NMake Makefiles" -C"..\..\debug.cmake" %* .. 2> nul nmake install popd +rmdir /s /q build_release +rmdir /s /q build_debug +popd -@pushd "%~dp0/lpng1615" -mkdir build -cd build -cmake -G"NMake Makefiles" -C"..\..\build.cmake" %* .. +pushd "%~dp0/lpng1615" +mkdir build_release +pushd build_release +cmake -G"NMake Makefiles" -C"..\..\release.cmake" %* .. nmake install popd +mkdir build_debug +pushd build_debug +cmake -G"NMake Makefiles" -C"..\..\debug.cmake" %* .. +nmake install +popd +rmdir /s /q build_release +rmdir /s /q build_debug +popd pushd "%~dp0/hdf5-1.8.14" -mkdir build -cd build -cmake -G"NMake Makefiles" -C"..\..\build.cmake" %* .. +mkdir build_release +pushd build_release +cmake -G"NMake Makefiles" -C"..\..\release.cmake" %* .. nmake install popd - -@pushd "%~dp0/spatialindex-src-1.8.5" -mkdir build -cd build -cmake -G"NMake Makefiles" -C"..\..\build.cmake" %* .. +mkdir build_debug +pushd build_debug +cmake -G"NMake Makefiles" -C"..\..\debug.cmake" %* .. nmake install popd +rmdir /s /q build_release +rmdir /s /q build_debug +popd - +pushd "%~dp0/spatialindex-src-1.8.5" +mkdir build_release +pushd build_release +cmake -G"NMake Makefiles" -C"..\..\release.cmake" %* .. +nmake install +popd +mkdir build_debug +pushd build_debug +cmake -G"NMake Makefiles" -C"..\..\debug.cmake" %* .. +nmake install +popd +rmdir /s /q build_release +rmdir /s /q build_debug +popd diff --git a/debug.cmake b/debug.cmake new file mode 100644 index 000000000..77a904b00 --- /dev/null +++ b/debug.cmake @@ -0,0 +1,24 @@ +set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "") + +set(CMAKE_INSTALL_PREFIX "../debug" CACHE PATH "") + +set(Boost_USE_STATIC_LIBS ON CACHE BOOL "") +set(BOOST_ROOT "${CMAKE_CURRENT_LIST_DIR}/boost_1_57_0" CACHE PATH "") + +set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/zlib-1.2.8/debug/include" CACHE PATH "") +set(ZLIB_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/zlib-1.2.8/debug/lib/zlibstaticd.lib" CACHE FILEPATH "") + +set(HDF5_BUILD_CPP_LIB ON CACHE BOOL "") +set(HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "") +set(HDF5_DIR "${CMAKE_CURRENT_LIST_DIR}/hdf5-1.8.14/debug/cmake/hdf5" CACHE PATH "") + +set(PNG_PNG_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/lpng1615/debug/include" CACHE PATH "") +set(PNG_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/lpng1615/debug/lib/libpng16_staticd.lib" CACHE FILEPATH "") + +set(OSGEO4W_ROOT "${CMAKE_CURRENT_LIST_DIR}/spatialindex-src-1.8.5/debug" CACHE PATH "") + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/eigen-3.2.2/cmake" CACHE PATH "") +set(EIGEN3_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/eigen-3.2.2" CACHE PATH "") + + + diff --git a/release.cmake b/release.cmake new file mode 100644 index 000000000..c19894ee3 --- /dev/null +++ b/release.cmake @@ -0,0 +1,24 @@ +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "") + +set(CMAKE_INSTALL_PREFIX "../release" CACHE PATH "") + +set(Boost_USE_STATIC_LIBS ON CACHE BOOL "") +set(BOOST_ROOT "${CMAKE_CURRENT_LIST_DIR}/boost_1_57_0" CACHE PATH "") + +set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/zlib-1.2.8/release/include" CACHE PATH "") +set(ZLIB_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/zlib-1.2.8/release/lib/zlibstatic.lib" CACHE FILEPATH "") + +set(HDF5_BUILD_CPP_LIB ON CACHE BOOL "") +set(HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "") +set(HDF5_DIR "${CMAKE_CURRENT_LIST_DIR}/hdf5-1.8.14/release/cmake/hdf5" CACHE PATH "") + +set(PNG_PNG_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/lpng1615/release/include" CACHE PATH "") +set(PNG_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/lpng1615/release/lib/libpng16_static.lib" CACHE FILEPATH "") + +set(OSGEO4W_ROOT "${CMAKE_CURRENT_LIST_DIR}/spatialindex-src-1.8.5/release" CACHE PATH "") + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/eigen-3.2.2/cmake" CACHE PATH "") +set(EIGEN3_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/eigen-3.2.2" CACHE PATH "") + + +