Revert "Deassociate feature_icp_align from CSM"

This reverts commit d19cb649.

CMakeLists.txt

@@ -163,7 +163,6 @@ SET(HDRS_FACTOR
 SET(HDRS_FEATURE
   include/laser/feature/feature_polyline_2d.h
   include/laser/feature/feature_match_polyline_2d.h
-    include/laser/feature/feature_icp_align.h
   )
 SET(HDRS_LANDMARK
   include/laser/landmark/landmark_polyline_2d.h
@@ -199,7 +198,6 @@ SET(SRCS_FACTOR
 SET(SRCS_FEATURE
   src/feature/feature_polyline_2d.cpp
   src/feature/feature_match_polyline_2d.cpp
-  src/feature/feature_icp_align.cpp
   )
 SET(SRCS_LANDMARK
   src/landmark/landmark_polyline_2d.cpp
@@ -225,10 +223,16 @@ if(csm_FOUND)
       include/laser/processor/processor_closeloop_icp.h
       include/laser/processor/processor_odom_icp.h
     )
+  SET(HDRS_FEATURE ${HDRS_FEATURE}
+    include/laser/feature/feature_icp_align.h
+    )
   SET(SRCS_PROCESSOR ${SRCS_PROCESSOR}
       src/processor/processor_closeloop_icp.cpp
       src/processor/processor_odom_icp.cpp
     )
+  SET(SRCS_FEATURE ${SRCS_FEATURE}
+    src/feature/feature_icp_align.cpp
+    )
   SET(SRCS_YAML ${SRCS_YAML}
     src/yaml/processor_odom_icp_yaml.cpp
     )