Merge pull request #162 from SylvainCorlay/update-xproperty

Update xproperty

.appveyor.yml

@@ -34,7 +34,7 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq==4.3.0 xproperty==0.8.0 xtl==0.5.2 -c QuantStack -c conda-forge
+  - conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq==4.3.0 xproperty==0.8.1 xtl==0.5.3 -c QuantStack -c conda-forge
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
   - nmake test_xwidgets
   - cd test

.travis.yml

@@ -17,7 +17,7 @@ install:
     - hash -r
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
-    - conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq=4.3.0 xproperty=0.8.0 xtl=0.5.2 gcc-7 -c QuantStack -c conda-forge
+    - conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq=4.3.0 xproperty=0.8.1 xtl=0.5.3 gcc-7 -c QuantStack -c conda-forge
     # Testing
     - mkdir build
     - cd build

CMakeLists.txt

@@ -62,7 +62,7 @@ message(STATUS "xwidgets binary version: v${XWIDGETS_BINARY_VERSION}")
 find_package(cppzmq 4.3.0 REQUIRED)
 find_package(xtl 0.5.2 REQUIRED)
 find_package(xeus 0.18.1 REQUIRED)
-find_package(xproperty 0.8 REQUIRED)
+find_package(xproperty 0.8.1 REQUIRED)
 
 # Source files
 # ============

environment.yml

@@ -3,7 +3,7 @@ channels:
   - QuantStack
   - conda-forge
 dependencies:
-  - xeus-cling=0.4.10
+  - xeus-cling=0.4.11
   - xwidgets=0.16.0
   - notebook
   - widgetsnbextension >=3.0.0

test/CMakeLists.txt

@@ -47,7 +47,7 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
     # Add googletest directly to our build. This defines
     # the gtest and gtest_main targets.
     add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-                     ${CMAKE_CURRENT_BINARY_DIR}/googletest-build)
+                     ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL)
 
     set(GTEST_INCLUDE_DIRS "${gtest_SOURCE_DIR}/include")
     set(GTEST_BOTH_LIBRARIES  gtest_main gtest)
@@ -79,18 +79,17 @@ if("${isSystemDir}" STREQUAL "-1")
     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 endif("${isSystemDir}" STREQUAL "-1")
 
-set(XWIDGETS_TEST_TARGET test_xwidgets)
-
-add_executable(${XWIDGETS_TEST_TARGET} ${XWIDGETS_TESTS} ${XWIDGETS_HEADERS})
+add_executable(test_xwidgets ${XWIDGETS_TESTS} ${XWIDGETS_HEADERS})
 if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-    add_dependencies(${XWIDGETS_TEST_TARGET} gtest_main)
+    add_dependencies(test_xwidgets gtest_main)
 endif()
 
-target_compile_features(${XWIDGETS_TEST_TARGET} PRIVATE cxx_std_14)
+target_compile_features(test_xwidgets PRIVATE cxx_std_14)
 
-target_link_libraries(${XWIDGETS_TEST_TARGET}
-                        PRIVATE xwidgets
-                        PUBLIC  xtl
-                        PRIVATE xeus
-                        PRIVATE ${GTEST_BOTH_LIBRARIES}
-                        PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(test_xwidgets
+                      PRIVATE xwidgets
+                      PUBLIC  xtl
+                      PRIVATE xeus
+                      PRIVATE ${GTEST_BOTH_LIBRARIES}
+                      PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+target_include_directories(test_xwidgets PRIVATE XWIDGETS_INCLUDE_DIR)