More attempts to get start menu items.

Author: Kasper Peeters

client_server/CMakeLists.txt

@@ -230,7 +230,6 @@ if(ENABLE_JUPYTER)
 endif()
 
 if (MSVC AND NOT INSTALL_TARGETS_ONLY)
-   install_dlls_from("client_server")
    # GTK helpers
    install(
       FILES

cmake/functions.cmake

@@ -21,46 +21,4 @@ macro(install_directory_permissions DIR)
   )
 endmacro()
 
-# Executes rm -f on FILENAME
-macro(remove_file FILENAME)
-  install(CODE "execute_process(COMMAND rm -f ${FILENAME})")
-endmacro()
-macro(remove_dir DIRNAME)
-  install(CODE "execute_process(COMMAND rmdir ${DIRNAME})")
-endmacro()
 
-# Inserts an install directive to copy all dlls from
-# the build directory of SUBPROJECT to the Install
-# bin folder
-macro(install_dlls_from SUBPROJECT)
-  if(CMAKE_GENERATOR MATCHES "Visual Studio.*")
-    install(
-      DIRECTORY "${CMAKE_BINARY_DIR}/${SUBPROJECT}/${CMAKE_BUILD_TYPE}/"
-      DESTINATION ${CDB_BIN_PATH}
-      FILES_MATCHING PATTERN "*.dll"
-    )
-  else()
-    install(
-      DIRECTORY "${CMAKE_BINARY_DIR}/${SUBPROJECT}/"
-      DESTINATION ${CDB_BIN_PATH}
-      FILES_MATCHING PATTERN "*.dll"
-    )
-  endif()
-endmacro()
-
-macro(install_deps_of BINARY)
-  if(WIN32)
-    execute_process(
-      COMMAND ldd ${BINARY}
-      COMMAND grep '=> /'
-      COMMAND awk '{print $3}'
-      OUTPUT_VARIABLE DEPS
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    install(
-      DIRECTORY "${CMAKE_BINARY_DIR}/${SUBPROJECT}/"
-      DESTINATION ${CDB_BIN_PATH}
-      FILES ${DEPS}
-    )
-  endif()
-endmacro()

core/CMakeLists.txt

@@ -506,10 +506,6 @@ install(
    ${CDB_BIN_PATH}
  )
 
-if(WIN32 AND NOT INSTALL_TARGETS_ONLY)
-   install_dlls_from("core")
-endif()
-
 if(NOT WIN32)
    if(CMAKE_GENERATOR MATCHES "Ninja")
       set(destdir_expr "\$\${DESTDIR}")

frontend/gtkmm/CMakeLists.txt

@@ -276,17 +276,13 @@ if (NOT INSTALL_TARGETS_ONLY)
         execute_process(COMMAND cygpath -m "/ucrt64/lib/gdk-pixbuf-2.0" OUTPUT_VARIABLE WINGDK OUTPUT_STRIP_TRAILING_WHITESPACE)
         file(INSTALL ${WINGDK} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
     ]])
-    # 1install_dlls_from("frontend/gtkmm")
 
     # Logic to get a start menu icon.
-    set(TARGET_EXECUTABLE "cadabra2-gtk")
-    install(CODE [[
-       file(WRITE "${CMAKE_INSTALL_PREFIX}/CreateShortcuts.nsh" "
-            CreateShortCut \"$SMPROGRAMS\\$STARTMENU_FOLDER\\YourApp.lnk\" \"$INSTDIR\\${TARGET_EXECUTABLE}.exe\"
-            CreateShortCut \"$DESKTOP\\Cadabra.lnk\" \"$INSTDIR\\${TARGET_EXECUTABLE}.exe\"
-          ")
-    ]])
-    set(CPACK_NSIS_CREATE_ICONS_EXTRA "ReadINIStr \$STARTMENU_FOLDER \$INSTDIR\\\\CreateShortcuts.nsh")
+    set(CPACK_NSIS_CREATE_ICONS_EXTRA
+      "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${CMAKE_PROJECT_NAME}.lnk' '$INSTDIR\\\\cadabra2-gtk.exe'")
+    set(CPACK_NSIS_DELETE_ICONS_EXTRA
+      "Delete '$SMPROGRAMS\\\\$START_MENU\\\\${CMAKE_PROJECT_NAME}.lnk'")
+
     set(CPACK_PACKAGE_EXECUTABLES "cadabra2-gtk" "Cadabra2")
     set(CPACK_NSIS_MENU_LINKS "cadabra2-gtk" "Cadabra2.lnk")
     set(CPACK_NSIS_CREATE_ICONS_EXTRA "ReadINIStr \$STARTMENU_FOLDER \$INSTDIR\\\\CreateShortcuts.nsh")

libs/linenoise/linenoise.hpp

@@ -1062,7 +1062,9 @@ inline int win32_write(int fd, const void *buffer, unsigned int count) {
 
 #define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
 #define LINENOISE_MAX_LINE 4096
+#ifndef _WIN32
 static const char *unsupported_term[] = {"dumb","cons25","emacs",NULL};
+#endif
 static CompletionCallback completionCallback;
 
 #ifndef _WIN32