diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1d92f6e9c228db339f271c44a3488ddb0d27df5..bcffe25952bf0b64dcf717092c0cb41afd93cbac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-	ADD_DEFINITIONS(-DDEBUG=2)
+  ADD_DEFINITIONS(-DDEBUG=2)
 ENDIF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
 
 # provide path to libraries
@@ -34,31 +34,31 @@ ADD_DEFINITIONS(${SOT_CORE_CFLAGS})
 ADD_DEFINITIONS(${JRL_MAL_CFLAGS})
 
 foreach(dlink 	${DYNAMICSJRLJAPAN_LDFLAGS}
-				${HRP2DYNAMICS_LDFLAGS}
-				${DYNAMIC_GRAPH_LDFLAGS}
-				${SOT_CORE_LDFLAGS}
-				${JRL_MAL_LDFLAGS}
-		)
-	SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS}  ${dlink}")
+    ${HRP2DYNAMICS_LDFLAGS}
+    ${DYNAMIC_GRAPH_LDFLAGS}
+    ${SOT_CORE_LDFLAGS}
+    ${JRL_MAL_LDFLAGS}
+    )
+  SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS}  ${dlink}")
 endforeach(dlink)
 
 SET(libs
-	zmpreffromcom
-	force-compensation
-	integrator-force-exact
-	mass-apparent
-	integrator-force-rk4
-	integrator-force
-	angle-estimator
-	waist-attitude-from-sensor
-)
+  zmpreffromcom
+  force-compensation
+  integrator-force-exact
+  mass-apparent
+  integrator-force-rk4
+  integrator-force
+  angle-estimator
+  waist-attitude-from-sensor
+  )
 
 IF(${DYNAMICSJRLJAPAN_FOUND})
   LIST(APPEND libs dynamic)
-	IF(${HRP2DYNAMICS_FOUND})
-	  LIST(APPEND libs dynamic-hrp2)
-	  SET (dynamic-hrp2_plugins_dependencies dynamic)
-	ENDIF(${HRP2DYNAMICS_FOUND})
+  IF(${HRP2DYNAMICS_FOUND})
+    LIST(APPEND libs dynamic-hrp2)
+    SET (dynamic-hrp2_plugins_dependencies dynamic)
+  ENDIF(${HRP2DYNAMICS_FOUND})
 ENDIF(${DYNAMICSJRLJAPAN_FOUND})
 
 IF(${_hrp210optimized_FOUND})
@@ -66,58 +66,59 @@ IF(${_hrp210optimized_FOUND})
   SET (dynamic-hrp2_10_additional_libs ${_hrp210optimized_LIBRARIES})
   SET (dynamic-hrp2_10_plugins_dependencies dynamic)
   SET(dynamic-hrp2_10_plugins_compile_flags
-       ${_dynamicsJRLJapan_CFLAGS} ${_hrp210optimized_CFLAGS})
+    ${_dynamicsJRLJapan_CFLAGS} ${_hrp210optimized_CFLAGS})
 
   LIST(APPEND libs dynamic-hrp2_10_old)
   SET (dynamic-hrp2_10_old_additional_libs ${_hrp210optimized_LIBRARIES})
   SET (dynamic-hrp2_10_old_plugins_dependencies dynamic)
   SET(dynamic-hrp2_10_old_plugins_compile_flags
-       ${_dynamicsJRLJapan_CFLAGS} ${_hrp210optimized_CFLAGS})
+    ${_dynamicsJRLJapan_CFLAGS} ${_hrp210optimized_CFLAGS})
 
 ENDIF(${_hrp210optimized_FOUND})
 
 IF(NOT UNIX)
