Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
mlz
BornAgain
Commits
52bb1e28
Commit
52bb1e28
authored
3 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Plain Diff
Merge branch 'cmake1' into 'develop'
CI Win + CMAKE_PREFIX_PATH See merge request
!502
parents
cd246bd9
7a950b07
No related branches found
No related tags found
1 merge request
!502
CI Win + CMAKE_PREFIX_PATH
Pipeline
#51275
passed
3 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Tests/Functional/PyStd/Check.cpp
+1
-1
1 addition, 1 deletion
Tests/Functional/PyStd/Check.cpp
with
2 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
1
View file @
52bb1e28
...
...
@@ -55,7 +55,7 @@ windows:
-
pwd
-
echo "#--- CONFIGURE ---"
-
cmake --version
-
cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF -DQTDIR="$QT_MSVC_DIR" -DQt5_DIR="$QTCMake_DIR/Qt5" -DQt5Test_DIR="$QTCMake_DIR/Qt5Test" -DCMAKE_INCLUDE_PATH="$
OPT_DIR/include;$
BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$
OPT_DIR/lib;$
BOOST_LIB_DIR" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -B. ..
-
cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF
-DCMAKE_PREFIX_PATH="$OPT_DIR"
-DQTDIR="$QT_MSVC_DIR" -DQt5_DIR="$QTCMake_DIR/Qt5" -DQt5Test_DIR="$QTCMake_DIR/Qt5Test" -DCMAKE_INCLUDE_PATH="$BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$BOOST_LIB_DIR" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -B. ..
-
echo "#--- BUILD ---"
-
pwd
-
if($CI_PIPELINE_SOURCE -eq "schedule") { cmake --build . --target clean }
...
...
This diff is collapsed.
Click to expand it.
Tests/Functional/PyStd/Check.cpp
+
1
−
1
View file @
52bb1e28
...
...
@@ -54,7 +54,7 @@ std::unique_ptr<OutputData<double>> domainData(const std::string& test_name,
#endif
std
::
cout
<<
"- system call: "
<<
sys_command
<<
std
::
endl
;
int
err
=
std
::
system
(
sys_command
.
c_str
());
std
::
cout
<<
"- system call returned "
<<
err
<<
std
::
endl
;
std
::
cout
<<
"- system call returned "
<<
err
<<
" (0x"
<<
std
::
hex
<<
err
<<
")"
<<
std
::
endl
;
if
(
err
)
throw
std
::
runtime_error
(
"Exported Python script did not execute properly"
);
...
...
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