Merge pull request #8 from conda-forge-admin/conda_forge_admin_7

ENH: update package version to 1.0.0

recipe/bld.bat

@@ -9,7 +9,10 @@ cmake ^
     -G "Ninja" ^
     -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
     -DCMAKE_BUILD_TYPE=Release ^
-    -DBUILD_TESTING:BOOL=OFF ^
+    -DBUILD_TESTING:BOOL=ON ^
+    -DZENOHCXX_ZENOHC:BOOL=ON ^
+    -DZENOHCXX_ZENOHPICO:BOOL=OFF ^
+    -DZENOHCXX_EXAMPLES_PROTOBUF:BOOL=OFF ^
     %SRC_DIR%
 if errorlevel 1 exit 1
 
@@ -20,3 +23,11 @@ if errorlevel 1 exit 1
 :: Install.
 cmake --build . --config Release --target install
 if errorlevel 1 exit 1
+
+:: Build tests.
+cmake --build . --config Release --target tests
+if errorlevel 1 exit 1
+
+:: Test.
+ctest --output-on-failure -C Release
+if errorlevel 1 exit 1

recipe/build.sh

@@ -5,11 +5,18 @@ rm -rf build
 mkdir build
 cd build
 
-# tests are disabled as of 0.11.0 they depend on zenohc's static library
-# switch them on on 1.0.0 as they can be compiled against zenohc's shared library
 cmake ${CMAKE_ARGS} -GNinja $SRC_DIR \
       -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_TESTING:BOOL=OFF
+      -DBUILD_TESTING:BOOL=ON \
+      -DZENOHCXX_ZENOHC:BOOL=ON \
+      -DZENOHCXX_ZENOHPICO:BOOL=OFF \
+      -DZENOHCXX_EXAMPLES_PROTOBUF:BOOL=OFF
 
 cmake --build . --config Release
 cmake --build . --config Release --target install
+cmake --build . --config Release --target tests
+
+
+if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then
+  ctest --output-on-failure -C Release 
+fi

recipe/meta.yaml

@@ -1,17 +1,13 @@
 {% set name = "libzenohcxx" %}
-{% set version = "0.11.0" %}
+{% set version = "1.0.0" %}
 
 package:
   name: {{ name }}
   version: {{ version }}
 
 source:
   - url: https://github.com/eclipse-zenoh/zenoh-cpp/archive/refs/tags/{{ version }}.tar.gz
-    sha256: 62e9a51ced89130d7a49a1e8f801308338d972e62b90c5224f5801171bd90af0
-    patches:
-      - 136.patch
-      - disable_tests_examples_and_docs.patch
-      - disable_zenoh_pico.patch
+    sha256: ffd3cb8c8263f842479c93c0e380583a2749f2c99cff0e46e5e81f1de47cb793
 
 build:
   number: 0
@@ -31,9 +27,7 @@ test:
   commands:
     - test -f ${PREFIX}/include/zenoh.hxx  # [unix]
     - if not exist %LIBRARY_PREFIX%\\include\\zenoh.hxx exit 1  # [win]
-    # --disable-double-find passed as a workaround for https://github.com/eclipse-zenoh/zenoh-cpp/pull/232
-    # We need to first call find_package(zenohc) otherwise zenohcxx::zenohc::lib is not defined
-    - cmake-package-check zenohc zenohcxx --targets zenohcxx zenohcxx::zenohc::lib --disable-double-find
+    - cmake-package-check zenohc zenohcxx --targets zenohcxx zenohcxx::zenohc
   requires:
     - cmake-package-check
     - {{ compiler('c') }}
@@ -43,7 +37,7 @@ about:
   home: https://github.com/eclipse-zenoh/zenoh-cpp
   license: Apache-2.0 OR EPL-2.0
   license_file: LICENSE
-  summary:  C++ API for zenoh
+  summary: C++ API for zenoh
 
 extra:
   feedstock-name: zenoh-cpp