Skip to content

Commit aac1806

Browse files
janbenderjanbender
committed
- added documentation files
- moved build directory for lib files - fixed encoding of some source files - updated numpy version
1 parent ce22082 commit aac1806

File tree

32 files changed

+653
-83
lines changed

32 files changed

+653
-83
lines changed

‎CMake/Common.cmake‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
1+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin" CACHE INTERNAL "Where to place executables and dlls")
22
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_SOURCE_DIR}/bin")
3-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/bin")
3+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/bin" CACHE INTERNAL "Where to place executables and dlls in release mode")
44
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_SOURCE_DIR}/bin")
55
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_SOURCE_DIR}/bin")
6-
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/lib)
6+
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
77
set(CMAKE_DEBUG_POSTFIX "_d")
8-
set(CMAKE_RELWITHDEBINFO_POSTFIX "")
9-
set(CMAKE_MINSIZEREL_POSTFIX "")
10-
11-
set(PBD_BINARY_DEBUG_POSTFIX "_d" CACHE INTERNAL "Postfix for executables")
12-
set(PBD_BINARY_RELWITHDEBINFO_POSTFIX "_rd" CACHE INTERNAL "Postfix for executables")
13-
set(PBD_BINARY_MINSIZEREL_POSTFIX "_ms" CACHE INTERNAL "Postfix for executables")
8+
set(CMAKE_RELWITHDEBINFO_POSTFIX "_rd")
9+
set(CMAKE_MINSIZEREL_POSTFIX "_ms")
1410

1511
include(CMakeDependentOption)
1612

‎Changelog.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2.2.2
2+
- added documentation files
3+
- moved build directory for lib files
4+
- fixed encoding of some source files
5+
- updated numpy version
6+
17
2.1.1
28
- fixed Python interface for function addFace
39

‎Demos/BarDemo/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ find_package( Eigen3 REQUIRED )
4343
include_directories( ${EIGEN3_INCLUDE_DIR} )
4444

