Skip to content
Snippets Groups Projects
Commit e0a4294f authored by Grégoire Kubler's avatar Grégoire Kubler
Browse files

fix : upd cmake compilation flags

parent 9a824ffe
No related branches found
No related tags found
1 merge request!5Feat/release pip
...@@ -30,7 +30,6 @@ include: ...@@ -30,7 +30,6 @@ include:
- DEPENDENCY_JOB="$CI_JOB_NAME" - DEPENDENCY_JOB="$CI_JOB_NAME"
- !reference [.ubuntu:download:artifacts, script] # located in common.gitlab-ci.yml - !reference [.ubuntu:download:artifacts, script] # located in common.gitlab-ci.yml
# Build current module # Build current module
- export CMAKE_PREFIX_PATH=$AIDGE_INSTALL
- echo "Build directory :$BUILD_DIR" - echo "Build directory :$BUILD_DIR"
- mkdir -p $BUILD_DIR - mkdir -p $BUILD_DIR
- echo ${AIDGE_INSTALL/"../"} - echo ${AIDGE_INSTALL/"../"}
...@@ -61,13 +60,12 @@ build:ubuntu_cpp:g++: ...@@ -61,13 +60,12 @@ build:ubuntu_cpp:g++:
parallel: parallel:
matrix: matrix:
- Gplusplus_VERSION: ["10","12"] - Gplusplus_VERSION: ["10","12"]
script: script:
- echo "Build directory :$BUILD_DIR" - echo "Build directory :$BUILD_DIR"
- cd $BUILD_DIR - cd $BUILD_DIR
- apt install -y g++-$Gplusplus_VERSION - apt install -y g++-$Gplusplus_VERSION
- export CXX=/usr/bin/g++-$Gplusplus_VERSION - export CXX=/usr/bin/g++-$Gplusplus_VERSION
- cmake -DCMAKE_BUILD_TYPE=Debug -DWERROR=ON -DCOVERAGE=OFF -DPYBIND=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 .. - cmake -DCMAKE_BUILD_TYPE=Release -DWERROR=ON -DCOVERAGE=OFF -DPYBIND=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ..
- make -j4 all install - make -j4 all install
build:ubuntu_cpp:clang: build:ubuntu_cpp:clang:
...@@ -81,13 +79,12 @@ build:ubuntu_cpp:clang: ...@@ -81,13 +79,12 @@ build:ubuntu_cpp:clang:
parallel: parallel:
matrix: matrix:
- CLANG_VERSION: ["12","15"] - CLANG_VERSION: ["12","15"]
script: script:
- echo "Build directory :$BUILD_DIR" - echo "Build directory :$BUILD_DIR"
- cd $BUILD_DIR - cd $BUILD_DIR
- apt install -y clang-$CLANG_VERSION - apt install -y clang-$CLANG_VERSION
- export CXX=/usr/bin/clang++-$CLANG_VERSION - export CXX=/usr/bin/clang++-$CLANG_VERSION
- cmake -DCMAKE_BUILD_TYPE=Debug -DWERROR=ON -DCOVERAGE=OFF -DPYBIND=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 .. - cmake -DCMAKE_BUILD_TYPE=Release -DWERROR=ON -DCOVERAGE=OFF -DPYBIND=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ..
- make -j4 all install - make -j4 all install
......
...@@ -30,7 +30,7 @@ build:windows_cpp: ...@@ -30,7 +30,7 @@ build:windows_cpp:
- Write-Host "Build directory :$BUILD_DIR" - Write-Host "Build directory :$BUILD_DIR"
- mkdir -p $BUILD_DIR - mkdir -p $BUILD_DIR
- cd $BUILD_DIR - cd $BUILD_DIR
- cmake -DCMAKE_INSTALL_PREFIX:PATH=../install_cpp -DCMAKE_BUILD_TYPE=Debug .. - cmake -DCMAKE_BUILD_TYPE=Release -DTESTS=ON -DPYBIND=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCOVERAGE=OFF ..
- cmake --build . -j2 - cmake --build . -j2
- cmake --install . --config Debug - cmake --install . --config Debug
......
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