Skip to content

Fix naming of Boost Python3 on non-Ubuntu #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 22, 2016
Merged

Fix naming of Boost Python3 on non-Ubuntu #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0481bb8
Merge pull request #3 from kpeeters/master
yitzchak Apr 20, 2016
834eacf
Fixed install of cadabra2 script
yitzchak Apr 20, 2016
6b3023f
Merge pull request #4 from kpeeters/master
yitzchak May 22, 2016
2f5f858
Fix naming of Boost Python3 on non-Ubuntu
yitzchak May 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions client_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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})

Expand All @@ -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}")


20 changes: 8 additions & 12 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)