Merge pull request #46 from SylvainCorlay/update-xwidgets

Update xwidgets

Author: SylvainCorlay

.appveyor.yml

@@ -28,7 +28,10 @@ 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 cppzmq=4.3.0 xproperty=0.8 xtl=0.5.2 xwidgets=0.16.0 -c conda-forge
+  # Install host dependencies
+  - conda install xeus=0.18.1 cppzmq=4.3.0 xproperty=0.8.1 xwidgets=0.16.1 -c conda-forge
+  # Install build dependencies
+  - conda install gtest cmake -c conda-forge
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
   - nmake
   - nmake test_xplot

.travis.yml

@@ -17,11 +17,19 @@ install:
     - hash -r
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
-    - conda install gtest cmake xeus=0.18.1 cppzmq=4.3.0 xproperty=0.8 xtl=0.5.2 gcc-7 xwidgets=0.16.0 -c QuantStack -c conda-forge
+    # Install host dependencies
+    - conda install xeus=0.18.1 cppzmq=4.3.0 xproperty=0.8.1 xwidgets=0.16.1 -c conda-forge
+    # Install build dependencies
+    - conda install cmake
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        conda install gxx_linux-64 -c conda-forge;
+      fi
+    # Activate root environment
+    - source activate root
     # Testing
     - mkdir build
     - cd build
-    - cmake -D CMAKE_INSTALL_PREFIX=$HOME/miniconda/ -D DOWNLOAD_GTEST=ON ..
+    - cmake -D CMAKE_INSTALL_PREFIX=$HOME/miniconda/ -D DOWNLOAD_GTEST=ON -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX ..
     - make -j2 install
     - make -j2 test_xplot
     - cd test

CMakeLists.txt

@@ -75,7 +75,7 @@ message(STATUS "xplot binary version: v${XPLOT_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(xwidgets 0.16.0 REQUIRED)
+find_package(xwidgets 0.16.1 REQUIRED)
 
 # Source files
 # ============

README.md

@@ -79,7 +79,7 @@ All the dependencies of xplot are available for the conda package manager.
 
 | `xplot` | `xwidgets`  |  `xeus`         |
 |---------|-------------|-----------------|
-|  master |   ~0.16.0   |  >=0.18.1,<0.19 |
+|  master |   ~0.16.1   |  >=0.18.1,<0.19 |
 |  0.11.0 |   ~0.16.0   |  >=0.18.1,<0.19 |
 |  0.10.0 |   ~0.15.0   |  >=0.17.0,<0.18 |
 |  0.9.2  |   ~0.13.1   |  >=0.14.1,<0.15 |

test/CMakeLists.txt

@@ -12,10 +12,10 @@ message(STATUS "Forcing tests build type to Release")
 set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
 
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-    project(xwidgets-test)
+    project(xplot-test)
 
-    find_package(xwidgets REQUIRED CONFIG)
-    set(XWIDGETS_INCLUDE_DIR ${xwidgets_INCLUDE_DIRS})
+    find_package(xplot REQUIRED CONFIG)
+    set(XPLOT_INCLUDE_DIR ${xplot_INCLUDE_DIRS})
 endif ()
 
 # Dependencies
@@ -45,10 +45,10 @@ 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)
+    set(GTEST_BOTH_LIBRARIES gtest_main gtest)
 else()
     find_package(GTest REQUIRED)
 endif()
@@ -81,20 +81,18 @@ if("${isSystemDir}" STREQUAL "-1")
     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 endif("${isSystemDir}" STREQUAL "-1")
 
-set(XPLOT_TEST_TARGET test_xplot)
-
-add_executable(${XPLOT_TEST_TARGET} ${XPLOT_TESTS} ${XPLOT_HEADERS})
+add_executable(test_xplot ${XPLOT_TESTS} ${XPLOT_HEADERS})
 if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-    add_dependencies(${XPLOT_TEST_TARGET} gtest_main)
+    add_dependencies(test_xplot gtest_main)
 endif()
 
-target_compile_features(${XPLOT_TEST_TARGET} PRIVATE cxx_std_14)
+target_compile_features(test_xplot PRIVATE cxx_std_14)
 
-target_link_libraries(${XPLOT_TEST_TARGET}
-                        PUBLIC xtl
-                        PUBLIC xeus
-                        PUBLIC xwidgets
-                        PUBLIC xplot
-                        PRIVATE ${GTEST_BOTH_LIBRARIES}
-                        PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(test_xplot
+                      PUBLIC xtl
+                      PUBLIC xeus
+                      PUBLIC xwidgets
+                      PUBLIC xplot
+                      PRIVATE ${GTEST_BOTH_LIBRARIES}
+                      PRIVATE ${CMAKE_THREAD_LIBS_INIT})