-	SET(dynamic-hrp2_10_plugins_link_flags ${_dynamicsJRLJapan_LDFLAGS} ${_hrp210optimized_LDFLAGS})
-	SET(dynamic-hrp2_10_old_plugins_link_flags ${_dynamicsJRLJapan_LDFLAGS} ${_hrp210optimized_LDFLAGS})
+  SET(dynamic-hrp2_10_plugins_link_flags ${_dynamicsJRLJapan_LDFLAGS} ${_hrp210optimized_LDFLAGS})
+  SET(dynamic-hrp2_10_old_plugins_link_flags ${_dynamicsJRLJapan_LDFLAGS} ${_hrp210optimized_LDFLAGS})
 ENDIF(NOT UNIX)
 
 SET(integrator-force-rk4_plugins_dependencies integrator-force)
 SET(integrator-force-exact_plugins_dependencies integrator-force)
 
 FOREACH(lib ${libs})
-	ADD_LIBRARY(${lib}
-	  SHARED
-	  ${lib}.cpp)
-
-	SET_TARGET_PROPERTIES(${lib}
-	  PROPERTIES
-	  SOVERSION ${PROJECT_VERSION}
-	  PREFIX ""
-	  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/plugin)
-
-	IF (UNIX)
-		TARGET_LINK_LIBRARIES(${lib} ${DYNAMIC_GRAPH_LIBRARIES})
-		TARGET_LINK_LIBRARIES(${lib} ${SOT_CORE_LIBRARIES})
-		TARGET_LINK_LIBRARIES(${lib} ${JRL_MAL_LIBRARIES})
-		TARGET_LINK_LIBRARIES(${lib} ${HRP2DYNAMICS_LIBRARIES})
-		TARGET_LINK_LIBRARIES(${lib} ${DYNAMICSJRLJAPAN_LIBRARIES})
-		TARGET_LINK_LIBRARIES(${lib} "${${lib}_additional_libs}")
-	ENDIF(UNIX)
-
-	IF(WIN32)
-		SET(${lib}_plugins_link_flags "${${PROJECT_NAME}_src_LDFLAGS} ${${lib}_plugins_link_flags}")
-	ENDIF(WIN32)
-
-	SET_TARGET_PROPERTIES(${lib}
-		PROPERTIES
-		COMPILE_FLAGS "${${lib}_plugins_compile_flags}"
-		LINK_FLAGS "${${lib}_plugins_link_flags}")
-
-	IF(${lib}_plugins_dependencies)
-		ADD_DEPENDENCIES(${lib} "${${lib}_plugins_dependencies}")
-		TARGET_LINK_LIBRARIES(${lib} "${${lib}_plugins_dependencies}")
-	ENDIF(${lib}_plugins_dependencies)
-
-	INSTALL(TARGETS ${lib}
-  	DESTINATION lib/plugin)
+  ADD_LIBRARY(${lib}
+    SHARED
+    ${lib}.cpp)
+
+  SET_TARGET_PROPERTIES(${lib}
+    PROPERTIES
+    SOVERSION ${PROJECT_VERSION}
+    PREFIX ""
+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/plugin)
+
+  IF (UNIX)
+    TARGET_LINK_LIBRARIES(${lib} ${DYNAMIC_GRAPH_LIBRARIES})
+    #MESSAGE(FATAL_ERROR X ${DYNAMIC_GRAPH_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${lib} ${SOT_CORE_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${lib} ${JRL_MAL_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${lib} ${HRP2DYNAMICS_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${lib} ${DYNAMICSJRLJAPAN_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${lib} "${${lib}_additional_libs}")
+  ENDIF(UNIX)
+
+  IF(WIN32)
+    SET(${lib}_plugins_link_flags "${${PROJECT_NAME}_src_LDFLAGS} ${${lib}_plugins_link_flags}")
+  ENDIF(WIN32)
+
+  SET_TARGET_PROPERTIES(${lib}
+    PROPERTIES
+    COMPILE_FLAGS "${${lib}_plugins_compile_flags}"
+    LINK_FLAGS "${${lib}_plugins_link_flags}")
+
+  IF(${lib}_plugins_dependencies)
+    ADD_DEPENDENCIES(${lib} "${${lib}_plugins_dependencies}")
+    TARGET_LINK_LIBRARIES(${lib} "${${lib}_plugins_dependencies}")
+  ENDIF(${lib}_plugins_dependencies)
+
+  INSTALL(TARGETS ${lib}
+    DESTINATION lib/plugin)
 ENDFOREACH(lib)