Merge remote-tracking branch 'dept/domdev'

Author: kpeeters

CMakeLists.txt

@@ -2,7 +2,12 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 set(CADABRA_CMAKE_VERSION 3.1)
 
 cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})
-set(CMAKE_CXX_STANDARD 14)
+if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
+	set(CMAKE_CXX_STANDARD 14)
+	message(STATUS "Using C++14 as you are using CMake < 3.8; consider upgrading as future versions of Cadabra may use C++17 features")
+else()
+	set(CMAKE_CXX_STANDARD 17)
+endif()
 project(Cadabra)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -146,6 +151,8 @@ endif()
 # - Turn optimizations on
 # - Turn off warnings we don't need
 
+
+
 # GCC
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 	if (ENABLE_FRONTEND)

c++lib/CMakeLists.txt

@@ -1,5 +1,12 @@
 cmake_minimum_required(VERSION 2.8)
-set(CMAKE_CXX_STANDARD 14)
+
+if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
+	set(CMAKE_CXX_STANDARD 14)
+	message(STATUS "Using C++14 as you are using CMkake < 3.8, consider upgrading as future versions of Cadabra may make use of C++17 features")
+else()
+	set(CMAKE_CXX_STANDARD 17)
+endif()
+
 project(Cadabra)
 
 #---------------------------------------------------------------------------
@@ -42,11 +49,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 endif()
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 endif()
 
 if(MSVC)

cmake/windows.cmake

@@ -11,11 +11,14 @@ endif()
 if (NOT VCPKG_TOOLCHAIN)
 	find_file(CMAKE_TOOLCHAIN_FILE vcpkg.cmake HINTS $ENV{userprofile} $ENV{systemdrive} PATH_SUFFIXES vcpkg/scripts/buildsystems)
 	if (CMAKE_TOOLCHAIN_FILE)
-		include(${CMAKE_TOOLCHAIN_FILE})
+		include(${CMAKE_TOOLCHAIN_FILE}) 
 	endif()
 endif()
 if (VCPKG_TOOLCHAIN)
-  message(STATUS "Found vcpkg at ${_VCPKG_ROOT_DIR}")
+  if(NOT _VCPKG_ROOT_DIR)
+    set(_VCPKG_ROOT_DIR ${Z_VCPKG_ROOT_DIR})
+  endif()
+  message(STATUS "Found vcpkg at ${Z_VCPKG_ROOT_DIR}")
 else()
   message(FATAL_ERROR "Could not find vcpkg (required for building on Visual Studio)")
 endif()

core/CMakeLists.txt

@@ -41,6 +41,9 @@ find_package(GLIBMM  REQUIRED)
 # GMPXX
 find_package(GMPXX REQUIRED)
 
+# Dependency of TinyProcessLib
+find_package(Threads)
+
 #---------------------------------------------------------------------------
 # Enumerate input files and directories.
 #---------------------------------------------------------------------------
@@ -310,6 +313,19 @@ target_compile_definitions(cadabra2-cli PRIVATE CDBPYTHON_NO_NOTEBOOK)
 target_include_directories(cadabra2-cli PRIVATE ${PYTHON_INCLUDE_DIRS})
 target_link_libraries(cadabra2-cli PRIVATE ${PYTHON_LIBRARIES} ${GLIBMM3_LIBRARIES})
 
+# Notebook diff tool
+add_executable(cdb-nbtool
+  cdb-nbtool.cc
+  ${CADABRA_LIBS_DIR}/tiny-process-library/process.cpp
+)
+if (MSVC)
+  target_sources(cdb-nbtool PRIVATE ${CADABRA_LIBS_DIR}/tiny-process-library/process_win.cpp)
+else()
+  target_sources(cdb-nbtool PRIVATE ${CADABRA_LIBS_DIR}/tiny-process-library/process_unix.cpp)
+  target_link_libraries(cdb-nbtool PRIVATE Threads::Threads)
+endif()
+target_include_directories(cdb-nbtool PRIVATE ${CADABRA_LIBS_DIR}/tiny-process-library)
+
 # Test preprocessor executable
 add_executable(test_preprocessor 
    test_preprocessor.cc 
@@ -416,6 +432,7 @@ else()
 endif()
 
 install(TARGETS cadabra2-cli DESTINATION bin)
+install(TARGETS cdb-nbtool DESTINATION bin)
 
 install(
    FILES 

core/cadabra2_defaults.py.in

@@ -180,6 +180,8 @@ def save_history(history_path):
 
 try:
     import readline
+    if not hasattr(readline, 'redisplay'):
+      readline.redisplay = lambda: None
     history_path = os.path.join(user_data_dir(), "cadabra_history")
     if os.path.exists(history_path):
         readline.read_history_file(history_path)