Skip to content

Commit

Permalink
Small changes to get the build working
Browse files Browse the repository at this point in the history
  • Loading branch information
acpaquette committed Jan 18, 2024
1 parent 5f0422b commit 62aba19
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 26 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ else()
endif()

message("${CMAKE_CURRENT_SOURCE_DIR}")
configure_file(${PROJ_SOURCE_DIR}/cmake/proj_config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PROJ/src/proj_config.h)
configure_file(${PROJ_SOURCE_DIR}/cmake/proj_config.cmake.in ${PROJ_SOURCE_DIR}/src/proj_config.h)
include(ProjMac)
include(policies)

Expand Down Expand Up @@ -425,7 +425,7 @@ else()
${PROJ_SOURCE_DIR}/src/networkfilemanager.cpp
${PROJ_SOURCE_DIR}/src/sqlite3_utils.hpp
${PROJ_SOURCE_DIR}/src/sqlite3_utils.cpp
${CMAKE_CURRENT_BINARY_DIR}/PROJ/src/proj_config.h
${PROJ_SOURCE_DIR}/src/proj_config.h
)

set(HEADERS_LIBPROJ
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -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=OFF -DUSGSCSM_BUILD_DOCS=OFF -DUSGSCSM_BUILD_TESTS=OFF ..
make install
30 changes: 6 additions & 24 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,8 @@ package:
version: {{ version }}

source:
- folder: .
url: https://github.com/acpaquette/{{ name }}/archive/{{ version }}.tar.gz
sha256: e6aa7830d216b878094b470971e1695fa34b7893e346c2449b7a8ae162db70f5

# submodules
- folder: ale
url: https://github.com/DOI-USGS/ale/archive/a7d8a148f54d5141c63ed45a24a71c890ca11de7.zip
sha256: d2cecca296de5c44245f0471cf5a3e835fb4792cc9fba24ab9f29822dc67338f
- folder: csm
url: https://github.com/USGS-Astrogeology/csm/archive/c78dbba3731432249a75db9fdd7415b292d46715.zip
sha256: e3eb35fbc27df94d6432c66a93b1dd140a9e93d6897c9107d5a99ab0557e99ea
- folder: gtest
url: https://github.com/google/googletest/archive/aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.zip
sha256: 04a1751f94244307cebe695a69cc945f9387a80b0ef1af21394a490697c5c895
- folder: json
url: https://github.com/nlohmann/json/archive/1a521cbd3657eea6ba90cded2aecca93e3cd78d4.zip
sha256: 3bc24b2490e91285b66211d3763bb8db3d3fd447f24ae35d82279fcafa60e3d5
- folder: PROJ
url: https://github.com/OSGeo/PROJ/releases/download/9.3.1/proj-9.3.1.zip
sha256: f652ceb9a9b7e6c58b2d534d96b1e5dfb49b1781bd65d9a2a7b08329582a0b97
git_url: 'https://github.com/acpaquette/usgscsm.git'
git_tag: {{ version }}

build:
number: 0
Expand All @@ -38,15 +20,15 @@ requirements:
- {{ compiler('cxx') }}
- cmake >=3.10
- make
host:
- csm
- nlohmann_json
- eigen
host:
- csm
- vc # [win]
run:
- {{ pin_compatible('nlohmann_json', min_pin='x.x', max_pin='x.x') }}
- csm
- eigen
# - {{ pin_compatible('nlohmann_json', min_pin='x.x', max_pin='x.x') }}
# - eigen

test:
commands:
Expand Down

0 comments on commit 62aba19

Please sign in to comment.