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
cf3d34b1
Commit
cf3d34b1
authored
11 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
windows dll
parent
8b3141c9
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+13
-9
13 additions, 9 deletions
CMakeLists.txt
utils/nightly/gmsh_win64_nightly.bat
+1
-1
1 addition, 1 deletion
utils/nightly/gmsh_win64_nightly.bat
with
14 additions
and
10 deletions
CMakeLists.txt
+
13
−
9
View file @
cf3d34b1
...
...
@@ -1159,21 +1159,25 @@ else(HAVE_FLTK)
endif
(
HAVE_FLTK
)
target_link_libraries
(
gmsh
${
LINK_LIBRARIES
}
)
# increase stack to 16Mb on Windows to avoid overflows in recursive
# tet classification for large 3D Delaunay grids + force static
# linking of system libraries with cygwin/mingw (to ease distribution
# andspeed up app startup time)
# Windows specific linker options
if
(
WIN32 AND NOT MSVC OR CYGWIN
)
set_target_properties
(
gmsh PROPERTIES LINK_FLAGS
"-Wl,--stack,16777216 -mwindows"
)
if
(
HAVE_64BIT_SIZE_T
)
set_target_properties
(
gmsh PROPERTIES LINK_FLAGS
"
-Wl,--stack,16777216
${
CMAKE_CURRENT_SOURCE_DIR
}
/Fltk/Win64Icon.res
-mwindows -static
"
)
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/Fltk/Win64Icon.res"
)
else
(
HAVE_64BIT_SIZE_T
)
set_target_properties
(
gmsh PROPERTIES LINK_FLAGS
"
-Wl,--stack,16777216
${
CMAKE_CURRENT_SOURCE_DIR
}
/Fltk/Win32Icon.res
-mwindows -static
"
)
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/Fltk/Win32Icon.res"
)
endif
(
HAVE_64BIT_SIZE_T
)
# remove stupid -Wl,-Bdynamic flags
set
(
CMAKE_EXE_LINK_DYNAMIC_C_FLAGS
)
set
(
CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS
)
if
(
ENABLE_BUILD_DYNAMIC
)
set_target_properties
(
shared PROPERTIES LINK_FLAGS
"-Wl,--export-all-symbols"
)
set_target_properties
(
gmsh PROPERTIES LINK_FLAGS
"-Wl,--enable-auto-import"
)
else
(
ENABLE_BUILD_DYNAMIC
)
set_target_properties
(
gmsh PROPERTIES LINK_FLAGS
"-static"
)
# remove -Wl,-Bdynamic flags
set
(
CMAKE_EXE_LINK_DYNAMIC_C_FLAGS
)
set
(
CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS
)
endif
(
ENABLE_BUILD_DYNAMIC
)
elseif
(
MSVC
)
set_target_properties
(
gmsh PROPERTIES LINK_FLAGS
"/STACK:16777216"
)
endif
(
WIN32 AND NOT MSVC OR CYGWIN
)
...
...
This diff is collapsed.
Click to expand it.
utils/nightly/gmsh_win64_nightly.bat
+
1
−
1
View file @
cf3d34b1
...
...
@@ -5,4 +5,4 @@ chdir C:\cygwin\bin
bash
--login -c
"cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_nightly.ctest -VV > ${HOME}/src/gmsh/nightly.log 2>&1"
REM
bash --login -c "cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&1"
bash
--login -c
"cd ${HOME}/src/gmsh/utils/nightly && ctest -S gmsh_win64_dynamic_nightly.ctest -VV > ${HOME}/src/gmsh/nightly_dynamic.log 2>&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