Release 3.1.2

aldebaran · Mar 2, 2023 · cf9f3d3 · cf9f3d3
2 parents b35f6dd + 6c5a30e
commit cf9f3d3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/cmake/add_targets.cmake b/cmake/add_targets.cmake
@@ -46,7 +46,7 @@ enable_warnings(qi_python_objects)
 target_include_directories(qi_python_objects PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(qi_python_objects
-  PUBLIC cxx11
+  PUBLIC cxx17
          pybind11
          qi.interface)
 
@@ -90,7 +90,7 @@ target_sources(qi_python
 
 enable_warnings(qi_python)
 
-target_link_libraries(qi_python PRIVATE cxx11 qi_python_objects)
+target_link_libraries(qi_python PRIVATE cxx17 qi_python_objects)
 
 set_target_properties(qi_python
   PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${QIPYTHON_PYTHON_MODULE_NAME}

diff --git a/cmake/add_tests.cmake b/cmake/add_tests.cmake
@@ -20,14 +20,14 @@ include(GoogleTest)
 find_package(qimodule REQUIRED HINTS ${libqi_SOURCE_DIR})
 qi_create_module(moduletest NO_INSTALL)
 target_sources(moduletest PRIVATE tests/moduletest.cpp)
-target_link_libraries(moduletest cxx11 qi.interface)
+target_link_libraries(moduletest cxx17 qi.interface)
 enable_warnings(moduletest)
 set_build_rpath_to_qipython_dependencies(moduletest)
 
 
 add_executable(service_object_holder)
 target_sources(service_object_holder PRIVATE tests/service_object_holder.cpp)
-target_link_libraries(service_object_holder PRIVATE cxx11 qi.interface)
+target_link_libraries(service_object_holder PRIVATE cxx17 qi.interface)
 enable_warnings(service_object_holder)
 set_build_rpath_to_qipython_dependencies(service_object_holder)
 
@@ -47,7 +47,7 @@ target_link_libraries(test_qipython
           pybind11
           qi_python_objects
           qi.interface
-          cxx11
+          cxx17
           gmock)
 
 add_executable(test_qipython_local_interpreter)
@@ -58,7 +58,7 @@ target_link_libraries(test_qipython_local_interpreter
           pybind11
           qi_python_objects
           qi.interface
-          cxx11
+          cxx17
           gmock)
 
 set(_sdk_prefix "${CMAKE_BINARY_DIR}/sdk")

diff --git a/cmake/set_dependencies.cmake b/cmake/set_dependencies.cmake
@@ -153,9 +153,9 @@ if(CMAKE_TOOLCHAIN_FILE)
 endif()
 
 
-# C++11
-add_library(cxx11 INTERFACE)
-target_compile_features(cxx11 INTERFACE cxx_std_11)
+# C++17
+add_library(cxx17 INTERFACE)
+target_compile_features(cxx17 INTERFACE cxx_std_17)
 
 
 # Threads
@@ -248,7 +248,7 @@ if(NOT pybind11_POPULATED)
   # subproject.
   add_library(pybind11 INTERFACE)
   target_include_directories(pybind11 INTERFACE ${pybind11_SOURCE_DIR}/include)
-  target_link_libraries(pybind11 INTERFACE cxx11 python_headers)
+  target_link_libraries(pybind11 INTERFACE cxx17 python_headers)
 endif()
 
 

diff --git a/cmake/set_libqi_dependency.cmake b/cmake/set_libqi_dependency.cmake
@@ -1,4 +1,4 @@
-overridable_variable(LIBQI_VERSION 3.0.0)
+overridable_variable(LIBQI_VERSION 4.0.0)
 
 # Our github clone is sometimes late or is missing tags, so we enable
 # customisation of the URL at configuration time, so users can use another clone.
@@ -40,7 +40,7 @@ else()
   include(set_libqi_dependency_system)
 endif()
 
-target_link_libraries(qi.interface INTERFACE cxx11)
+target_link_libraries(qi.interface INTERFACE cxx17)
 
 # Generate a Python file containing information about the native part of the
 # module.\

diff --git a/qi/_version.py b/qi/_version.py
@@ -1 +1 @@
-__version__ = '3.1.1'
+__version__ = '3.1.2'