Commit 86acdd41 authored by Arnaud Le Meillour's avatar Arnaud Le Meillour
Browse files

change install dir from CI

parents 49339499 8c50d03b
Pipeline #64661 failed
...@@ -15,7 +15,11 @@ stages: ...@@ -15,7 +15,11 @@ stages:
- tags - tags
script: script:
- mkdir build && cd build - mkdir build && cd build
<<<<<<< HEAD
- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
=======
- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ..
>>>>>>> develop
- make -j - make -j
artifacts: artifacts:
paths: paths:
...@@ -39,7 +43,11 @@ stages: ...@@ -39,7 +43,11 @@ stages:
- tags - tags
script: script:
- cd build - cd build
<<<<<<< HEAD
- '[[ -d ${BUILD_DIR}/lib/classes ]] && ls -lah ${BUILD_DIR}/lib/classes' - '[[ -d ${BUILD_DIR}/lib/classes ]] && ls -lah ${BUILD_DIR}/lib/classes'
=======
- '[[ -d ${INSTALL_DIR}/lib/classes ]]'
>>>>>>> develop
- make install - make install
......
...@@ -12,7 +12,10 @@ else() ...@@ -12,7 +12,10 @@ else()
set(CMAKE_BUILD_TYPE RelWithDebInfo) set(CMAKE_BUILD_TYPE RelWithDebInfo)
set(BUILD_TYPE_DIR "release") set(BUILD_TYPE_DIR "release")
endif() endif()
<<<<<<< HEAD
set(USER_INSTALL_DIR ${USER_REPOSITORY}/${BUILD_TYPE_DIR}) set(USER_INSTALL_DIR ${USER_REPOSITORY}/${BUILD_TYPE_DIR})
=======
>>>>>>> develop
# Set specific search directories for find_package() cmd # Set specific search directories for find_package() cmd
set(USER_REPO_TANGO_DIRS set(USER_REPO_TANGO_DIRS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment