Commit 6dc5d603 authored by Valentin Vallaeys's avatar Valentin Vallaeys
Browse files

Merge branch 'python2compatibility' into 'master'

Python2compatibility

See merge request !99
parents 6f73ee4b 3d1e1468
Pipeline #2226 passed with stage
in 32 minutes and 49 seconds
...@@ -259,7 +259,7 @@ def _findTopAndBottomTags(mesh_file_name): ...@@ -259,7 +259,7 @@ def _findTopAndBottomTags(mesh_file_name):
fin.close() fin.close()
return (topTags, bottomTags) return (topTags, bottomTags)
class pre_evaluator : class pre_evaluator(object) :
""" base class for objects that can be evaluated one point at a time (in mesh generation) """ base class for objects that can be evaluated one point at a time (in mesh generation)
or on a whole region (in preprocessing) or on a whole region (in preprocessing)
""" """
......
...@@ -70,7 +70,7 @@ if(ENABLE_PROJ) ...@@ -70,7 +70,7 @@ if(ENABLE_PROJ)
INSTALL_COMMAND "" INSTALL_COMMAND ""
PREFIX libproj PREFIX libproj
BINARY_DIR libproj/build BINARY_DIR libproj/build
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DBUILD_CS2CS=NO -DBUILD_PROJ=NO -DBUILD_GEOD=NO -DBUILD_NAD2BIN=NO -DPROJ4_TESTS=NO -DBUILD_LIBPROJ_SHARED=NO ${PROJ_FPIC} CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DBUILD_CS2CS=NO -DBUILD_PROJ=NO -DBUILD_GEOD=NO -DBUILD_NAD2BIN=NO -DPROJ4_TESTS=NO -DBUILD_LIBPROJ_SHARED=NO -DUSE_THREAD=NO ${PROJ_FPIC}
) )
set (PROJ_INC ${CMAKE_CURRENT_BINARY_DIR}/libproj/src/libproj/src) set (PROJ_INC ${CMAKE_CURRENT_BINARY_DIR}/libproj/src/libproj/src)
message("slimFunction configured with PROJ") message("slimFunction configured with PROJ")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment