Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dg
dg
Commits
6dc5d603
Commit
6dc5d603
authored
Jul 18, 2017
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
dgpy/scripts/slim_private.py
View file @
6dc5d603
...
...
@@ -259,7 +259,7 @@ def _findTopAndBottomTags(mesh_file_name):
fin
.
close
()
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)
or on a whole region (in preprocessing)
"""
...
...
modules/slimFunction/CMakeLists.txt
View file @
6dc5d603
...
...
@@ -70,7 +70,7 @@ if(ENABLE_PROJ)
INSTALL_COMMAND
""
PREFIX libproj
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
)
message
(
"slimFunction configured with PROJ"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment