mirror of
https://git.freebsd.org/ports.git
synced 2025-06-15 17:50:31 -04:00
f379a201bc
Port changes: * Remove the overriding patch of boost::asio: now EINPROGRESS is handled properly, before it was not. * Remove the overriding patch of websocketpp: added an equivalent patch into cadabra2 source, it is easier this way. Before such function didn't exist in the websocketpp interface. * Add the patch for pull/82: missing #include / removal of unnecessary prefix calculation. * Change cmake -> cmake:outsource. * Switch to python3 because it links to python3 anyway, even though it claims to support python2. * Add DOS2UNIX_FILES for cmake/version.cmake for one patched file. * Remove post-patch: added a similar patch under files/ * Remove post-install: stripping is now done by the project. * Remove post-install-GUI-on: icons are now installed by the project. Testing: * Runs fine, shows correct results for examples from the online manual.
35 lines
1 KiB
Text
35 lines
1 KiB
Text
--- client_server/CMakeLists.txt.orig 2018-03-30 09:33:27 UTC
|
|
+++ client_server/CMakeLists.txt
|
|
@@ -28,7 +28,6 @@ find_package(Boost 1.53.0 COMPONENTS sys
|
|
set(CADABRA_SERVER_SRC
|
|
Server.cc
|
|
Snoop.cc
|
|
- jsoncpp/jsoncpp.cpp
|
|
../core/CdbPython.cc
|
|
../core/Stopwatch.cc
|
|
../core/ProgressMonitor.cc
|
|
@@ -43,7 +42,6 @@ set(CADABRA_CLIENT_SRC
|
|
../core/DataCell.cc
|
|
Actions.cc
|
|
Snoop.cc
|
|
- jsoncpp/jsoncpp.cpp
|
|
../libs/whereami/whereami.c
|
|
../core/InstallPrefix.cc
|
|
# ../libs/sqlite3/sqlite3.c
|
|
@@ -58,7 +56,6 @@ include_directories(
|
|
"../core"
|
|
"../libs/pybind11/include"
|
|
"websocketpp"
|
|
- "jsoncpp"
|
|
"../libs/internal/include"
|
|
"../libs/whereami"
|
|
${Boost_INCLUDE_DIRS}
|
|
@@ -114,7 +111,7 @@ add_executable(cadabra2html cadabra2html
|
|
target_link_libraries(cadabra2html cadabra_client)
|
|
|
|
# Client library
|
|
-add_library(cadabra_client STATIC ${CADABRA_CLIENT_SRC})
|
|
+add_library(cadabra_client SHARED ${CADABRA_CLIENT_SRC})
|
|
target_link_libraries(cadabra_client
|
|
${Boost_LIBRARIES}
|
|
${SQLITE3_LIBRARIES}
|