From 834eacf0e2ad383f2e7882c44101427a138be7f8 Mon Sep 17 00:00:00 2001 From: Yitzchak Date: Wed, 20 Apr 2016 19:58:46 -0400 Subject: [PATCH 1/2] Fixed install of cadabra2 script --- core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 85a7cb7446..7fb6700534 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -184,7 +184,7 @@ install(FILES configure_file("${PROJECT_SOURCE_DIR}/cadabra2.in" "${PROJECT_SOURCE_DIR}/cadabra2") -install(PROGRAMS "${PROJECT_BINARY_DIR}/cadabra2" DESTINATION bin) +install(PROGRAMS "${PROJECT_SOURCE_DIR}/cadabra2" DESTINATION bin) # Create Python dynamic library 'cadabra' without lib prefix. From 2f5f858b381668122d23a29f2b2314b83854189d Mon Sep 17 00:00:00 2001 From: Tarn Burton Date: Sun, 22 May 2016 09:25:44 -0400 Subject: [PATCH 2/2] Fix naming of Boost Python3 on non-Ubuntu --- client_server/CMakeLists.txt | 12 +++++------- core/CMakeLists.txt | 20 ++++++++------------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/client_server/CMakeLists.txt b/client_server/CMakeLists.txt index 25795f62af..f6ed48f62a 100644 --- a/client_server/CMakeLists.txt +++ b/client_server/CMakeLists.txt @@ -29,11 +29,11 @@ endif() message("-- Found python ${PYTHON_LIBRARIES}") # Locate Boost -if(APPLE) - find_package(Boost 1.54.0 COMPONENTS python3 - system regex program_options REQUIRED) +find_package(Boost 1.54.0 COMPONENTS python3) +if(Boost_PYTHON3_FOUND) + 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 python-py34 system regex program_options REQUIRED) endif() set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) @@ -61,7 +61,7 @@ link_directories(${UUID_LIBRARY_DIRS}) add_library(cadabra_server SHARED Server.cc Snoop.cc jsoncpp/jsoncpp.cpp) target_link_libraries(cadabra_server ${Boost_LIBRARIES} ${SNOOP_LIBRARIES} sqlite3 ${UUID_LIBRARIES} ${PYTHON_LIBRARIES} ) -# Create the client library. +# Create the client library. add_library(cadabra_client SHARED ComputeThread.cc DocumentThread.cc DataCell.cc Actions.cc popen2.cc Snoop.cc jsoncpp/jsoncpp.cpp) target_link_libraries(cadabra_client ${Boost_LIBRARIES} sqlite3 ${UUID_LIBRARIES} ${PYTHON_LIBRARIES}) @@ -80,5 +80,3 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cadabra-server DESTINATION bin) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cadabra2html DESTINATION bin) install(TARGETS cadabra_client LIBRARY DESTINATION "${INSTALL_LIB_DIR}") install(TARGETS cadabra_server LIBRARY DESTINATION "${INSTALL_LIB_DIR}") - - diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 00b522a7ee..4414feb198 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -30,10 +30,9 @@ endif() set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) -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) +if(NOT Boost_PYTHON3_FOUND) + find_package(Boost 1.54.0 COMPONENTS python-py34 REQUIRED) endif() if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") @@ -61,7 +60,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) add_definitions("-Wall -g -Wno-unused-but-set-variable") endif() -set(LOCAL_SRC_FILES +set(LOCAL_SRC_FILES PythonCdb.cc Algorithm.cc Cleanup.cc @@ -209,13 +208,10 @@ set_target_properties(cadabra2 PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" target_link_libraries(cadabra2 ${PCRE_LIBRARIES} ${GMPXX_LIB} ${GMP_LIB} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ) -install(DIRECTORY DESTINATION bin DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE +install(DIRECTORY DESTINATION bin DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY DESTINATION ${PYTHON_SITE_PATH} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE +install(DIRECTORY DESTINATION ${PYTHON_SITE_PATH} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - -