Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
d6d2c4fa
Commit
d6d2c4fa
authored
15 years ago
by
Jonathan Lambrechts
Browse files
Options
Downloads
Patches
Plain Diff
remove gmshlua, integrate lua in gmsh (run "gmsh test.lua -")
parent
9db76cec
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+0
-3
0 additions, 3 deletions
CMakeLists.txt
Common/CMakeLists.txt
+1
-0
1 addition, 0 deletions
Common/CMakeLists.txt
Common/OpenFile.cpp
+6
-0
6 additions, 0 deletions
Common/OpenFile.cpp
with
7 additions
and
3 deletions
CMakeLists.txt
+
0
−
3
View file @
d6d2c4fa
...
@@ -1004,6 +1004,3 @@ message("")
...
@@ -1004,6 +1004,3 @@ message("")
mark_as_advanced
(
BISON FLEX GMP_LIB GMSH_EXTRA_VERSION HDF5_LIB MAKEINFO
mark_as_advanced
(
BISON FLEX GMP_LIB GMSH_EXTRA_VERSION HDF5_LIB MAKEINFO
MED_LIB OCC_INC SZ_LIB TAUCS_LIB LUA_LIB TEXI2PDF
)
MED_LIB OCC_INC SZ_LIB TAUCS_LIB LUA_LIB TEXI2PDF
)
add_executable
(
gmshlua EXCLUDE_FROM_ALL Solver/dgMainLua.cpp
${
GMSH_SRC
}
)
target_link_libraries
(
gmshlua
${
LINK_LIBRARIES
}
)
This diff is collapsed.
Click to expand it.
Common/CMakeLists.txt
+
1
−
0
View file @
d6d2c4fa
...
@@ -13,6 +13,7 @@ set(SRC
...
@@ -13,6 +13,7 @@ set(SRC
OS.cpp
OS.cpp
OpenFile.cpp
OpenFile.cpp
CreateFile.cpp
CreateFile.cpp
LuaBindings.cpp
VertexArray.cpp
VertexArray.cpp
SmoothData.cpp
SmoothData.cpp
Octree.cpp
Octree.cpp
...
...
This diff is collapsed.
Click to expand it.
Common/OpenFile.cpp
+
6
−
0
View file @
d6d2c4fa
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
#include
"OS.h"
#include
"OS.h"
#include
"StringUtils.h"
#include
"StringUtils.h"
#include
"GeomMeshMatcher.h"
#include
"GeomMeshMatcher.h"
#include
"LuaBindings.h"
#if defined(HAVE_PARSER)
#if defined(HAVE_PARSER)
#include
"Parser.h"
#include
"Parser.h"
...
@@ -328,6 +329,11 @@ int MergeFile(std::string fileName, bool warnIfMissing)
...
@@ -328,6 +329,11 @@ int MergeFile(std::string fileName, bool warnIfMissing)
status
=
read_png
(
fileName
);
status
=
read_png
(
fileName
);
}
}
#endif
#endif
#endif
#if defined(HAVE_LUA)
else
if
(
ext
==
".lua"
||
ext
==
".LUA"
)
{
status
=
read_lua
(
fileName
.
c_str
());
}
#endif
#endif
else
{
else
{
CTX
::
instance
()
->
geom
.
draw
=
1
;
CTX
::
instance
()
->
geom
.
draw
=
1
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment