merge conflicts resolved

optimizer/Expression/CMakeLists.txt

@@ -11,3 +11,11 @@ SET (_EXPR_SRCS
 )
 
 add_sources(${_EXPR_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:

optimizer/Tests/CMakeLists.txt

@@ -132,4 +132,12 @@ if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/resources)
         COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/resources ${CMAKE_CURRENT_BINARY_DIR}
         OUTPUT_VARIABLE LN_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
         )
-endif()
+endif()
\ No newline at end of file
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:

optimizer/Util/CMakeLists.txt

@@ -18,4 +18,12 @@ SET (_UTIL_SRCS
     SDDSParser/version.cpp
 )
 
-add_sources(${_UTIL_SRCS})
+add_sources(${_UTIL_SRCS})
\ No newline at end of file
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:

optimizer/extlib/CMakeLists.txt

-add_subdirectory( wfgHypervolume )
+add_subdirectory (wfgHypervolume)
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:

optimizer/extlib/wfgHypervolume/CMakeLists.txt

-add_library(wfgHypervolume hypervolume.cpp avl.cpp read.cpp)
+add_library(wfgHypervolume hypervolume.cpp avl.cpp read.cpp)
\ No newline at end of file
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End: