fixed paths

Sapfor/CMakeLists.txt

@@ -13,24 +13,24 @@ add_definitions("-D YYDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(fdvm_include _projects/dvm/fdvm/trunk/include)
-set(fdvm_sources _projects//dvm/fdvm/trunk/fdvm/)
-set(sage_include_1 _projects/dvm/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 _projects/dvm/fdvm/trunk/Sage/h/)
-set(libdb_sources _projects/dvm/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources _projects/dvm/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources _projects/dvm/fdvm/trunk/Sage/Sage++)
-set(parser_sources _projects/dvm/fdvm/trunk/parser)
-set(pppa_sources _projects/dvm/tools/pppa/trunk/src)
-set(zlib_sources _projects/dvm/tools/Zlib)
+set(fdvm_include projects/dvm/fdvm/trunk/include)
+set(fdvm_sources projects//dvm/fdvm/trunk/fdvm/)
+set(sage_include_1 projects/dvm/fdvm/trunk/Sage/lib/include)
+set(sage_include_2 projects/dvm/fdvm/trunk/Sage/h/)
+set(libdb_sources projects/dvm/fdvm/trunk/Sage/lib/oldsrc)
+set(sage_sources projects/dvm/fdvm/trunk/Sage/lib/newsrc)
+set(sagepp_sources projects/dvm/fdvm/trunk/Sage/Sage++)
+set(parser_sources projects/dvm/fdvm/trunk/parser)
+set(pppa_sources projects/dvm/tools/pppa/trunk/src)
+set(zlib_sources projects/dvm/tools/Zlib)
 
 # Read pathes to external sapfor directories
-#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/_projects/paths.txt")
+#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/projects/paths.txt")
 #    message("Found paths.txt, using custom paths.")
-#    FILE(STRINGS ./_projects/paths.txt SAPFOR_PATHS)
+#    FILE(STRINGS ./projects/paths.txt SAPFOR_PATHS)
 #else ()
 #    message("Not found paths.txt, using default paths.")
-#    FILE(STRINGS ./_projects/paths.default.txt SAPFOR_PATHS)
+#    FILE(STRINGS ./projects/paths.default.txt SAPFOR_PATHS)
 #endif ()
   
 foreach (NameAndValue ${SAPFOR_PATHS})
@@ -45,7 +45,7 @@ foreach (NameAndValue ${SAPFOR_PATHS})
     message("Using ${Name} ${${Name}}")
 endforeach ()
 
-include_directories(_src)
+include_directories(src)
 #Sage lib includes
 include_directories(${fdvm_include})
 include_directories(${sage_include_1})
@@ -55,81 +55,81 @@ include_directories(${zlib_sources}/include)
 #PPPA includes
 include_directories(${pppa_sources})
 
-set(PR_PARAM _src/ProjectParameters/projectParameters.cpp
-             _src/ProjectParameters/projectParameters.h)
+set(PR_PARAM src/ProjectParameters/projectParameters.cpp
+             src/ProjectParameters/projectParameters.h)
 
-set(GR_LAYOUT _src/VisualizerCalls/graphLayout/algebra.cpp
-        _src/VisualizerCalls/graphLayout/algebra.hpp
-        _src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
-        _src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
-        _src/VisualizerCalls/graphLayout/kamada_kawai.cpp
-        _src/VisualizerCalls/graphLayout/kamada_kawai.hpp
-        _src/VisualizerCalls/graphLayout/layout.cpp
-        _src/VisualizerCalls/graphLayout/layout.hpp
-        _src/VisualizerCalls/graphLayout/nodesoup.cpp
-        _src/VisualizerCalls/graphLayout/nodesoup.hpp)
+set(GR_LAYOUT src/VisualizerCalls/graphLayout/algebra.cpp
+        src/VisualizerCalls/graphLayout/algebra.hpp
+        src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
+        src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
+        src/VisualizerCalls/graphLayout/kamada_kawai.cpp
+        src/VisualizerCalls/graphLayout/kamada_kawai.hpp
+        src/VisualizerCalls/graphLayout/layout.cpp
+        src/VisualizerCalls/graphLayout/layout.hpp
+        src/VisualizerCalls/graphLayout/nodesoup.cpp
+        src/VisualizerCalls/graphLayout/nodesoup.hpp)
     
-set(VS_CALLS _src/VisualizerCalls/get_information.cpp
-        _src/VisualizerCalls/get_information.h
-        _src/VisualizerCalls/SendMessage.cpp
-        _src/VisualizerCalls/SendMessage.h
-        _src/VisualizerCalls/BuildGraph.cpp
-        _src/VisualizerCalls/BuildGraph.h)
+set(VS_CALLS src/VisualizerCalls/get_information.cpp
+        src/VisualizerCalls/get_information.h
+        src/VisualizerCalls/SendMessage.cpp
+        src/VisualizerCalls/SendMessage.h
+        src/VisualizerCalls/BuildGraph.cpp
+        src/VisualizerCalls/BuildGraph.h)
     
-set(VERIF _src/VerificationCode/CorrectVarDecl.cpp
-        _src/VerificationCode/IncludeChecker.cpp
-        _src/VerificationCode/StructureChecker.cpp
-        _src/VerificationCode/VerifySageStructures.cpp
-        _src/VerificationCode/verifications.h)
+set(VERIF src/VerificationCode/CorrectVarDecl.cpp
+        src/VerificationCode/IncludeChecker.cpp
+        src/VerificationCode/StructureChecker.cpp
+        src/VerificationCode/VerifySageStructures.cpp
+        src/VerificationCode/verifications.h)
 
-set(UTILS _src/Utils/AstWrapper.h
-        _src/Utils/BoostStackTrace.cpp
-        _src/Utils/CommonBlock.h
-        _src/Utils/DefUseList.h
-        _src/Utils/errors.h
-        _src/Utils/leak_detector.h
-        _src/Utils/RationalNum.cpp
-        _src/Utils/RationalNum.h
-        _src/Utils/SgUtils.cpp
-        _src/Utils/SgUtils.h
-        _src/Utils/types.h
-        _src/Utils/utils.cpp
-        _src/Utils/utils.h
-        _src/Utils/version.h
-        _src/Utils/module_utils.h
-        _src/Utils/module_utils.cpp)
+set(UTILS src/Utils/AstWrapper.h
+        src/Utils/BoostStackTrace.cpp
+        src/Utils/CommonBlock.h
+        src/Utils/DefUseList.h
+        src/Utils/errors.h
+        src/Utils/leak_detector.h
+        src/Utils/RationalNum.cpp
+        src/Utils/RationalNum.h
+        src/Utils/SgUtils.cpp
+        src/Utils/SgUtils.h
+        src/Utils/types.h
+        src/Utils/utils.cpp
+        src/Utils/utils.h
+        src/Utils/version.h
+        src/Utils/module_utils.h
+        src/Utils/module_utils.cpp)
         
-set(OMEGA _src/SageAnalysisTool/OmegaForSage/add-assert.cpp
-        _src/SageAnalysisTool/OmegaForSage/affine.cpp
-        _src/SageAnalysisTool/OmegaForSage/cover.cpp
-        _src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
-        _src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
-        _src/SageAnalysisTool/OmegaForSage/ddomega.cpp
-        _src/SageAnalysisTool/OmegaForSage/debug.cpp
-        _src/SageAnalysisTool/OmegaForSage/ip.cpp
-        _src/SageAnalysisTool/OmegaForSage/kill.cpp
-        _src/SageAnalysisTool/OmegaForSage/refine.cpp
-        _src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
-        _src/SageAnalysisTool/annotationDriver.cpp
-        _src/SageAnalysisTool/arrayRef.cpp
-        _src/SageAnalysisTool/computeInducVar.cpp
-        _src/SageAnalysisTool/constanteProp.cpp
-        _src/SageAnalysisTool/constanteSet.h
-        _src/SageAnalysisTool/controlFlow.cpp
-        _src/SageAnalysisTool/defUse.cpp
-        _src/SageAnalysisTool/dependence.cpp
-        _src/SageAnalysisTool/depGraph.cpp
-        _src/SageAnalysisTool/depInterface.cpp
-        _src/SageAnalysisTool/depInterfaceExt.h
-        _src/SageAnalysisTool/flowAnalysis.cpp
-        _src/SageAnalysisTool/inducVar.h
-        _src/SageAnalysisTool/intrinsic.cpp
-        _src/SageAnalysisTool/invariant.cpp
-        _src/SageAnalysisTool/loopTransform.cpp
-        _src/SageAnalysisTool/set.cpp)
+set(OMEGA src/SageAnalysisTool/OmegaForSage/add-assert.cpp
+        src/SageAnalysisTool/OmegaForSage/affine.cpp
+        src/SageAnalysisTool/OmegaForSage/cover.cpp
+        src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
+        src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
+        src/SageAnalysisTool/OmegaForSage/ddomega.cpp
+        src/SageAnalysisTool/OmegaForSage/debug.cpp
+        src/SageAnalysisTool/OmegaForSage/ip.cpp
+        src/SageAnalysisTool/OmegaForSage/kill.cpp
+        src/SageAnalysisTool/OmegaForSage/refine.cpp
+        src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
+        src/SageAnalysisTool/annotationDriver.cpp
+        src/SageAnalysisTool/arrayRef.cpp
+        src/SageAnalysisTool/computeInducVar.cpp
+        src/SageAnalysisTool/constanteProp.cpp
+        src/SageAnalysisTool/constanteSet.h
+        src/SageAnalysisTool/controlFlow.cpp
+        src/SageAnalysisTool/defUse.cpp
+        src/SageAnalysisTool/dependence.cpp
+        src/SageAnalysisTool/depGraph.cpp
+        src/SageAnalysisTool/depInterface.cpp
+        src/SageAnalysisTool/depInterfaceExt.h
+        src/SageAnalysisTool/flowAnalysis.cpp
+        src/SageAnalysisTool/inducVar.h
+        src/SageAnalysisTool/intrinsic.cpp
+        src/SageAnalysisTool/invariant.cpp
+        src/SageAnalysisTool/loopTransform.cpp
+        src/SageAnalysisTool/set.cpp)
 
-set(PRIV _src/PrivateAnalyzer/private_analyzer.cpp
-        _src/PrivateAnalyzer/private_analyzer.h)
+set(PRIV src/PrivateAnalyzer/private_analyzer.cpp
+        src/PrivateAnalyzer/private_analyzer.h)
 
 set(FDVM ${fdvm_sources}/acc.cpp
          ${fdvm_sources}/acc_across.cpp
@@ -156,48 +156,48 @@ set(FDVM ${fdvm_sources}/acc.cpp
          ${fdvm_sources}/parloop.cpp
          ${fdvm_sources}/stmt.cpp)
         
-set(PARALLEL_REG _src/ParallelizationRegions/ParRegions.cpp
-        _src/ParallelizationRegions/ParRegions.h
-        _src/ParallelizationRegions/ParRegions_func.h
-        _src/ParallelizationRegions/expand_extract_reg.cpp
-        _src/ParallelizationRegions/expand_extract_reg.h
-        _src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
-        _src/ParallelizationRegions/resolve_par_reg_conflicts.h)
+set(PARALLEL_REG src/ParallelizationRegions/ParRegions.cpp
+        src/ParallelizationRegions/ParRegions.h
+        src/ParallelizationRegions/ParRegions_func.h
+        src/ParallelizationRegions/expand_extract_reg.cpp
+        src/ParallelizationRegions/expand_extract_reg.h
+        src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
+        src/ParallelizationRegions/resolve_par_reg_conflicts.h)
 
-set(TR_DEAD_CODE _src/Transformations/dead_code.cpp
-        _src/Transformations/dead_code.h)
-set(TR_CP _src/Transformations/checkpoints.cpp
-        _src/Transformations/checkpoints.h)
-set(TR_VECTOR _src/Transformations/array_assign_to_loop.cpp
-        _src/Transformations/array_assign_to_loop.h)
-set(TR_ENDDO_LOOP _src/Transformations/enddo_loop_converter.cpp
-        _src/Transformations/enddo_loop_converter.h)
-set(TR_LOOP_NEST _src/Transformations/loop_transform.cpp
-        _src/Transformations/loop_transform.h)
-set(TR_LOOP_COMB _src/Transformations/loops_combiner.cpp
-        _src/Transformations/loops_combiner.h)
-set(TR_LOOP_SPLIT _src/Transformations/loops_splitter.cpp
-        _src/Transformations/loops_splitter.h)
-set(TR_LOOP_UNROLL _src/Transformations/loops_unrolling.cpp
-        _src/Transformations/loops_unrolling.h)     
-set(TR_PRIV_BR _src/Transformations/private_arrays_resizing.cpp
-        _src/Transformations/private_arrays_resizing.h)
-set(TR_PRIV_DEL _src/Transformations/private_removing.cpp
-        _src/Transformations/private_removing.h)
-set(TR_SWAP_ARR_DIMS _src/Transformations/swap_array_dims.cpp
-        _src/Transformations/swap_array_dims.h)
-set(TR_FUNC_DUP _src/Transformations/uniq_call_chain_dup.cpp
-        _src/Transformations/uniq_call_chain_dup.h)
-set(TR_FUNC_PURE _src/Transformations/function_purifying.cpp
-        _src/Transformations/function_purifying.h)  
-set(TR_GV _src/Transformations/fix_common_blocks.cpp
-        _src/Transformations/fix_common_blocks.h)
-set(TR_CONV _src/Transformations/convert_to_c.cpp
-        _src/Transformations/convert_to_c.h)
-set(TR_IMPLICIT_NONE _src/Transformations/set_implicit_none.cpp
-        _src/Transformations/set_implicit_none.h)
-set(TR_REPLACE_ARRAYS_IN_IO _src/Transformations/replace_dist_arrays_in_io.cpp
-        _src/Transformations/replace_dist_arrays_in_io.h)
+set(TR_DEAD_CODE src/Transformations/dead_code.cpp
+        src/Transformations/dead_code.h)
+set(TR_CP src/Transformations/checkpoints.cpp
+        src/Transformations/checkpoints.h)
+set(TR_VECTOR src/Transformations/array_assign_to_loop.cpp
+        src/Transformations/array_assign_to_loop.h)
+set(TR_ENDDO_LOOP src/Transformations/enddo_loop_converter.cpp
+        src/Transformations/enddo_loop_converter.h)
+set(TR_LOOP_NEST src/Transformations/loop_transform.cpp
+        src/Transformations/loop_transform.h)
+set(TR_LOOP_COMB src/Transformations/loops_combiner.cpp
+        src/Transformations/loops_combiner.h)
+set(TR_LOOP_SPLIT src/Transformations/loops_splitter.cpp
+        src/Transformations/loops_splitter.h)
+set(TR_LOOP_UNROLL src/Transformations/loops_unrolling.cpp
+        src/Transformations/loops_unrolling.h)     
+set(TR_PRIV_BR src/Transformations/private_arrays_resizing.cpp
+        src/Transformations/private_arrays_resizing.h)
+set(TR_PRIV_DEL src/Transformations/private_removing.cpp
+        src/Transformations/private_removing.h)
+set(TR_SWAP_ARR_DIMS src/Transformations/swap_array_dims.cpp
+        src/Transformations/swap_array_dims.h)
+set(TR_FUNC_DUP src/Transformations/uniq_call_chain_dup.cpp
+        src/Transformations/uniq_call_chain_dup.h)
+set(TR_FUNC_PURE src/Transformations/function_purifying.cpp
+        src/Transformations/function_purifying.h)  
+set(TR_GV src/Transformations/fix_common_blocks.cpp
+        src/Transformations/fix_common_blocks.h)
+set(TR_CONV src/Transformations/convert_to_c.cpp
+        src/Transformations/convert_to_c.h)
+set(TR_IMPLICIT_NONE src/Transformations/set_implicit_none.cpp
+        src/Transformations/set_implicit_none.h)
+set(TR_REPLACE_ARRAYS_IN_IO src/Transformations/replace_dist_arrays_in_io.cpp
+        src/Transformations/replace_dist_arrays_in_io.h)
 
 set(TRANSFORMS 
         ${TR_DEAD_CODE}
@@ -219,129 +219,129 @@ set(TRANSFORMS
         ${TR_IMPLICIT_NONE}
         ${TR_REPLACE_ARRAYS_IN_IO})
         
-set(CFG _src/CFGraph/IR.cpp
-        _src/CFGraph/IR.h
-        _src/CFGraph/CFGraph.cpp
-        _src/CFGraph/CFGraph.h
-        _src/CFGraph/RD_subst.cpp
-        _src/CFGraph/RD_subst.h
-        _src/CFGraph/live_variable_analysis.cpp
-        _src/CFGraph/live_variable_analysis.h
-        _src/CFGraph/private_variables_analysis.cpp
-        _src/CFGraph/private_variables_analysis.h
+set(CFG src/CFGraph/IR.cpp
+        src/CFGraph/IR.h
+        src/CFGraph/CFGraph.cpp
+        src/CFGraph/CFGraph.h
+        src/CFGraph/RD_subst.cpp
+        src/CFGraph/RD_subst.h
+        src/CFGraph/live_variable_analysis.cpp
+        src/CFGraph/live_variable_analysis.h
+        src/CFGraph/private_variables_analysis.cpp
+        src/CFGraph/private_variables_analysis.h
         )
         
 set(DATA_FLOW
-        _src/CFGraph/DataFlow/data_flow.h
-        _src/CFGraph/DataFlow/data_flow_impl.h
-        _src/CFGraph/DataFlow/backward_data_flow.h
-        _src/CFGraph/DataFlow/backward_data_flow_impl.h
+        src/CFGraph/DataFlow/data_flow.h
+        src/CFGraph/DataFlow/data_flow_impl.h
+        src/CFGraph/DataFlow/backward_data_flow.h
+        src/CFGraph/DataFlow/backward_data_flow_impl.h
         )
 
-set(CREATE_INTER_T  _src/CreateInterTree/CreateInterTree.cpp
-        _src/CreateInterTree/CreateInterTree.h)
+set(CREATE_INTER_T  src/CreateInterTree/CreateInterTree.cpp
+        src/CreateInterTree/CreateInterTree.h)
 
-set(DIRA  _src/DirectiveProcessing/directive_analyzer.cpp
-        _src/DirectiveProcessing/directive_analyzer.h
-        _src/DirectiveProcessing/directive_creator.cpp
-        _src/DirectiveProcessing/directive_creator_base.cpp
-        _src/DirectiveProcessing/directive_creator.h
-        _src/DirectiveProcessing/directive_parser.cpp
-        _src/DirectiveProcessing/directive_parser.h
-        _src/DirectiveProcessing/directive_omp_parser.cpp
-        _src/DirectiveProcessing/directive_omp_parser.h
-        _src/DirectiveProcessing/insert_directive.cpp
-        _src/DirectiveProcessing/insert_directive.h
-        _src/DirectiveProcessing/remote_access.cpp
-        _src/DirectiveProcessing/remote_access_base.cpp
-        _src/DirectiveProcessing/remote_access.h
-        _src/DirectiveProcessing/shadow.cpp
-        _src/DirectiveProcessing/shadow.h
-        _src/DirectiveProcessing/spf_directive_preproc.cpp)
+set(DIRA  src/DirectiveProcessing/directive_analyzer.cpp
+        src/DirectiveProcessing/directive_analyzer.h
+        src/DirectiveProcessing/directive_creator.cpp
+        src/DirectiveProcessing/directive_creator_base.cpp
+        src/DirectiveProcessing/directive_creator.h
+        src/DirectiveProcessing/directive_parser.cpp
+        src/DirectiveProcessing/directive_parser.h
+        src/DirectiveProcessing/directive_omp_parser.cpp
+        src/DirectiveProcessing/directive_omp_parser.h
+        src/DirectiveProcessing/insert_directive.cpp
+        src/DirectiveProcessing/insert_directive.h
+        src/DirectiveProcessing/remote_access.cpp
+        src/DirectiveProcessing/remote_access_base.cpp
+        src/DirectiveProcessing/remote_access.h
+        src/DirectiveProcessing/shadow.cpp
+        src/DirectiveProcessing/shadow.h
+        src/DirectiveProcessing/spf_directive_preproc.cpp)
         
-set(DISTR _src/Distribution/Array.cpp
-        _src/Distribution/ArrayAnalysis.cpp
-        _src/Distribution/Array.h
-        _src/Distribution/Arrays.h
-        _src/Distribution/CreateDistributionDirs.cpp
-        _src/Distribution/CreateDistributionDirs.h
-        _src/Distribution/Cycle.cpp
-        _src/Distribution/Cycle.h
-        _src/Distribution/Distribution.cpp
-        _src/Distribution/Distribution.h
-        _src/Distribution/DvmhDirective.cpp
-        _src/Distribution/DvmhDirective.h
-        _src/Distribution/DvmhDirective_func.h
-        _src/Distribution/DvmhDirectiveBase.cpp
-        _src/Distribution/DvmhDirectiveBase.h
-        _src/Distribution/GraphCSR.cpp
-        _src/Distribution/GraphCSR.h)
+set(DISTR src/Distribution/Array.cpp
+        src/Distribution/ArrayAnalysis.cpp
+        src/Distribution/Array.h
+        src/Distribution/Arrays.h
+        src/Distribution/CreateDistributionDirs.cpp
+        src/Distribution/CreateDistributionDirs.h
+        src/Distribution/Cycle.cpp
+        src/Distribution/Cycle.h
+        src/Distribution/Distribution.cpp
+        src/Distribution/Distribution.h
+        src/Distribution/DvmhDirective.cpp
+        src/Distribution/DvmhDirective.h
+        src/Distribution/DvmhDirective_func.h
+        src/Distribution/DvmhDirectiveBase.cpp
+        src/Distribution/DvmhDirectiveBase.h
+        src/Distribution/GraphCSR.cpp
+        src/Distribution/GraphCSR.h)
         
-set(DVMH_REG _src/DvmhRegions/DvmhRegionInserter.cpp
-        _src/DvmhRegions/DvmhRegionInserter.h
-        _src/DvmhRegions/RegionsMerger.cpp
-        _src/DvmhRegions/RegionsMerger.h
-        _src/DvmhRegions/ReadWriteAnalyzer.cpp
-        _src/DvmhRegions/ReadWriteAnalyzer.h
-        _src/DvmhRegions/LoopChecker.cpp
-        _src/DvmhRegions/LoopChecker.h
-        _src/DvmhRegions/DvmhRegion.cpp
-        _src/DvmhRegions/DvmhRegion.h
-        _src/DvmhRegions/VarUsages.cpp
-        _src/DvmhRegions/VarUsages.h
-        _src/DvmhRegions/TypedSymbol.cpp
-        _src/DvmhRegions/TypedSymbol.h)
+set(DVMH_REG src/DvmhRegions/DvmhRegionInserter.cpp
+        src/DvmhRegions/DvmhRegionInserter.h
+        src/DvmhRegions/RegionsMerger.cpp
+        src/DvmhRegions/RegionsMerger.h
+        src/DvmhRegions/ReadWriteAnalyzer.cpp
+        src/DvmhRegions/ReadWriteAnalyzer.h
+        src/DvmhRegions/LoopChecker.cpp
+        src/DvmhRegions/LoopChecker.h
+        src/DvmhRegions/DvmhRegion.cpp
+        src/DvmhRegions/DvmhRegion.h
+        src/DvmhRegions/VarUsages.cpp
+        src/DvmhRegions/VarUsages.h
+        src/DvmhRegions/TypedSymbol.cpp
+        src/DvmhRegions/TypedSymbol.h)
         
-set(DYNA _src/DynamicAnalysis/createParallelRegions.cpp
-        _src/DynamicAnalysis/createParallelRegions.h
-        _src/DynamicAnalysis/gcov_info.cpp
-        _src/DynamicAnalysis/gcov_info.h
-        _src/DynamicAnalysis/gCov_parser.cpp
-        _src/DynamicAnalysis/gCov_parser_func.h)
+set(DYNA src/DynamicAnalysis/createParallelRegions.cpp
+        src/DynamicAnalysis/createParallelRegions.h
+        src/DynamicAnalysis/gcov_info.cpp
+        src/DynamicAnalysis/gcov_info.h
+        src/DynamicAnalysis/gCov_parser.cpp
+        src/DynamicAnalysis/gCov_parser_func.h)
 
-set(EXPR_TRANSFORM _src/ExpressionTransform/control_flow_graph_part.cpp
-        _src/ExpressionTransform/expr_transform.cpp
-        _src/ExpressionTransform/expr_transform.h)
+set(EXPR_TRANSFORM src/ExpressionTransform/control_flow_graph_part.cpp
+        src/ExpressionTransform/expr_transform.cpp
+        src/ExpressionTransform/expr_transform.h)
         
-set(GR_CALL _src/GraphCall/graph_calls.cpp
-        _src/GraphCall/graph_calls.h
-        _src/GraphCall/graph_calls_base.cpp
-        _src/GraphCall/graph_calls_func.h)
+set(GR_CALL src/GraphCall/graph_calls.cpp
+        src/GraphCall/graph_calls.h
+        src/GraphCall/graph_calls_base.cpp
+        src/GraphCall/graph_calls_func.h)
         
-set(GR_LOOP _src/GraphLoop/graph_loops_base.cpp
-        _src/GraphLoop/graph_loops.cpp
-        _src/GraphLoop/graph_loops.h
-        _src/GraphLoop/graph_loops_func.h)
+set(GR_LOOP src/GraphLoop/graph_loops_base.cpp
+        src/GraphLoop/graph_loops.cpp
+        src/GraphLoop/graph_loops.h
+        src/GraphLoop/graph_loops_func.h)
         
-set(INLINER _src/Inliner/inliner.cpp
-        _src/Inliner/inliner.h)
+set(INLINER src/Inliner/inliner.cpp
+        src/Inliner/inliner.h)
         
-set(LOOP_ANALYZER  _src/LoopAnalyzer/allocations_prepoc.cpp
-        _src/LoopAnalyzer/dep_analyzer.cpp        
-        _src/LoopAnalyzer/loop_analyzer.cpp
-        _src/LoopAnalyzer/loop_analyzer.h)
+set(LOOP_ANALYZER  src/LoopAnalyzer/allocations_prepoc.cpp
+        src/LoopAnalyzer/dep_analyzer.cpp        
+        src/LoopAnalyzer/loop_analyzer.cpp
+        src/LoopAnalyzer/loop_analyzer.h)
 
-set(RENAME_SYMBOLS  _src/RenameSymbols/rename_symbols.cpp
-                    _src/RenameSymbols/rename_symbols.h)
+set(RENAME_SYMBOLS  src/RenameSymbols/rename_symbols.cpp
+                    src/RenameSymbols/rename_symbols.h)
 
 
-set(MAIN _src/Sapfor.cpp
-        _src/Sapfor.h
-        _src/SapforData.h
-        _src/Utils/PassManager.h)
+set(MAIN src/Sapfor.cpp
+        src/Sapfor.h
+        src/SapforData.h
+        src/Utils/PassManager.h)
 
-set(PREDICTOR _src/Predictor/PredictScheme.cpp
-              _src/Predictor/PredictScheme.h)
+set(PREDICTOR src/Predictor/PredictScheme.cpp
+              src/Predictor/PredictScheme.h)
 
-set(PROJ_MAN _src/ProjectManipulation/ParseFiles.cpp
-             _src/ProjectManipulation/ParseFiles.h
-             _src/ProjectManipulation/StdCapture.h
-             _src/ProjectManipulation/PerfAnalyzer.cpp
-             _src/ProjectManipulation/PerfAnalyzer.h
-             _src/ProjectManipulation/FileInfo.cpp
-             _src/ProjectManipulation/FileInfo.h
-             _src/ProjectManipulation/ConvertFiles.cpp
-             _src/ProjectManipulation/ConvertFiles.h)
+set(PROJ_MAN src/ProjectManipulation/ParseFiles.cpp
+             src/ProjectManipulation/ParseFiles.h
+             src/ProjectManipulation/StdCapture.h
+             src/ProjectManipulation/PerfAnalyzer.cpp
+             src/ProjectManipulation/PerfAnalyzer.h
+             src/ProjectManipulation/FileInfo.cpp
+             src/ProjectManipulation/FileInfo.h
+             src/ProjectManipulation/ConvertFiles.cpp
+             src/ProjectManipulation/ConvertFiles.h)
 
 set(PARSER  ${parser_sources}/cftn.c
             ${parser_sources}/errors.c
@@ -491,16 +491,16 @@ else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 endif()
 
-add_subdirectory(_projects/FDVM)
+add_subdirectory(projects/FDVM)
 
 add_definitions("-D __SPF")
 add_definitions("-D _CRT_SECURE_NO_WARNINGS")
 add_definitions("-D _CRT_NON_CONFORMING_SWPRINTFS")
 
-add_subdirectory(_projects/SageOldSrc)
-add_subdirectory(_projects/SageNewSrc)
-add_subdirectory(_projects/SageLib)
-add_subdirectory(_projects/Parser)
+add_subdirectory(projects/SageOldSrc)
+add_subdirectory(projects/SageNewSrc)
+add_subdirectory(projects/SageLib)
+add_subdirectory(projects/Parser)
 
 add_definitions("-D __SPF_BUILT_IN_FDVM")
 add_definitions("-D __SPF_BUILT_IN_PARSER")