Skip to content

Commit

Permalink
cmake_conan develop2
Browse files Browse the repository at this point in the history
  • Loading branch information
matkonnerth committed Nov 20, 2024
1 parent 683fe2e commit 7fc041d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ jobs:

steps:
- name: Install conan
run: pip install conan && conan profile detect
run: pip install conan && conan profile detect && conan profile update settings.compiler.

- uses: actions/checkout@v4
with:
path: ./nodesetLoader

- uses: ilammy/msvc-dev-cmd@v1
- name: Build nodesetLoader
run: |
cd ./nodesetLoader && cmake -DCMAKE_BUILD_TYPE=Release `
cd ./nodesetLoader && cmake -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake -DCMAKE_BUILD_TYPE=Release `
-DENABLE_TESTING=ON `
-DENABLE_CONAN=ON . && `
cmake --build .
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "cmake-conan"]
path = cmake-conan
url = [email protected]:conan-io/cmake-conan.git
16 changes: 0 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,6 @@ if(${ENABLE_BUILD_INTO_OPEN62541})
set(ENABLE_BACKEND_STDOUT off)
endif()

if(${ENABLE_CONAN})
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake"
"${CMAKE_BINARY_DIR}/conan.cmake")
endif()

include(${CMAKE_BINARY_DIR}/conan.cmake)
conan_cmake_run(CONANFILE conanfile.txt
BASIC_SETUP
CMAKE_TARGETS
BUILD missing)

include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
endif()

# LibXML2 is always required
find_package(LibXml2 REQUIRED QUIET)

Expand Down
1 change: 1 addition & 0 deletions cmake-conan
Submodule cmake-conan added at c22bbf

0 comments on commit 7fc041d

Please sign in to comment.