Added resource file for Windows build to add icon to the exe; and fixed a bug where CMake might fail to add tests due to /bin/echo command which isn't recognised on windows

Author: dominicprice

frontend/gtkmm/CMakeLists.txt

@@ -49,6 +49,9 @@ set(cadabra_gtk_src
 )
 if (MSVC)
 	list(APPEND cadabra_gtk_src ${CADABRA_LIBS_DIR}/tiny-process-library/process_win.cpp)
+	# Configure and add resource file to list of sources
+	configure_file(win_res.rc.in ${CMAKE_CURRENT_BINARY_DIR}/win_res.rc)
+	list(APPEND cadabra_gtk_src ${CMAKE_CURRENT_BINARY_DIR}/win_res.rc)
 else()
 	list(APPEND cadabra_gtk_src ${CADABRA_LIBS_DIR}/tiny-process-library/process_unix.cpp)
 endif()

frontend/gtkmm/win_res.rc.in

@@ -0,0 +1 @@
+102	ICON	"@CADABRA_ROOT_DIR@/config/cadabra2.ico"

tests/CMakeLists.txt

@@ -8,7 +8,11 @@ project(Cadabra)
 
 print_header("Configuring tests")
 
-
+if (WIN32)
+	set(ECHO_N "")
+else()
+	set(ECHO_N "/bin/echo -n")
+endif()
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
 
 if(WIN32)
@@ -49,7 +53,7 @@ foreach(NBTEST ${NBTESTS})
 	 COMMAND cadabra2cadabra
 	 ARGS    ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb
 	 COMMENT "Creating ${NBTEST} notebook...")
-  add_custom_target("${NBTEST}_test" ALL /bin/echo -n DEPENDS ${CDBOUT}/${NBTEST}.cdb)
+  add_custom_target("${NBTEST}_test" ALL ${ECHO_N} DEPENDS ${CDBOUT}/${NBTEST}.cdb)
   add_test(${NBTEST}  ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/core/cadabra2 ${CDBOUT}/${NBTEST}.cdb)
   set_tests_properties(${NBTEST}      PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHONPATH};LANG=en_US.UTF-8;LC_ALL=en_US.UTF-8;PYTHONIOENCODING=utf-8")    
 endforeach()