diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-09-25 16:55:51 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-09-25 16:55:51 (GMT) |
| commit | b39c53e4e4f9cbdbd1711a73fe33cb07ec2d2793 (patch) | |
| tree | 4994619b1372d6a858aea6de27a27d4dfe243773 | |
| parent | 7167339f483f62d92c638d2a17d5865a99888d11 (diff) | |
| download | mxe-b39c53e4e4f9cbdbd1711a73fe33cb07ec2d2793.zip mxe-b39c53e4e4f9cbdbd1711a73fe33cb07ec2d2793.tar.gz mxe-b39c53e4e4f9cbdbd1711a73fe33cb07ec2d2793.tar.bz2 | |
ossim: various fixes and cleanups
-explicitly declare static/shared builds
-enable freetype
-use openthreads from openscenegraph
-only build/install libs and headers
-remove dummy test program
-remove random empty lines
see #726
| -rw-r--r-- | src/ossim.mk | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/ossim.mk b/src/ossim.mk index 5669048..6d93560 100644 --- a/src/ossim.mk +++ b/src/ossim.mk @@ -4,11 +4,11 @@ PKG := ossim $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.18 -$(PKG)_CHECKSUM := 50a925a4304a5df4af19a60ee41201e26a62a125 +$(PKG)_CHECKSUM := 2dd070c2174dab08c04092345e5165ec45dcd5b63be88771c942843a250518ae $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/ossim/source/$($(PKG)_SUBDIR)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib jpeg tiff proj libpng geos openthreads +$(PKG)_DEPS := gcc freetype geos jpeg libpng openscenegraph proj tiff zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://download.osgeo.org/ossim/source/latest/' | \ @@ -21,16 +21,10 @@ define $(PKG)_BUILD cd '$(1).build' && cmake \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_MODULE_PATH='$(1)/ossim_package_support/cmake/CMakeModules' \ - -DCMAKE_CXX_FLAGS:STRING='-DGEOS_INLINE=1' \ - -DBUILD_OSSIM_FREETYPE_SUPPORT:BOOL=OFF \ + -DCMAKE_CXX_FLAGS='-DGEOS_INLINE=1' \ + -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ + -DBUILD_OSSIM_FREETYPE_SUPPORT=ON \ '$(1)/ossim' - - $(MAKE) -C '$(1).build' -j '$(JOBS)' - - $(MAKE) -C '$(1).build' -j 1 install - -#remove application - mv $(PREFIX)/$(TARGET)/bin/ossim-info.exe $(PREFIX)/$(TARGET)/bin/test-ossim.exe - rm -f $(PREFIX)/$(TARGET)/bin/ossim-*.exe - + $(MAKE) -C '$(1).build/src/ossim' -j '$(JOBS)' + $(MAKE) -C '$(1).build/src/ossim' -j 1 install endef |