From efc6b9967d1eb7bab9bacfdb70471928d94b11cc Mon Sep 17 00:00:00 2001
From: Jesse Mapel <jmapel@usgs.gov>
Date: Wed, 6 May 2020 21:05:32 +0000
Subject: [PATCH] Added template for vector of integers (#24)
* Fixed Python 3.8 lib name in CMake
* Added template for vector of ints
---
geometricmodel.i | 2 ++
python/FindPythonAnaconda.cmake | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/geometricmodel.i b/geometricmodel.i
index 37f4e3f..4a880b5 100644
--- a/geometricmodel.i
+++ b/geometricmodel.i
@@ -1,4 +1,6 @@
%module(package="csmapi") geometricmodel
+%include <std_vector.i>
+%template(VecInt) std::vector<int>;
%{
#include "GeometricModel.h"
%}
diff --git a/python/FindPythonAnaconda.cmake b/python/FindPythonAnaconda.cmake
index f310937..d59ada6 100644
--- a/python/FindPythonAnaconda.cmake
+++ b/python/FindPythonAnaconda.cmake
@@ -17,7 +17,7 @@ if(NOT CMAKE_FIND_ANACONDA_PYTHON_INCLUDED)
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE
)
-
+
if(ANACONDA_PYTHON_VERBOSE)
message("Executing conda info --root")
message("_r = ${_r}")
@@ -44,7 +44,7 @@ if(NOT CMAKE_FIND_ANACONDA_PYTHON_INCLUDED)
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE
)
-
+
if(ANACONDA_PYTHON_VERBOSE)
message("Executing python --version")
message("_r = ${_r}")
@@ -52,7 +52,7 @@ if(NOT CMAKE_FIND_ANACONDA_PYTHON_INCLUDED)
message("_o = ${_o}")
message("_e = ${_o}")
endif()
-
+
string (REGEX MATCH "Python ([0-9]+)[.]([0-9]+)[.]([0-9]+)" _py_version_found "${_o}")
#message("_py_version_found = ${_py_version_found}")
#message("CMAKE_MATCH_0 = ${CMAKE_MATCH_0}")
@@ -61,15 +61,16 @@ if(NOT CMAKE_FIND_ANACONDA_PYTHON_INCLUDED)
set( _py_version_patch ${CMAKE_MATCH_3} )
set( ANACONDA_PYTHON_VERSION ${_py_version_major}.${_py_version_minor} )
-
- if( ${_py_version_major} MATCHES 2 )
+
+ if( (${_py_version_major} MATCHES 2) OR
+ (${_py_version_major} MATCHES 3 AND ${_py_version_minor} MATCHES 8) )
set( _py_ext "")
else()
set( _py_ext "m")
endif()
set(_py_id "python${ANACONDA_PYTHON_VERSION}${_py_ext}")
-
+
if( NOT DEFINED ENV{CONDA_PREFIX} )
set( env_CONDA_DEFAULT_ENV "root" )
message( WARNING "Could not find anaconda environment setting; using default root" )
@@ -85,18 +86,17 @@ if(NOT CMAKE_FIND_ANACONDA_PYTHON_INCLUDED)
set(PYTHON_INCLUDE_DIR "${env_CONDA_DEFAULT_ENV}/include/${_py_id}" CACHE INTERNAL "")
set(PYTHON_LIBRARY "${env_CONDA_DEFAULT_ENV}/lib/lib${_py_id}${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
endif()
-
+
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
set(FOUND_PYTHONLIBS TRUE)
else()
- message( "Not found: anaconda root directory..." )
- message( "Trying system python install..." )
+ message( "Not found: anaconda root directory..." )
+ message( "Trying system python install..." )
FindPythonLibs()
endif()
-
+
message( "PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}")
message( "PYTHON_LIBRARY = ${PYTHON_LIBRARY}")
endif()
-
--
GitLab