fixed paths

.gitignore

@@ -1,25 +1,25 @@
 # Add any directories, files, or patterns you don't want to be tracked by version control
 *.o
-sapfor/experts/Sapfor_2017/.idea/
-sapfor/experts/Sapfor_2017/cmake-build-debug/
-sapfor/experts/Sapfor_2017/.vs/
-sapfor/experts/Sapfor_2017/_bin/
-sapfor/experts/Sapfor_2017/_lib/
-sapfor/experts/Sapfor_2017/Inliner/x64/
-sapfor/experts/Sapfor_2017/Parser/x64/
-sapfor/experts/Sapfor_2017/SageLib/x64/
-sapfor/experts/Sapfor_2017/SageNewSrc/x64/
-sapfor/experts/Sapfor_2017/SageOldSrc/x64/
-sapfor/experts/Sapfor_2017/Sapfor/x64/
-sapfor/experts/Sapfor_2017/TransformCommonLib/x64/
-sapfor/experts/Sapfor_2017/TransformLib/x64/
-sapfor/experts/Sapfor_2017/TransformUtils/x64/
+Sapfor/.idea/
+Sapfor/cmake-build-debug/
+Sapfor/.vs/
+Sapfor/_bin/
+Sapfor/_lib/
+Sapfor/Inliner/x64/
+Sapfor/Parser/x64/
+Sapfor/SageLib/x64/
+Sapfor/SageNewSrc/x64/
+Sapfor/SageOldSrc/x64/
+Sapfor/Sapfor/x64/
+Sapfor/TransformCommonLib/x64/
+Sapfor/TransformLib/x64/
+Sapfor/TransformUtils/x64/
 dvm/fdvm/trunk/.svn/
-sapfor/experts/Sapfor_2017/.svn/
+Sapfor/.svn/
 sapfor/transformers
 sapfor/transformers/.svn/
-sapfor/experts/Sapfor_2017/_src/boost
-sapfor/experts/Sapfor_2017/Sapfor/Sapfor.vcxproj.user
+Sapfor/_src/boost
+Sapfor/Sapfor/Sapfor.vcxproj.user
 sapfor/analyzers/
 sapfor/general/
 sapfor/generators/
@@ -30,11 +30,11 @@ sapfor/experts/expert_maxim_last_version/
 sapfor/experts/visualizer/
 sapfor/.svn/
 
-sapfor/experts/Sapfor_2017/cmake-build-debug/
-sapfor/experts/Sapfor_2017/build/
-sapfor/experts/Sapfor_2017/Inliner/build/
-sapfor/experts/Sapfor_2017/Parser/build/
-sapfor/experts/Sapfor_2017/Sapfor/*.o
+Sapfor/cmake-build-debug/
+Sapfor/build/
+Sapfor/Inliner/build/
+Sapfor/Parser/build/
+Sapfor/Sapfor/*.o
 sapfor/transformers/ftransform/trunk/cmake-build-debug/
 sapfor/transformers/ftransform/trunk/build/
 sapfor/transformers/ftransform/trunk/parser/build/
@@ -57,22 +57,23 @@ dvm/tools/omp-pa/
 dvm/CMakeLists.txt
 dvm/.svn/
 dvm/fdvm/branches/
-sapfor/experts/Sapfor_2017/TransformCommonLib/TransformCommonLib.vcxproj.user
-sapfor/experts/Sapfor_2017/SageOldSrc/SageOldSrc.vcxproj.user
-sapfor/experts/Sapfor_2017/SageNewSrc/SageNewSrc.vcxproj.user
-sapfor/experts/Sapfor_2017/SageLib/SageLib.vcxproj.user
-sapfor/experts/Sapfor_2017/Inliner/Inliner.vcxproj.user
-sapfor/experts/Sapfor_2017/TransformUtils/TransformUtils.vcxproj.user
-sapfor/experts/Sapfor_2017/Parser/Parser.vcxproj.user
+Sapfor/TransformCommonLib/TransformCommonLib.vcxproj.user
+Sapfor/SageOldSrc/SageOldSrc.vcxproj.user
+Sapfor/SageNewSrc/SageNewSrc.vcxproj.user
+Sapfor/SageLib/SageLib.vcxproj.user
+Sapfor/Inliner/Inliner.vcxproj.user
+Sapfor/TransformUtils/TransformUtils.vcxproj.user
+Sapfor/Parser/Parser.vcxproj.user
 .vscode/*
 .vs/
 **/**/.DS_Store
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.user
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.filters
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/x64/
-sapfor/experts/Sapfor_2017/Sapc++/x64/
+Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.user
+Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.filters
+Sapfor/Sapc++/Sapc++/Sapc++.vcxproj
+Sapfor/Sapc++/Sapc++/x64/
+Sapfor/Sapc++/x64/
 
 /build
 
-sapfor/experts/Sapfor_2017/out/
+Sapfor/out/
+Sapfor/_bin/*

Sapfor/CMakeLists.txt

@@ -13,24 +13,25 @@ add_definitions("-D YYDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(fdvm_include ../../../dvm/fdvm/trunk/include)
-set(sage_include_1 ../../../dvm/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 ../../../dvm/fdvm/trunk/Sage/h/)
-set(libdb_sources ../../../dvm/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources ../../../dvm/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources ../../../dvm/fdvm/trunk/Sage/Sage++)
-set(parser_sources ../../../dvm/fdvm/trunk/parser)
-set(pppa_sources ../../../dvm/tools/pppa/trunk/src)
-set(zlib_sources ../../../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}/paths.txt")
-    message("Found paths.txt, using custom paths.")
-    FILE(STRINGS ./paths.txt SAPFOR_PATHS)
-else ()
-    message("Not found paths.txt, using default paths.")
-    FILE(STRINGS ./paths.default.txt SAPFOR_PATHS)
-endif ()
+#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/_projects/paths.txt")
+#    message("Found paths.txt, using custom 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)
+#endif ()
   
 foreach (NameAndValue ${SAPFOR_PATHS})
     # Strip leading spaces
@@ -490,16 +491,16 @@ else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 endif()
 
-add_subdirectory(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(SageOldSrc)
-add_subdirectory(SageNewSrc)
-add_subdirectory(SageLib)
-add_subdirectory(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")