Skip to content
Snippets Groups Projects
Commit 52bb1e28 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

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!502CI Win + CMAKE_PREFIX_PATH
Pipeline #51275 passed
......@@ -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 }
......
......@@ -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");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment