fix(cmake): conan path added to cmake (#505)

centreon · Jan 9, 2023 · 031d989 · 031d989
1 parent 5512b48
commit 031d989
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/centreon-collect.yml b/.github/workflows/centreon-collect.yml
@@ -8,7 +8,7 @@ on:
       - dev-22.10.x
 
 env:
-  REGISTRY: registry-docker.centreon.com/docker-global
+  REGISTRY: docker.centreon.com
 
 jobs:
   create-version:
@@ -221,4 +221,4 @@ jobs:
           cloudfront_id: ${{ secrets.CLOUDFRONT_ID }}
           yum_repo_address: ${{ secrets.YUM_REPO_ADDRESS }}
           yum_repo_key: ${{ secrets.YUM_REPO_KEY }}
-          yum_repo_url: ${{ secrets.YUM_REPO_URL }}
+          yum_repo_url: ${{ secrets.YUM_REPO_URL }}
diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml
@@ -16,7 +16,7 @@ on:
       - 'ci/docker/**'
 
 env:
-  REGISTRY: registry-docker.centreon.com/docker-global
+  REGISTRY: docker.centreon.com
 
 jobs:
   create-version:

diff --git a/.github/workflows/robot-nightly.yml b/.github/workflows/robot-nightly.yml
@@ -9,7 +9,7 @@ on:
     - cron: '0 0 * * *'
 
 env:
-  REGISTRY: registry-docker.centreon.com/docker-global
+  REGISTRY: docker.centreon.com
 
 jobs:
   robot-test:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -104,6 +104,8 @@ set(USER_ENGINE centreon-engine)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
+set(CMAKE_PROGRAM_PATH ${CONAN_BIN_DIRS_PROTOBUF};${CMAKE_PROGRAM_PATH})
+
 find_package(Protobuf REQUIRED)
 
 message(NOTICE "-- use protoc compiler: ${Protobuf_PROTOC_EXECUTABLE}")