Skip to content

Commit

Permalink
Merge pull request #118 from SofaDefrost/hugtalbot-patch-2
Browse files Browse the repository at this point in the history
Remove references to python (2)
  • Loading branch information
adagolodjo authored Jul 25, 2024
2 parents 9dd53c3 + b875dc4 commit f11e8e8
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ sofa_find_package(Sofa.GL REQUIRED)
sofa_find_package(Sofa.Component.Topology.Container.Dynamic REQUIRED)

sofa_find_package(STLIB QUIET)

if(STLIB_FOUND)
message("-- Found dependency : 'STLIB' plugin .")
else()
Expand Down Expand Up @@ -67,6 +68,7 @@ set(SOURCE_FILES
${SRC_ROOT_DIR}/constraint/CosseratNeedleSlidingConstraint.cpp
)


sofa_find_package(SoftRobots QUIET)
if(SoftRobots_FOUND)
list(APPEND HEADER_FILES
Expand All @@ -83,12 +85,15 @@ if(SoftRobots_FOUND)
)
endif()


file(GLOB_RECURSE RESOURCE_FILES "*.md" "*.psl" "*.py" "*.pyscn" "*.py3scn" "*.scn" "*.ah")


if(WIN32)
add_definitions(-D_WINSOCKAPI_)
endif()


add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES} ${DOC_FILES} )
target_link_libraries(${PROJECT_NAME}
Sofa.Component.Constraint.Lagrangian.Model
Expand All @@ -98,6 +103,7 @@ target_link_libraries(${PROJECT_NAME}
Sofa.Component.Topology.Container.Dynamic
)


if(Sofa.GL_FOUND)
target_link_libraries(${PROJECT_NAME} Sofa.GL)
endif()
Expand All @@ -107,7 +113,6 @@ if(SoftRobots_FOUND)
message("-- Found dependency: 'SoftRobots' plugin.")
endif()

sofa_install_pythonscripts(PLUGIN_NAME ${PROJECT_NAME} PYTHONSCRIPTS_SOURCE_DIR "python")

find_file(SofaPython3Tools NAMES "SofaPython3/lib/cmake/SofaPython3/SofaPython3Tools.cmake")
if(SofaPython3Tools)
Expand All @@ -130,7 +135,6 @@ if(SofaPython3Tools OR SofaPython3_FOUND)
endif()



## Install rules for the library and headers; CMake package configurations files
sofa_create_package_with_targets(
PACKAGE_NAME ${PROJECT_NAME}
Expand All @@ -150,6 +154,7 @@ if(COSSERAT_BUILD_TESTS)
add_subdirectory(Tests)
endif()


# Config files and install rules for pythons scripts
sofa_install_pythonscripts(PLUGIN_NAME ${PROJECT_NAME} PYTHONSCRIPTS_SOURCE_DIR "examples/python3/")

Expand Down

0 comments on commit f11e8e8

Please sign in to comment.