USGSCSM Internal Dependency Building (#445)

* Added proj as an internal dep * Updated all internal deps * Updated metal.yaml * Forced conda builds to use internal deps * Updated build flags for future releases * fixed typo in BUILD_TESTS option * Added sqlite as a dep * Corrected meta.yml for release * Change env to minimum dependency set * Added recursive init for JSON * Removed unnecessary submodule update * Initial round to get ALE building directly into USGSCSM * Fixed external dep build and reverted env file * Fixed linux builds * Built proj internal to USGSCSM * Updated local build system * Pointed build at this branch * Updated recipe checksum * Added submodules * Added proj submodule * Updated proj hash * Turned building docs off * Placed proj_config.h into correct directory * Updated where the proj_config.h can be found * Small changes to get the build working * Removed commented out deps in meta.yaml * Removed unnecessary lines in cmakelist file * Reset git url and version * Removed commented out ALE header lines
DOI-USGS · Jan 23, 2024 · 66a05db · 66a05db
1 parent d53161a
commit 66a05db
Show file tree

Hide file tree

Showing 8 changed files with 649 additions and 44 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "json"]
 	path = json
 	url = https://github.com/nlohmann/json.git
+[submodule "PROJ"]
+	path = PROJ
+	url = https://github.com/OSGeo/PROJ
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/PROJ b/PROJ
diff --git a/ale b/ale
diff --git a/csm b/csm
diff --git a/json b/json
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+git submodule update --init
 mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DUSGSCSM_EXTERNAL_DEPS=ON -DBUILD_TESTS=OFF ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DUSGSCSM_EXTERNAL_DEPS=OFF -DUSGSCSM_BUILD_DOCS=OFF -DUSGSCSM_BUILD_TESTS=OFF ..
 make install
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,30 +1,39 @@
 
+{% set name = "usgscsm" %}
+{% set version = "main" %}
+
 package:
-  name: usgscsm
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
+  name: {{ name|lower }}
+  version: {{ version }}
 
 source:
-  git_url: https://github.com/USGS-Astrogeology/CSM-CameraModel.git
+  git_url: 'https://github.com/DOI-USGS/usgscsm.git'
+  git_tag: {{ version }}
+
 build:
-  string: {{ environ.get("GIT_DESCRIBE_HASH", "") }}
+  number: 0
+  skip: true  # [win]
+
 
 requirements:
   build:
-    - {{ compiler('cxx') }}  # [linux]
-    - vc 14  # [win]
+    - {{ compiler('cxx') }}
     - cmake >=3.10
-    - libcsm
-    - vc 14  # [win]
-  run:
+    - make
+    - nlohmann_json
+    - eigen
+  host:
+    - csm
     - vc  # [win]
+  run:
+    - csm
 
 test:
   commands:
-    - test -e $PREFIX/lib/libusgscsm.so  # [linux]
-    - test -e $PREFIX/lib/libusgscsm.dylib  # [osx]
+    - test -e $PREFIX/lib/csmplugins/libusgscsm${SHLIB_EXT}  # [unix]
     - if not exist %LIBRARY_BIN%\usgscsm.dll exit 1  # [win]
 
 about:
-  home: https://github.com/USGS-Astrogeology/CSM-CameraModels
+  home: https://github.com/DOI-USGS/usgscsm
   license: None
 summary: "USGS Astrogeology Community Sensor Model compliant sensor models."
+11 −3		CHANGELOG.md
+1 −1		CMakeLists.txt
+1 −1		ale/base/type_sensor.py
+6 −6		ale/drivers/msl_drivers.py
+7 −7		code.json
+1 −1		recipe/meta.yaml
+1 −1		setup.py
+4 −4		tests/pytests/data/isds/msl_isd.json
+4 −4		tests/pytests/data/isds/msl_nadir_isd.json
+1 −1		tests/pytests/test_cahvor_mixin.py
+2 −2		tests/pytests/test_msl_drivers.py
+31 −0		.appveyor.yml
+48 −0		.travis.yml
+5 −14		CMakeLists.txt
+2 −2		Makefile
+6 −4		Makefile.win32
+79 −0		MultiNitfIsd.cpp
+88 −0		MultiNitfIsd.h
+3 −0		PointCloudGM.cpp
+1 −0		PointCloudIsd.cpp
+0 −14		README
+48 −0		README.md
+1 −1		csm.h
+3 −0		csmPointCloud.cpp
+65 −0		scripts/mscc
+120 −0		scripts/mslink
+127 −0		scripts/objects_to_def