4545
set_target_properties(BarDemo PROPERTIES FOLDER "Demos")
46-
set_target_properties(BarDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
47-
set_target_properties(BarDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
48-
set_target_properties(BarDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
46+
set_target_properties(BarDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
47+
set_target_properties(BarDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
48+
set_target_properties(BarDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
4949
add_dependencies(BarDemo ${SIMULATION_DEPENDENCIES})
5050
target_link_libraries(BarDemo ${SIMULATION_LINK_LIBRARIES})
5151
VIS_SOURCE_GROUPS()

‎Demos/ClothDemo/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ include_directories(${PROJECT_PATH}/extern/freeglut/include)
4646
include_directories(${PROJECT_PATH}/extern/glew/include)
4747

4848
set_target_properties(ClothDemo PROPERTIES FOLDER "Demos")
49-
set_target_properties(ClothDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
50-
set_target_properties(ClothDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
51-
set_target_properties(ClothDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
49+
set_target_properties(ClothDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
50+
set_target_properties(ClothDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
51+
set_target_properties(ClothDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
5252
add_dependencies(ClothDemo ${SIMULATION_DEPENDENCIES})
5353
target_link_libraries(ClothDemo ${SIMULATION_LINK_LIBRARIES})
5454
VIS_SOURCE_GROUPS()

‎Demos/CosseratRodsDemo/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ include_directories(${PROJECT_PATH}/extern/freeglut/include)
4545
include_directories(${PROJECT_PATH}/extern/glew/include)
4646

4747
set_target_properties(CosseratRodsDemo PROPERTIES FOLDER "Demos")
48-
set_target_properties(CosseratRodsDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
49-
set_target_properties(CosseratRodsDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
50-
set_target_properties(CosseratRodsDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
48+
set_target_properties(CosseratRodsDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
49+
set_target_properties(CosseratRodsDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
50+
set_target_properties(CosseratRodsDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
5151
add_dependencies(CosseratRodsDemo ${SIMULATION_DEPENDENCIES})
5252
target_link_libraries(CosseratRodsDemo ${SIMULATION_LINK_LIBRARIES})
5353
VIS_SOURCE_GROUPS()

‎Demos/CouplingDemos/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ add_executable(RigidBodyClothCouplingDemo
3838
)
3939

4040
set_target_properties(RigidBodyClothCouplingDemo PROPERTIES FOLDER "Demos")
41-
set_target_properties(RigidBodyClothCouplingDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
42-
set_target_properties(RigidBodyClothCouplingDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
43-
set_target_properties(RigidBodyClothCouplingDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
41+
set_target_properties(RigidBodyClothCouplingDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
42+
set_target_properties(RigidBodyClothCouplingDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
43+
set_target_properties(RigidBodyClothCouplingDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
4444
add_dependencies(RigidBodyClothCouplingDemo ${SIMULATION_DEPENDENCIES})
4545
target_link_libraries(RigidBodyClothCouplingDemo ${SIMULATION_LINK_LIBRARIES})
4646

‎Demos/DistanceFieldDemos/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ add_executable(ClothCollisionDemo
3939
)
4040

4141
set_target_properties(ClothCollisionDemo PROPERTIES FOLDER "Demos")
42-
set_target_properties(ClothCollisionDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
43-
set_target_properties(ClothCollisionDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
44-
set_target_properties(ClothCollisionDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
42+
set_target_properties(ClothCollisionDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
43+
set_target_properties(ClothCollisionDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
44+
set_target_properties(ClothCollisionDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
4545
add_dependencies(ClothCollisionDemo ${SIMULATION_DEPENDENCIES})
4646
target_link_libraries(ClothCollisionDemo ${SIMULATION_LINK_LIBRARIES})
4747

@@ -61,9 +61,9 @@ add_executable(DeformableCollisionDemo
6161
)
6262

6363
set_target_properties(DeformableCollisionDemo PROPERTIES FOLDER "Demos")
64-
set_target_properties(DeformableCollisionDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
65-
set_target_properties(DeformableCollisionDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
66-
set_target_properties(DeformableCollisionDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
64+
set_target_properties(DeformableCollisionDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
65+
set_target_properties(DeformableCollisionDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
66+
set_target_properties(DeformableCollisionDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
6767
add_dependencies(DeformableCollisionDemo ${SIMULATION_DEPENDENCIES})
6868
target_link_libraries(DeformableCollisionDemo ${SIMULATION_LINK_LIBRARIES})
6969

@@ -83,9 +83,9 @@ add_executable(RigidBodyCollisionDemo
8383
)
8484

8585
set_target_properties(RigidBodyCollisionDemo PROPERTIES FOLDER "Demos")
86-
set_target_properties(RigidBodyCollisionDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
87-
set_target_properties(RigidBodyCollisionDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
88-
set_target_properties(RigidBodyCollisionDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
86+
set_target_properties(RigidBodyCollisionDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
87+
set_target_properties(RigidBodyCollisionDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
88+
set_target_properties(RigidBodyCollisionDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
8989
add_dependencies(RigidBodyCollisionDemo ${SIMULATION_DEPENDENCIES})
9090
target_link_libraries(RigidBodyCollisionDemo ${SIMULATION_LINK_LIBRARIES})
9191

‎Demos/FluidDemo/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ include_directories(${PROJECT_PATH}/extern/freeglut/include)
3737
include_directories(${PROJECT_PATH}/extern/glew/include)
3838

3939
set_target_properties(FluidDemo PROPERTIES FOLDER "Demos")
40-
set_target_properties(FluidDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
41-
set_target_properties(FluidDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
42-
set_target_properties(FluidDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
40+
set_target_properties(FluidDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
41+
set_target_properties(FluidDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
42+
set_target_properties(FluidDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
4343
add_dependencies(FluidDemo ${SIMULATION_DEPENDENCIES})
4444
target_link_libraries(FluidDemo ${SIMULATION_LINK_LIBRARIES})
4545
VIS_SOURCE_GROUPS()

‎Demos/GenericConstraintsDemos/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ include_directories(${PROJECT_PATH}/extern/freeglut/include)
6969
include_directories(${PROJECT_PATH}/extern/glew/include)
7070

7171
set_target_properties(GenericParticleConstraintsDemo PROPERTIES FOLDER "Demos")
72-
set_target_properties(GenericParticleConstraintsDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
73-
set_target_properties(GenericParticleConstraintsDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
74-
set_target_properties(GenericParticleConstraintsDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
72+
set_target_properties(GenericParticleConstraintsDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
73+
set_target_properties(GenericParticleConstraintsDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
74+
set_target_properties(GenericParticleConstraintsDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
7575
add_dependencies(GenericParticleConstraintsDemo ${SIMULATION_DEPENDENCIES})
7676
target_link_libraries(GenericParticleConstraintsDemo ${SIMULATION_LINK_LIBRARIES})
7777

7878
set_target_properties(GenericRigidBodyConstraintsDemo PROPERTIES FOLDER "Demos")
79-
set_target_properties(GenericRigidBodyConstraintsDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
80-
set_target_properties(GenericRigidBodyConstraintsDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
81-
set_target_properties(GenericRigidBodyConstraintsDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
79+
set_target_properties(GenericRigidBodyConstraintsDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
80+
set_target_properties(GenericRigidBodyConstraintsDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
81+
set_target_properties(GenericRigidBodyConstraintsDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
8282
add_dependencies(GenericRigidBodyConstraintsDemo ${SIMULATION_DEPENDENCIES})
8383
target_link_libraries(GenericRigidBodyConstraintsDemo ${SIMULATION_LINK_LIBRARIES})
8484

‎Demos/PositionBasedElasticRodsDemo/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ include_directories(${PROJECT_PATH}/extern/freeglut/include)
5151
include_directories(${PROJECT_PATH}/extern/glew/include)
5252

5353
set_target_properties(ElasticRodDemo PROPERTIES FOLDER "Demos")
54-
set_target_properties(ElasticRodDemo PROPERTIES DEBUG_POSTFIX ${PBD_BINARY_DEBUG_POSTFIX})
55-
set_target_properties(ElasticRodDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${PBD_BINARY_RELWITHDEBINFO_POSTFIX})
56-
set_target_properties(ElasticRodDemo PROPERTIES MINSIZEREL_POSTFIX ${PBD_BINARY_MINSIZEREL_POSTFIX})
54+
set_target_properties(ElasticRodDemo PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
55+
set_target_properties(ElasticRodDemo PROPERTIES RELWITHDEBINFO_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
56+
set_target_properties(ElasticRodDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
5757
add_dependencies(ElasticRodDemo ${SIMULATION_DEPENDENCIES})
5858
target_link_libraries(ElasticRodDemo ${SIMULATION_LINK_LIBRARIES})
5959

0 commit comments

Comments
 (0)