From 24210c8bfb327586619713cc87dd214922e231b1 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 12 Mar 2025 12:45:22 +0300 Subject: [PATCH] fixed paths --- .gitignore | 157 ++++++++++++++++++++------------------- Sapfor/CMakeLists.txt | 18 ++--- Sapfor/paths.default.txt | 21 +++--- 3 files changed, 98 insertions(+), 98 deletions(-) diff --git a/.gitignore b/.gitignore index ab041ca..0000101 100644 --- a/.gitignore +++ b/.gitignore @@ -1,78 +1,79 @@ -# 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/ -dvm/fdvm/trunk/.svn/ -sapfor/experts/Sapfor_2017/.svn/ -sapfor/transformers -sapfor/transformers/.svn/ -sapfor/experts/Sapfor_2017/_src/boost -sapfor/experts/Sapfor_2017/Sapfor/Sapfor.vcxproj.user -sapfor/analyzers/ -sapfor/general/ -sapfor/generators/ -sapfor/idb/ -sapfor/CMakeLists.txt -sapfor/experts/expert/ -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/transformers/ftransform/trunk/cmake-build-debug/ -sapfor/transformers/ftransform/trunk/build/ -sapfor/transformers/ftransform/trunk/parser/build/ -**/.idea - -dvm/cdvm/ -dvm/cdvmh-clang/ -dvm/driver/ -dvm/general/ -dvm/releases/ -dvm/rts/ -dvm/rts-dvmh/ -dvm/tools/projectStructureForFortran/ -dvm/tools/pppa/.svn -dvm/tools/Zlib/.svn -dvm/tools/predictor/ -dvm/tools/omp-dbg/ -dvm/tools/omp-otc/ -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 -.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/ - -/build - -sapfor/experts/Sapfor_2017/out/ +# Add any directories, files, or patterns you don't want to be tracked by version control +*.o +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/.svn/ +sapfor/transformers +sapfor/transformers/.svn/ +Sapfor/_src/boost +Sapfor/Sapfor/Sapfor.vcxproj.user +sapfor/analyzers/ +sapfor/general/ +sapfor/generators/ +sapfor/idb/ +sapfor/CMakeLists.txt +sapfor/experts/expert/ +sapfor/experts/expert_maxim_last_version/ +sapfor/experts/visualizer/ +sapfor/.svn/ + +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/ +**/.idea + +dvm/cdvm/ +dvm/cdvmh-clang/ +dvm/driver/ +dvm/general/ +dvm/releases/ +dvm/rts/ +dvm/rts-dvmh/ +dvm/tools/projectStructureForFortran/ +dvm/tools/pppa/.svn +dvm/tools/Zlib/.svn +dvm/tools/predictor/ +dvm/tools/omp-dbg/ +dvm/tools/omp-otc/ +dvm/tools/omp-pa/ +dvm/CMakeLists.txt +dvm/.svn/ +dvm/fdvm/branches/ +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/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/out/ +Sapfor/_bin/* diff --git a/Sapfor/CMakeLists.txt b/Sapfor/CMakeLists.txt index 9379792..0bc42a4 100644 --- a/Sapfor/CMakeLists.txt +++ b/Sapfor/CMakeLists.txt @@ -13,15 +13,15 @@ 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 ../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) # Read pathes to external sapfor directories if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/paths.txt") diff --git a/Sapfor/paths.default.txt b/Sapfor/paths.default.txt index 70cdf30..bb19b87 100644 --- a/Sapfor/paths.default.txt +++ b/Sapfor/paths.default.txt @@ -1,11 +1,10 @@ -fdvm_include=../../../dvm/fdvm/trunk/include/ -sage_include_1=../../../dvm/fdvm/trunk/Sage/lib/include/ -sage_include_2=../../../dvm/fdvm/trunk/Sage/h/ -fdvm_sources=../../../dvm/fdvm/trunk/fdvm/ -libdb_sources=../../../dvm/fdvm/trunk/Sage/lib/oldsrc/ -sage_sources=../../../dvm/fdvm/trunk/Sage/lib/newsrc/ -sagepp_sources=../../../dvm/fdvm/trunk/Sage/Sage++/ -parser_sources=../../../dvm/fdvm/trunk/parser/ -inline_expansion_sources=../../../dvm/fdvm/trunk/InlineExpansion/ -pppa_sources=../../../dvm/tools/pppa/trunk/src/ -zlib_sources=../../../dvm/tools/Zlib/ \ No newline at end of file +fdvm_include=../dvm/fdvm/trunk/include/ +sage_include_1=../dvm/fdvm/trunk/Sage/lib/include/ +sage_include_2=../dvm/fdvm/trunk/Sage/h/ +fdvm_sources=../dvm/fdvm/trunk/fdvm/ +libdb_sources=../dvm/fdvm/trunk/Sage/lib/oldsrc/ +sage_sources=../dvm/fdvm/trunk/Sage/lib/newsrc/ +sagepp_sources=../dvm/fdvm/trunk/Sage/Sage++/ +parser_sources=../dvm/fdvm/trunk/parser/ +pppa_sources=../dvm/tools/pppa/trunk/src/ +zlib_sources=../dvm/tools/Zlib/ \ No newline at end of file