Skip to content

Commit

Permalink
Merge pull request #14 from AntaresSimulatorTeam/fix/remove-uuid-depe…
Browse files Browse the repository at this point in the history
…ndency

Fix/remove UUID dependency
  • Loading branch information
meslubi2021 authored Jul 17, 2024
2 parents 1d4faad + 7e4580c commit 4b9cb05
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 22 deletions.
10 changes: 2 additions & 8 deletions docs/developer-guide/2-Dependencies-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ toc_depth: 2
(Only for the complete Antares Simulator solution with GUI)
- [minizip](https://github.com/zlib-ng/minizip-ng) library, with its dependency zlib
- [Boost](https://www.boost.org/) libraries: header libraries and boost-test library
- [libuuid](https://linux.die.net/man/3/libuuid) on Linux systems

We favor using [vcpkg](https://github.com/microsoft/vcpkg) for building and installing most of those dependencies,
see [build instructions](3-Build.md) which explain how it integrates with CMake build.
Expand Down Expand Up @@ -42,29 +41,24 @@ OR-Tools may be installed in one of 2 ways:
run again a cmake configure step, therefore it's not advised for developers.


## Linux: libuuid and wxWidgets
## Linux: wxWidgets

On Linux systems, libuuid development packages need to be installed with your
OS package manager.
You will also need to install wxWidgets if you want to build the GUI.
If you want to build the GUI, you need to install wxWidgets.

=== "Centos"

```
sudo yum install libuuid-devel
sudo yum install wxGTK3-devel
```

=== "Ubuntu 20.04 or 22.04 / Debian 11"

```
sudo apt install uuid-dev
sudo apt install libwxgtk3.0-gtk3-dev
```

=== "Ubuntu 23.04 / Debian 12"

```
sudo apt install uuid-dev
sudo apt install libwxgtk3.2-dev
```
2 changes: 1 addition & 1 deletion src/distrib/unix/rpm/rte-antares.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Source0: %%SOURCE%%
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: chrpath

Requires: glibc >= 2.12, libuuid >= 2.17
Requires: glibc >= 2.12

%description
Under the impulsion given by the worldwide growth of innovative technologies
Expand Down
13 changes: 0 additions & 13 deletions src/ext/yuni/src/yuni/cmake/extra-uuid.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,13 @@ if (WIN32 OR WIN64)
LIBYUNI_CONFIG_LIB("both" "uuid" "rpcrt4")
endif()

if (UNIX)
#FIXME
find_path(UUID_INCLUDE_DIR NAMES uuid/uuid.h PATHS /usr/include /usr/local/include /opt/local/include /sw/include)
if(NOT UUID_INCLUDE_DIR)
set(YUNI_CMAKE_ERROR 1)
YMESSAGE( "[!!] Impossible to find uuid/uuid.h.")
YMESSAGE( " * Packages needed on Debian: libuuid1, uuid-dev")
YMESSAGE( " * Packages needed on redhat: libuuid-devel")
endif()
endif()


add_library(yuni-static-uuid STATIC
uuid/uuid.h
uuid/uuid.hxx
uuid/uuid.cpp
uuid/fwd.h
yuni.h
)
target_link_libraries(yuni-static-uuid PUBLIC uuid)

if (WIN32 OR WIN64)
# -lrpcrt4
Expand Down

0 comments on commit 4b9cb05

Please sign in to comment.