Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Oct 14, 2023
2 parents ef163c5 + 61a2f46 commit e697632
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions mrv2/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,13 @@ endif()

if ( APPLE )

# Install the main python executable and the pip script
install( FILES
${CMAKE_INSTALL_PREFIX}/bin/python${MRV2_PYTHON_VERSION}
DESTINATION bin/
COMPONENT applications )
if(MRV2_PYBIND11)
# Install the main python executable
install( FILES
${CMAKE_INSTALL_PREFIX}/bin/python${MRV2_PYTHON_VERSION}
DESTINATION bin/
COMPONENT applications )
endif()

# Install all.dylibs in CMAKE_INSTALL_PREFIX / lib
file( GLOB MRV_DYLIBS ${CMAKE_INSTALL_PREFIX}/lib/*.dylib* )
Expand All @@ -112,12 +114,14 @@ if ( APPLE )
COMPONENT applications )
elseif ( UNIX )

# Install the main python executable and the pip script
install( FILES
${CMAKE_INSTALL_PREFIX}/bin/python${MRV2_PYTHON_VERSION}
DESTINATION bin/
COMPONENT applications )

if(MRV2_PYBIND11)
# Install the main python executable
install( FILES
${CMAKE_INSTALL_PREFIX}/bin/python${MRV2_PYTHON_VERSION}
DESTINATION bin/
COMPONENT applications )
endif()

# Install all .so in CMAKE_INSTALL_PREFIX/lib
file( GLOB MRV_LIB_DSOS ${CMAKE_INSTALL_PREFIX}/lib/*.so* )
install( FILES ${MRV_LIB_DSOS}
Expand Down

0 comments on commit e697632

Please sign in to comment.