Commit Graph

58 Commits

Author SHA1 Message Date
Marcel Pi 2c657527ae Fix configure error when BUILD_CARLA_UNREAL=OFF 2024-06-27 20:16:19 +02:00
Xavier Solé Nogués 7c800a5b7f
Reintroduce gcc for ROS2 (#7694) 2024-05-23 08:42:12 +01:00
PabloVD e1cfe639fc Add Ros2 demo flags for cmake 2024-05-21 19:49:59 +02:00
MarcelPiNacy-CVC 9f4c8422a8
Add functions and macros to aid in documentation and general usability. (#7639)
* Introduce the macros carla_add_executable, carla_add_library, carla_add_custom_target and introduce help dialog and help file generation.

* Remove semicolon on output.

* Switch from using configure time logic to a target "carla-help".

* Remove GCC_COMPILER option.

* Check PACKAGE_CONFIGURATION for empty.

* Revert to add_library for carla-ros2-native ExternalProject.

* Add function carla_add_target_docs and document "clean".

* Minor fix (missing names).

---------

Co-authored-by: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-15 17:50:06 +02:00
MarcelPiNacy-CVC bca3b5abef
Fix LibCarla's Version.h.in (file configured by CMake to set the library version). (#7647)
Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-15 16:07:47 +02:00
Xavier Solé Nogués 08c06a01df
Revert "Introduce several helper macros and utilities for improved usability.…" (#7635)
This reverts commit 321082ed0b.

Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-13 11:45:53 +02:00
MarcelPiNacy-CVC 321082ed0b
Introduce several helper macros and utilities for improved usability. (#7609)
* Introduce the macros carla_add_executable, carla_add_library, carla_add_custom_target and introduce help dialog and help file generation.

* Remove semicolon on output.

* Switch from using configure time logic to a target "carla-help".

* Remove GCC_COMPILER option.

* Check PACKAGE_CONFIGURATION for empty.

---------

Co-authored-by: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-13 09:47:15 +02:00
Xavier Solé Nogués 4507d68f7e
Remove g++ toolchain (#7433) 2024-04-17 09:50:09 +02:00
Marcel Pi 4212ff6701
Add wheel package generation. (#7334)
* Python package progress

* Remove unneeded POST_BUILD command.

* Switch to scikit-build-core (WIP)

* More changes boost::python-related changes.

* Add LICENSE copy, remove explicit reference to C/C++ compiler.

* Switch back to pure CMake build, using package data to include C++ extension binaries.

* Minor changes.

* Add fallback if PEP517 is unavailable.

* Integrate PythonAPI target in main build.

* Fix minor build order issue.

* Remove invalid option in setup.py.

* Address review comments.

* Switch finally to scikit-build-core for PythonAPI build/wheel and refactor CMake folder.

* Minor fix.

* Update gitignore.

* Minor change.

* Remove unused CarlaOptions include

* Add missing file copy.

* Add several Ubuntu-related changes.

* Update requirements.txt

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>

* Update CMake/Common.cmake

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>

---------

Co-authored-by: xavisolesoft <xavisolesoft@gmail.com>
2024-04-09 16:32:09 +02:00
Marcel Pi c40e9780c3
Switch to wrapper macro for options. (#7313) 2024-04-02 14:16:27 +01:00
Marcel Pi d07a623c9c
Fix additional issues with escape characters in carla_string_option. (#7293)
* Fix string option escape character errors.

* Additional string option escape character fixes.

* Minor formatting change.

* More fixes.

* Revert back to file copy for *.def.

* Fix build order issue related to carla-unreal-configure.

* Update CMakeLists.txt

* Update CMakeLists.txt

* Switch to using file(GENERATE ...)
2024-03-25 17:23:16 +01:00
Xavier Solé Nogués 43fbdf6d84
Revert "Fix string option escape character errors. (#7291)" (#7292)
This reverts commit bc5a76bfd2.
2024-03-25 11:51:43 +01:00
Marcel Pi bc5a76bfd2
Fix string option escape character errors. (#7291) 2024-03-25 11:28:32 +01:00
Xavier Solé Nogués 30eb4b57c9
Fux unreal engine path option (#7278) 2024-03-21 12:52:47 +01:00
Marcel Pi a7fea2e360 Simplify UE targets. 2024-03-21 11:06:40 +01:00
Marcel Pi 3be254d37d Update CarlaDependencies.cmake 2024-03-21 11:06:40 +01:00
Marcel Pi 7d8ab26767 Minor change. 2024-03-21 11:06:40 +01:00
Marcel Pi a408b14efb Switch PREFER_CLONE back to OFF. 2024-03-20 12:48:26 +01:00
Marcel Pi 57223e7387 Fix incorrect dependency order when generating UE project files + other minor fixes. 2024-03-20 11:34:44 +01:00
Marcel Pi bfa58f2902 Multiple minor changes. 2024-03-18 20:25:56 +01:00
Marcel Pi 1621521610 Add CppClient example to CMake build. 2024-03-18 20:20:02 +01:00
Marcel Pi 834d3d8c0c Update LinuxToolchain.cmake 2024-03-18 16:47:13 +01:00
Marcel Pi 3206014587 Fix missing cmake_error definition. 2024-03-18 14:09:38 +01:00
Marcel Pi 36a29194bb Several build order fixes, switch from boost "exclude" projects to "include". 2024-03-17 11:46:19 +01:00
Marcel Pi bb806ad0e3
Tweak *.Build.cs files to read .def files. (#7243)
* Tweak *.Build.cs files to read .def files instead of being configured by CMake.

* Add missing EOF.

* Minor fix.

* Fix PixelReader compile error and use copy instead of symlink for Includes & Libraries.def.

* Fix CarlaTools linker error.
2024-03-14 20:03:32 +01:00
Marcel Pi 44d0c1bc3c
Marcel/5.3/cmake libcarla image support list (#7249)
* Reintroduce launch-only target.

* Expose explicit mechanism to request image support to libcarla.

* Update CMake/Options/Common.cmake

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>

* Remove unwanted changes.

* Add missing EOF newline.

---------

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>
2024-03-14 19:11:15 +01:00
Marcel Pi 3711979b0d
Reintroduce launch-only target. (#7250) 2024-03-14 19:08:12 +01:00
Xavier Solé Nogués 979b942ff5
Implement Cmake ros2 native external project (#7252)
* libcarla-ros2-native.so build and install working.

* Fixes and add Carla.Build.cs

* ROS2Native build system implemented for CMake

* Add g++/gcc option and remove Build path reference from Carla.build.cs

* Auto add ros2 target when ros2 and server is enabled

* Remove ROS2 from client

* Fix build when ROS2 is disabled.

* Clean up space

* Fix will error with ROS2 enabled

* Remove macro collision ROS2
2024-03-14 15:27:10 +00:00
Marcel Pi 6d058e9a89 Temporarily remove references to cmake_message. 2024-03-14 12:08:43 +01:00
Marcel Pi 3f85bde1ab Improve build logging. 2024-03-13 15:38:31 +01:00
Marcel Pi fc3a629ce2 Check EOF newlines. 2024-03-13 12:03:37 +01:00
Marcel Pi 0a9437fd10 Improve warning suppression. 2024-03-13 01:04:27 +01:00
Marcel Pi 07963dba96 Make _CRT_SECURE_NO_WARNINGS a global definition. Introduce mechanism to disable warnings. 2024-03-12 23:19:57 +01:00
Marcel Pi 6725e66d0d Disable Wall by default and fix deprecation warning for std::atomic<std::shared_ptr<T>> 2024-03-12 15:05:13 +01:00
Marcel Pi 8c14d9ff4c Minor changes, introduce options for -Wall and -Werror. 2024-03-12 13:04:01 +01:00
Marcel Pi 8e70cfe0c6 Remove preference for Ninja for UE. 2024-03-12 11:01:37 +01:00
Marcel Pi 1be3ea50b1 Minor fix. 2024-03-11 15:16:40 +01:00
Marcel Pi 182ccbbc12 Multiple Windows-related fixes. 2024-03-11 12:30:24 +01:00
Marcel Pi 2ca6591671 Change configure defaults. 2024-03-11 08:58:46 +01:00
Marcel Pi 7638b470e8 Switch back to specifying toolchain through command line. 2024-03-11 08:55:16 +01:00
Marcel Pi 0b15f68d1b Rename BUILD_CARLA_UE to BUILD_CARLA_UNREAL and add USES_TERMINAL to UE5 custom targets. 2024-03-10 21:42:58 +01:00
Marcel Pi b65b450663 Fix StreetMap plugin download. 2024-03-09 00:25:47 +01:00
Marcel Pi 01852e6a6e - Update gitignore.
- Add launch and launch-only CMake custom targets.
- Temporary workaround for lack of a properly parameterized toolchain file.
- Change all references to CarlaUE4 to CarlaUnreal.
- Separate CMake Options files.
2024-03-08 20:31:22 +01:00
Marcel Pi 730d3f068f Merge branch 'marcel/5.3/python-api-overhaul' into marcel/ue5/rename 2024-03-08 16:21:23 +01:00
Xavier Solé Nogués 2550373845
Cmake migrate FetchContent from git clone to zip download (#7225)
* Fix fetch content slow speed due boost download

* Migrate all mandatory dependencies FetchContent from git clone to url approach
2024-03-08 09:47:18 +01:00
Xavier Solé Nogués dab4487a96
Fix fetch content slow speed due boost download (#7222) 2024-03-07 20:21:44 +01:00
Marcel Pi ccb5d98d26 Add Linux Toolchain file. 2024-03-07 17:11:15 +01:00
Marcel Pi d72dd89db4 More Ubuntu build progress... 2024-03-06 17:20:13 +01:00
Marcel Pi a09ce91376 Minor changes. Disable MakeFiles. 2024-03-06 16:28:09 +01:00
MarcelPiNacy a4c0abbda1 Temporary fix for Ubuntu CMake dependencies. Isolate ROS2 code in CarlaUE. 2024-03-04 13:10:00 +01:00