blob: 4eb8bae3b2f6f495b3adf17c093ac62838978c17 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff -aur -bZwB -x .git cadabra2-git.old/client_server/CMakeLists.txt cadabra2-git/client_server/CMakeLists.txt
--- cadabra2-git.old/client_server/CMakeLists.txt 2016-05-21 14:48:27.205019749 -0400
+++ cadabra2-git/client_server/CMakeLists.txt 2016-05-21 14:49:28.927905642 -0400
@@ -33,7 +33,7 @@
find_package(Boost 1.54.0 COMPONENTS python3
system regex program_options REQUIRED)
else()
- find_package(Boost 1.54.0 COMPONENTS python-py34 system regex program_options REQUIRED)
+ find_package(Boost 1.54.0 COMPONENTS python3 system regex program_options REQUIRED)
endif()
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
diff -aur -bZwB -x .git cadabra2-git.old/core/CMakeLists.txt cadabra2-git/core/CMakeLists.txt
--- cadabra2-git.old/core/CMakeLists.txt 2016-05-21 14:48:27.218352986 -0400
+++ cadabra2-git/core/CMakeLists.txt 2016-05-21 14:49:35.234526685 -0400
@@ -33,7 +33,7 @@
if(APPLE)
find_package(Boost 1.54.0 COMPONENTS python3)
else()
- find_package(Boost 1.54.0 COMPONENTS python-py34)
+ find_package(Boost 1.54.0 COMPONENTS python3)
endif()
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
diff -aur -bZwB -x .git cadabra2-git.old/frontend/gtkmm/Cadabra.hh cadabra2-git/frontend/gtkmm/Cadabra.hh
--- cadabra2-git.old/frontend/gtkmm/Cadabra.hh 2016-05-21 14:48:27.235019531 -0400
+++ cadabra2-git/frontend/gtkmm/Cadabra.hh 2016-05-21 14:49:55.931043749 -0400
@@ -20,7 +20,7 @@
void on_open(const Gio::Application::type_vec_files& files, const Glib::ustring& hint) override;
private:
- std::vector<cadabra::NotebookWindow> windows;
+ cadabra::NotebookWindow nw;
cadabra::ComputeThread compute;
std::thread compute_thread;
};
|