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
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gmsh
gmsh
Commits
6c8c49e6
There was a problem fetching the pipeline summary.
Commit
6c8c49e6
authored
Dec 2, 2017
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
parallel build with msvc, 2nd try
parent
00f770f4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
CMakeLists.txt
+12
-11
12 additions, 11 deletions
CMakeLists.txt
with
13 additions
and
12 deletions
.gitlab-ci.yml
+
1
−
1
View file @
6c8c49e6
...
...
@@ -56,7 +56,7 @@ windows64_msvc_ci:
-
md build
-
cd build
-
cmake -DGMSH_EXTRA_VERSION=%EXTRA_VERSION:~0,13% ..
-
msbuild
/m
package.vcxproj
-
msbuild package.vcxproj
tags
:
-
windows64
-
official
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
12
−
11
View file @
6c8c49e6
...
...
@@ -199,17 +199,18 @@ endif(NOT ENABLE_BUILD_SHARED)
if
(
MSVC
)
# remove annoying warning about bool/int cast performance
set
(
GMSH_CONFIG_PRAGMAS
"#pragma warning(disable:4800 4244 4267)"
)
if
(
ENABLE_MSVC_STATIC_RUNTIME
)
foreach
(
VAR
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
)
if
(
${
VAR
}
MATCHES
"/MD"
)
if
(
ENABLE_MSVC_STATIC_RUNTIME AND
${
VAR
}
MATCHES
"/MD"
)
string
(
REGEX REPLACE
"/MD"
"/MT"
${
VAR
}
"
${${
VAR
}}
"
)
endif
(
${
VAR
}
MATCHES
"/MD"
)
endif
(
ENABLE_MSVC_STATIC_RUNTIME AND
${
VAR
}
MATCHES
"/MD"
)
if
(
NOT
${
VAR
}
MATCHES
"/MP"
)
# enable parallel compilation
set
(
${
VAR
}
"
${${
VAR
}}
/MP"
)
endif
(
NOT
${
VAR
}
MATCHES
"/MP"
)
endforeach
(
VAR
)
endif
(
ENABLE_MSVC_STATIC_RUNTIME
)
if
(
ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED
)
# automatically export .def file with all symbols (requires CMake 3.4);
# depending on the compiling options this might lead to more than 64k export
...
...
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