Resolving small conflict in comments

nasa · Dec 4, 2014 · 26bb9cd · 26bb9cd
1 parent 1ea8b8a
commit 26bb9cd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/PLASMA/System/CMakeLists.txt b/src/PLASMA/System/CMakeLists.txt
@@ -112,6 +112,8 @@ swig_add_module(${PSEngine_target} java base/PSEngine.i)
 #add_custom_command(TARGET ${PSEngine_target} PRE_LINK
 #  COMMAND mkdir base)
 
+#add_dependencies(${PSEngine_target} base)
+
 foreach(dep ${internal_dependencies})
   add_common_module_include_dep(${PSEngine_target} ${dep})
   target_link_libraries(${PSEngine_target} "${dep}${EUROPA_SUFFIX}")