Merge pull request #39 from massanoori/fix-linker-error-RelWithDebInfo-MinSizeRel

janbender · web-flow · commit bc5ccb9615bd · 2017-07-03T15:49:10.000+02:00
Fix linker errors for RelWithDebInfo and MinSizeRel
diff --git a/Demos/BarDemo/CMakeLists.txt b/Demos/BarDemo/CMakeLists.txt
@@ -24,7 +24,7 @@ add_executable(BarDemo
 	  CMakeLists.txt
 )
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
diff --git a/Demos/ClothDemo/CMakeLists.txt b/Demos/ClothDemo/CMakeLists.txt
@@ -24,7 +24,7 @@ add_executable(ClothDemo
 	  CMakeLists.txt
 )
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
diff --git a/Demos/CosseratRodsDemo/CMakeLists.txt b/Demos/CosseratRodsDemo/CMakeLists.txt
@@ -24,7 +24,7 @@ add_executable(CosseratRodsDemo
 	  CMakeLists.txt
 )
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
diff --git a/Demos/CouplingDemos/CMakeLists.txt b/Demos/CouplingDemos/CMakeLists.txt
@@ -32,7 +32,7 @@ add_dependencies(RigidBodyClothCouplingDemo ${SIMULATION_DEPENDENCIES})
 target_link_libraries(RigidBodyClothCouplingDemo ${SIMULATION_LINK_LIBRARIES})
 
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
 include_directories(${PROJECT_PATH}/extern/freeglut/include)
diff --git a/Demos/DistanceFieldDemos/CMakeLists.txt b/Demos/DistanceFieldDemos/CMakeLists.txt
@@ -66,7 +66,7 @@ add_dependencies(RigidBodyCollisionDemo ${SIMULATION_DEPENDENCIES})
 target_link_libraries(RigidBodyCollisionDemo ${SIMULATION_LINK_LIBRARIES})
 
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
 include_directories(${PROJECT_PATH}/extern/freeglut/include)
diff --git a/Demos/FluidDemo/CMakeLists.txt b/Demos/FluidDemo/CMakeLists.txt
@@ -29,7 +29,7 @@ add_executable(FluidDemo
 	  CMakeLists.txt
 )
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
diff --git a/Demos/GenericConstraintsDemos/CMakeLists.txt b/Demos/GenericConstraintsDemos/CMakeLists.txt
@@ -29,7 +29,7 @@ add_executable(GenericParticleConstraintsDemo
 	  CMakeLists.txt
 )
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
diff --git a/Demos/PositionBasedElasticRodsDemo/CMakeLists.txt b/Demos/PositionBasedElasticRodsDemo/CMakeLists.txt
@@ -30,7 +30,7 @@ add_executable(ElasticRodDemo
 	  CMakeLists.txt
 )
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
diff --git a/Demos/RigidBodyDemos/CMakeLists.txt b/Demos/RigidBodyDemos/CMakeLists.txt
@@ -47,7 +47,7 @@ set_target_properties(JointDemo PROPERTIES MINSIZEREL_POSTFIX ${CMAKE_MINSIZEREL
 add_dependencies(JointDemo ${SIMULATION_DEPENDENCIES})
 target_link_libraries(JointDemo ${SIMULATION_LINK_LIBRARIES})
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
 include_directories(${PROJECT_PATH}/extern/freeglut/include)
diff --git a/Demos/SceneLoaderDemo/CMakeLists.txt b/Demos/SceneLoaderDemo/CMakeLists.txt
@@ -32,7 +32,7 @@ add_dependencies(SceneLoaderDemo ${SIMULATION_DEPENDENCIES})
 target_link_libraries(SceneLoaderDemo ${SIMULATION_LINK_LIBRARIES})
 
 
-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)
+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)
 find_package( Eigen3 REQUIRED )
 include_directories( ${EIGEN3_INCLUDE_DIR} )
 include_directories(${PROJECT_PATH}/extern/freeglut/include)

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ add_executable(BarDemo`
`24`	`24`	`CMakeLists.txt`
`25`	`25`	`)`
`26`	`26`
`27`		`-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)`
	`27`	`+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)`
`28`	`28`
`29`	`29`	`find_package( Eigen3 REQUIRED )`
`30`	`30`	`include_directories( ${EIGEN3_INCLUDE_DIR} )`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ add_executable(ClothDemo`
`24`	`24`	`CMakeLists.txt`
`25`	`25`	`)`
`26`	`26`
`27`		`-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)`
	`27`	`+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)`
`28`	`28`
`29`	`29`	`find_package( Eigen3 REQUIRED )`
`30`	`30`	`include_directories( ${EIGEN3_INCLUDE_DIR} )`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ add_executable(CosseratRodsDemo`
`24`	`24`	`CMakeLists.txt`
`25`	`25`	`)`
`26`	`26`
`27`		`-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)`
	`27`	`+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)`
`28`	`28`
`29`	`29`	`find_package( Eigen3 REQUIRED )`
`30`	`30`	`include_directories( ${EIGEN3_INCLUDE_DIR} )`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ add_executable(FluidDemo`
`29`	`29`	`CMakeLists.txt`
`30`	`30`	`)`
`31`	`31`
`32`		`-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)`
	`32`	`+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)`
`33`	`33`
`34`	`34`	`find_package( Eigen3 REQUIRED )`
`35`	`35`	`include_directories( ${EIGEN3_INCLUDE_DIR} )`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ add_executable(GenericParticleConstraintsDemo`
`29`	`29`	`CMakeLists.txt`
`30`	`30`	`)`
`31`	`31`
`32`		`-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)`
	`32`	`+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)`
`33`	`33`
`34`	`34`	`find_package( Eigen3 REQUIRED )`
`35`	`35`	`include_directories( ${EIGEN3_INCLUDE_DIR} )`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ add_executable(ElasticRodDemo`
`30`	`30`	`CMakeLists.txt`
`31`	`31`	`)`
`32`	`32`
`33`		`-add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC)`
	`33`	`+add_definitions(-DTW_NO_LIB_PRAGMA -DTW_STATIC -DFREEGLUT_LIB_PRAGMAS=0)`
`34`	`34`
`35`	`35`	`find_package( Eigen3 REQUIRED )`
`36`	`36`	`include_directories( ${EIGEN3_INCLUDE_DIR} )`