From 4fa3e2019e9e05c57aad6720cc55b6a169e1c9bf Mon Sep 17 00:00:00 2001 From: "Rule Timothy (CC/EMT2)" Date: Thu, 15 Feb 2024 09:58:18 +0100 Subject: [PATCH] Update example build scripts for windows. Signed-off-by: Rule Timothy (VM/EMT3) --- dse/modelc/examples/binary/CMakeLists.txt | 2 ++ dse/modelc/examples/binary/model.yaml | 4 ++-- dse/modelc/examples/extended/CMakeLists.txt | 2 ++ dse/modelc/examples/extended/model.yaml | 4 ++-- dse/modelc/examples/minimal/CMakeLists.txt | 2 ++ dse/modelc/examples/minimal/model.yaml | 4 ++-- dse/modelc/examples/ncodec/CMakeLists.txt | 2 ++ dse/modelc/examples/ncodec/model.yaml | 4 ++-- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dse/modelc/examples/binary/CMakeLists.txt b/dse/modelc/examples/binary/CMakeLists.txt index 06482ec..6af31df 100644 --- a/dse/modelc/examples/binary/CMakeLists.txt +++ b/dse/modelc/examples/binary/CMakeLists.txt @@ -31,6 +31,8 @@ target_link_libraries(binary install(TARGETS binary LIBRARY DESTINATION ${MODEL_PATH}/lib + RUNTIME DESTINATION + ${MODEL_PATH}/lib COMPONENT binary ) diff --git a/dse/modelc/examples/binary/model.yaml b/dse/modelc/examples/binary/model.yaml index a09a572..396e6b4 100644 --- a/dse/modelc/examples/binary/model.yaml +++ b/dse/modelc/examples/binary/model.yaml @@ -17,10 +17,10 @@ spec: path: lib/libbinary.so - os: windows arch: x64 - path: bin/binary.dll + path: lib/libbinary.dll - os: windows arch: x86 - path: bin/binary.dll + path: lib/libbinary.dll channels: - alias: scalar selectors: diff --git a/dse/modelc/examples/extended/CMakeLists.txt b/dse/modelc/examples/extended/CMakeLists.txt index 17cd3e2..964f50a 100644 --- a/dse/modelc/examples/extended/CMakeLists.txt +++ b/dse/modelc/examples/extended/CMakeLists.txt @@ -31,6 +31,8 @@ target_link_libraries(extended install(TARGETS extended LIBRARY DESTINATION ${MODEL_PATH}/lib + RUNTIME DESTINATION + ${MODEL_PATH}/lib COMPONENT extended ) diff --git a/dse/modelc/examples/extended/model.yaml b/dse/modelc/examples/extended/model.yaml index 8cd8caf..5ae4d15 100644 --- a/dse/modelc/examples/extended/model.yaml +++ b/dse/modelc/examples/extended/model.yaml @@ -17,10 +17,10 @@ spec: path: lib/libextended.so - os: windows arch: x64 - path: bin/extended.dll + path: lib/libextended.dll - os: windows arch: x86 - path: bin/extended.dll + path: lib/libextended.dll channels: - alias: data selectors: diff --git a/dse/modelc/examples/minimal/CMakeLists.txt b/dse/modelc/examples/minimal/CMakeLists.txt index e07d159..4af4f4d 100644 --- a/dse/modelc/examples/minimal/CMakeLists.txt +++ b/dse/modelc/examples/minimal/CMakeLists.txt @@ -21,6 +21,8 @@ target_link_libraries(minimal install(TARGETS minimal LIBRARY DESTINATION ${MODEL_PATH}/lib + RUNTIME DESTINATION + ${MODEL_PATH}/lib COMPONENT minimal ) diff --git a/dse/modelc/examples/minimal/model.yaml b/dse/modelc/examples/minimal/model.yaml index 1718cfe..7a36afe 100644 --- a/dse/modelc/examples/minimal/model.yaml +++ b/dse/modelc/examples/minimal/model.yaml @@ -17,10 +17,10 @@ spec: path: lib/libminimal.so - os: windows arch: x64 - path: bin/minimal.dll + path: lib/libminimal.dll - os: windows arch: x86 - path: bin/minimal.dll + path: lib/libminimal.dll channels: - alias: data selectors: diff --git a/dse/modelc/examples/ncodec/CMakeLists.txt b/dse/modelc/examples/ncodec/CMakeLists.txt index 9d5bd09..7d71151 100644 --- a/dse/modelc/examples/ncodec/CMakeLists.txt +++ b/dse/modelc/examples/ncodec/CMakeLists.txt @@ -33,6 +33,8 @@ target_link_libraries(ncodec install(TARGETS ncodec LIBRARY DESTINATION ${MODEL_PATH}/lib + RUNTIME DESTINATION + ${MODEL_PATH}/lib COMPONENT ncodec ) diff --git a/dse/modelc/examples/ncodec/model.yaml b/dse/modelc/examples/ncodec/model.yaml index 57093ca..9ef5032 100644 --- a/dse/modelc/examples/ncodec/model.yaml +++ b/dse/modelc/examples/ncodec/model.yaml @@ -17,10 +17,10 @@ spec: path: lib/libncodec.so - os: windows arch: x64 - path: bin/ncodec.dll + path: lib/libncodec.dll - os: windows arch: x86 - path: bin/ncodec.dll + path: lib/libncodec.dll channels: - alias: binary selectors: