Merge branch 'package' into 'main'

Changes for packaging and installation

See merge request astrogeology/lidar2image!1

lidar2image_processing/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake/Modules/ ${CMAKE_MODULE_PATH} )
-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/tests )
+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/)
 
 if( CMAKE_COMPILER_IS_GNUCXX )
 	set( WARN_FLAG_ADDITIONS "-fno-strict-aliasing" )
@@ -166,18 +166,6 @@ target_link_libraries(lidar_image_align
                        ${QWT_LIBRARY}
                        )
 
-# Here we use ISIS's own tool to fix the paths to dynamic libraries
-if(NOT APPLE)
-    MESSAGE("NOT APPLE")
-    add_custom_command(
-        TARGET lidar_image_align 
-        POST_BUILD
-        COMMAND ${PATCHELF} --set-rpath $ENV{ISISROOT}/lib lidar_image_align
-        COMMENT "Editing the run-time paths"
-        VERBATIM
-    )
-endif()
-
 install_targets(/bin lidar_image_align)
 
 if (CTEST_ENABLED)

lidar_processing/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake/Modules/ ${CMAKE_MODULE_PATH} )
-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/tests )
+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/)
 
 include(SetupInstall)
 include(SetupCTest)
@@ -42,6 +42,8 @@ add_executable(track_splitter track_splitter.cpp
 #target_link_libraries(track_splitter ${OpenCV_LIBS} ${GDAL_LIBRARY})
 target_link_libraries(track_splitter ${GDAL_LIBRARY})
 
+install_targets(/bin track_splitter)
+
 if (CTEST_ENABLED)
   add_test(track_splitter_test bash ./track_splitter_test.sh)
 endif(CTEST_ENABLED)

polarmosaics/lidar2cnet.py

@@ -89,7 +89,10 @@ def compute_covariance(lat, lon, rad, latsigma=10., lonsigma=10., radsigma=15.,
 def convert_gcs_to_body_fixed(lat, lon, rad):
     return spiceypy.latrec(rad,lon,lat)
 
-def main(args):
+def main(args=None):
+    if args is None:
+        args = parse_args()
+
     np.set_printoptions(precision=15)
     # Read the GCP file into a data frame
     gcp = pd.read_csv(args.gcp_file, names=['UTC Time', 'Apriori Longitude', 'Apriori Latitude',

setup.py

+from setuptools import setup, find_packages
+
+setup(
+        name="lidar2image",
+        version='1.0.0',
+        packages=find_packages(),
+        author = "USGS Astrogeology",
+        description = "Utilities for creating ground control networks from LIDAR data",
+        license = "CC0-1.0",
+        url = "https://github.com/DOI-USGS/lidar2image",
+        include_package_data=True,
+        install_requires=[
+            'numpy',
+            'pandas',
+            'plio',
+            'pvl',
+            'spiceypy'],
+        entry_points={
+            'console_scripts': [ 'lidar2cnet = polarmosaics.lidar2cnet:main']
+        }
+
+)