Commit 6b8ae0e0 authored by Jason Rhinelander's avatar Jason Rhinelander

Put so's into build/eris so that eris can be imported from build dir

Also symlink tests/eris and scratch/eris to build/eris for the same
reason.
parent 8243ff92
...@@ -73,6 +73,7 @@ function(add_pyeris_module name) ...@@ -73,6 +73,7 @@ function(add_pyeris_module name)
file(GLOB src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} pyeris/${name}.cpp pyeris/${name}/*.cpp) file(GLOB src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} pyeris/${name}.cpp pyeris/${name}/*.cpp)
pybind11_add_module(${name} ${src}) pybind11_add_module(${name} ${src})
target_link_libraries(${name} ${ERIS_LIBRARIES}) target_link_libraries(${name} ${ERIS_LIBRARIES})
set_target_properties(${name} PROPERTIES OUTPUT_NAME eris/${name})
list(APPEND pyeris_modules ${name}) list(APPEND pyeris_modules ${name})
set(pyeris_modules "${pyeris_modules}" PARENT_SCOPE) set(pyeris_modules "${pyeris_modules}" PARENT_SCOPE)
endfunction() endfunction()
...@@ -115,20 +116,3 @@ add_custom_target(python-build ALL DEPENDS ${BUILD_TIMESTAMP}) ...@@ -115,20 +116,3 @@ add_custom_target(python-build ALL DEPENDS ${BUILD_TIMESTAMP})
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)") install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)")
# Make libpyeris.pc for the 'make install' target
#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpyeris.pc.in
# ${CMAKE_CURRENT_BINARY_DIR}/libpyeris.pc
# @ONLY)
#
#install(TARGETS eris
# DESTINATION "${CMAKE_INSTALL_LIBDIR}")
#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liberis.pc
# DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
#install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/eris/"
# DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/eris/"
# FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h")
#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/eris/"
# DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/eris/"
# FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h")
#
#install(FILES README.md LICENSE DESTINATION "${CMAKE_INSTALL_DOCDIR}")
../build/eris
\ No newline at end of file
../build/eris
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment