libosmium: first successfull build

mapbox · Jan 12, 2015 · 8f1a080 · 8f1a080
1 parent 47104c8
commit 8f1a080
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/patches/libosmium.diff b/patches/libosmium.diff
@@ -1,3 +1,16 @@
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 7bbfe73..9cbe615 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -5,7 +5,7 @@ if(GETOPT_MISSING)
+ endif()
+
+ set(SIMPLE_EXAMPLES
+-    osmium_convert
++    #osmium_convert
+     osmium_count
+     osmium_create_node_cache
+     osmium_debug
 diff --git a/include/osmium/util/double.hpp b/include/osmium/util/double.hpp
 index 91f4ac7..629853b 100644
 --- a/include/osmium/util/double.hpp
@@ -11,22 +24,22 @@ index 91f4ac7..629853b 100644
  namespace osmium {
 
 diff --git a/test/osm-testdata/CMakeLists.txt b/test/osm-testdata/CMakeLists.txt
-index 743bb5a..3dc5fbb 100644
+index 743bb5a..2a0a695 100644
 --- a/test/osm-testdata/CMakeLists.txt
 +++ b/test/osm-testdata/CMakeLists.txt
-@@ -30,6 +30,7 @@ file(GLOB TESTCASE_CPPS testcases/*.cpp)
+@@ -29,6 +29,7 @@ endif()
+ file(GLOB TESTCASE_CPPS testcases/*.cpp)
  add_executable(testdata-testcases testdata-testcases.cpp ${TESTCASE_CPPS})
  target_link_libraries(testdata-testcases
++                      ${OSMIUM_LIBRARIES}
                        ${OSMIUM_IO_LIBRARIES}
-+                      Ws2_32.lib
  )
  add_test(NAME testdata-testcases
-          COMMAND testdata-testcases
-@@ -43,6 +44,7 @@ add_executable(testdata-overview testdata-overview.cpp)
+@@ -41,6 +42,7 @@ set_tests_properties(testdata-testcases
+
+ add_executable(testdata-overview testdata-overview.cpp)
  target_link_libraries(testdata-overview
++                      ${OSMIUM_LIBRARIES}
                        ${OSMIUM_IO_LIBRARIES}
                        ${GDAL_LIBRARIES}
-+                      Ws2_32.lib
  )
- add_test(NAME testdata-overview
-          COMMAND testdata-overview ${TESTDATA_DIR}/grid/data/all.osm
diff --git a/scripts/build_libosmium.bat b/scripts/build_libosmium.bat
@@ -33,6 +33,7 @@ SET LIBBZIP2=%PKGDIR%\bzip2\libbz2.lib
 SET LIBBZIP2=%LIBBZIP2:\=/%
 
 cmake .. ^
+-DOsmium_DEBUG=TRUE ^
 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
 -DBOOST_ROOT=%PKGDIR%\boost ^
 -DBoost_PROGRAM_OPTIONS_LIBRARY=%PKGDIR%\boost\stage\lib\libboost_program_options-vc140-mt-1_57.lib ^

diff --git a/scripts/build_libosmium_deps.bat b/scripts/build_libosmium_deps.bat
@@ -39,8 +39,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CALL 
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+REM -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
+
 cmake .. ^
--DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
+-DCMAKE_BUILD_TYPE=Dev ^
 -DBOOST_ROOT=%PKGDIR%\boost ^
 -DBoost_PROGRAM_OPTIONS_LIBRARY=%PKGDIR%\boost\stage\lib\libboost_program_options-vc140-mt-1_57.lib ^
 -DOSMPBF_LIBRARY=%PKGDIR%\OSM-binary\deploy\lib\osmpbf.lib ^