Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Commit 0a767d1

Browse files
authored
Merge pull request #232 from mtconnect/fix_asset_counts_when_assets_are_removed
2 parents 0f49567 + b0bbadd commit 0a767d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1141
-643
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set(AGENT_VERSION_MAJOR 2)
33
set(AGENT_VERSION_MINOR 0)
44
set(AGENT_VERSION_PATCH 0)
55
set(AGENT_VERSION_BUILD 12)
6-
set(AGENT_VERSION_RC "_RC23")
6+
set(AGENT_VERSION_RC "_RC24")
77

88
# This minimum version is to support Visual Studio 2017 and C++ feature checking and FetchContent
99
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

agent_lib/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ set(AGENT_SOURCES
2525
# src/asset SOURCE_FILES_ONLY
2626

2727
"${CMAKE_CURRENT_SOURCE_DIR}/../src/asset/asset.cpp"
28-
"${CMAKE_CURRENT_SOURCE_DIR}/../src/asset/asset_buffer.cpp"
2928
"${CMAKE_CURRENT_SOURCE_DIR}/../src/asset/cutting_tool.cpp"
3029
"${CMAKE_CURRENT_SOURCE_DIR}/../src/asset/file_asset.cpp"
3130
"${CMAKE_CURRENT_SOURCE_DIR}/../src/asset/raw_material.cpp"
@@ -356,10 +355,6 @@ if(WITH_RUBY)
356355
agent_lib
357356
PUBLIC
358357
CONAN_PKG::mruby)
359-
target_link_directories(
360-
agent_lib
361-
PUBLIC
362-
${CONAN_LIB_DIRS_MRUBY})
363358
endif()
364359

365360
target_compile_definitions(

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ before_build:
5050
pip install conan
5151
conan export conan/mqtt_cpp
5252
conan export conan/mruby
53-
conan export conan/nasm
5453
conan install . -if build --build=missing -pr conan/profiles/vs32 -o run_tests=False -o with_ruby=%WITH_RUBY%
5554
- sh: |-
5655
export PATH=$HOME/venv3.10/bin:$PATH

0 commit comments

Comments
 (0)