Skip to content

Commit

Permalink
updated UtilsLite
Browse files Browse the repository at this point in the history
  • Loading branch information
ebertolazzi committed Sep 23, 2024
1 parent 4c4b8a2 commit fbad591
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion setup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
system('git submodule foreach --recursive git pull')
end

system('ruby submodules/Utils/setup.rb')
system('ruby submodules/UtilsLite/setup.rb')
system('ruby submodules/quarticRootsFlocke/setup.rb')
5 changes: 0 additions & 5 deletions standalone_project/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ FOREACH (F ${S})
FILE( RELATIVE_PATH RF ${CMAKE_CURRENT_SOURCE_DIR} "${F}" )
LIST( APPEND HEADERS ${RF} )
ENDFOREACH (F ${S})
FILE( GLOB S ./src/Utils/zstream/*.h* )
FOREACH (F ${S})
FILE( RELATIVE_PATH RF ${CMAKE_CURRENT_SOURCE_DIR} "${F}" )
LIST( APPEND HEADERS ${RF} )
ENDFOREACH (F ${S})

INCLUDE_DIRECTORIES( src src/Utils src/Clothoids )

Expand Down
15 changes: 7 additions & 8 deletions standalone_project/populate_project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
FileUtils.mkdir_p "src"
FileUtils.mkdir_p "src/Clothoids"
FileUtils.mkdir_p "src/Utils/fmt"
FileUtils.mkdir_p "src/Utils/zstream"

FileUtils.rm_rf "bin"
FileUtils.mkdir_p "bin"
Expand All @@ -33,31 +32,31 @@
FileUtils.cp filename, "./src/" + File.basename(filename);
end

lst = Dir["../submodules/Utils/src/*.cc"]
lst = Dir["../submodules/UtilsLite/src/*.cc"]
lst.each do |filename|
FileUtils.cp filename, "./src/" + File.basename(filename);
end
lst = Dir["../submodules/Utils/src/*.h*"]
lst = Dir["../submodules/UtilsLite/src/*.h*"]
lst.each do |filename|
FileUtils.cp filename, "./src/" + File.basename(filename);
end
lst = Dir["../submodules/Utils/src/Utils/*.h*"]
lst = Dir["../submodules/UtilsLite/src/Utils/*.h*"]
lst.each do |filename|
FileUtils.cp filename, "./src/Utils/" + File.basename(filename);
end
lst = Dir["../submodules/Utils/src/Utils/*.c*"]
lst = Dir["../submodules/UtilsLite/src/Utils/*.c*"]
lst.each do |filename|
FileUtils.cp filename, "./src/Utils/" + File.basename(filename);
end
lst = Dir["../submodules/Utils/src/Utils/fmt/*.h*"]
lst = Dir["../submodules/UtilsLite/src/Utils/fmt/*.h*"]
lst.each do |filename|
FileUtils.cp filename, "./src/Utils/fmt/" + File.basename(filename);
end
lst = Dir["../submodules/Utils/src/Utils/fmt/*.c*"]
lst = Dir["../submodules/UtilsLite/src/Utils/fmt/*.c*"]
lst.each do |filename|
FileUtils.cp filename, "./src/Utils/fmt/" + File.basename(filename);
end
lst = Dir["../submodules/Utils/src/Utils/zstream/*.h*"]
lst = Dir["../submodules/UtilsLite/src/Utils/zstream/*.h*"]
lst.each do |filename|
FileUtils.cp filename, "./src/Utils/zstream/" + File.basename(filename);
end
Expand Down

0 comments on commit fbad591

Please sign in to comment.