From e2c7417bbea4bca8a3779bb8c3e46112f4fca9b3 Mon Sep 17 00:00:00 2001 From: jay <jlaura@usgs.gov> Date: Fri, 17 Aug 2018 08:28:24 -0700 Subject: [PATCH] Cleanup --- python/CMakeLists.txt | 15 +-------------- recipe/meta.yaml | 5 ++--- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 50ac80a..03f9cd6 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -24,9 +24,6 @@ swig_add_library(csmapi set_target_properties(_csmapi PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SWIG_OUTDIR}) swig_link_libraries(csmapi ${CSM_LIBRARY} ${PYTHON_LIBRARY}) -#set_target_properties(csmapi PROPERTIES -# RUNTIME_OUTPUT_DIRECTORY python/csmapi) - # Build out a standard directory structure file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests) @@ -34,14 +31,4 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py - ${CMAKE_CURRENT_BINARY_DIR}/csmapi/__init__.py) - -# Declare install target for python -#install(TARGETS csmapi -# COMMAND "${PYTHON_EXECUTABLE} setup.py" -# COMPONENT swig-python) - -# Install target to call setup.py -#add_custom_target(install-python -# DEPENDS _csmapi -#COMMAND python ${SETUP_PY_OUT} install) + ${CMAKE_CURRENT_BINARY_DIR}/csmapi/__init__.py) \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fa05ca7..4171d77 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,9 +3,8 @@ package: version: "0.1.0" source: - # git_url: https://github.com/USGS-Astrogeology/CSM-Swig.git - path: ../ - + git_url: https://github.com/USGS-Astrogeology/CSM-Swig.git + requirements: build: - {{ compiler('cxx') }} # [linux] -- GitLab