Mentions légales du service

Skip to content
Snippets Groups Projects
Commit af90d41a authored by Théotime Grohens's avatar Théotime Grohens
Browse files

[CMake] Simplify zlib inclusion

This commit puts the zlib library search in the toplevel CMakeLists
file, along with other library requirements.

This allows us to remove it from all the other CMakeLists files.
parent 71b0f376
No related branches found
No related tags found
No related merge requests found
...@@ -170,6 +170,12 @@ set(Boost_USE_MULTITHREADED ON) ...@@ -170,6 +170,12 @@ set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF) set(Boost_USE_STATIC_RUNTIME OFF)
find_package(Boost 1.65.0 COMPONENTS filesystem) find_package(Boost 1.65.0 COMPONENTS filesystem)
# ============================================================================
# Look for Zlib
# ============================================================================
find_package(ZLIB REQUIRED)
# ============================================================================ # ============================================================================
# Get GNU standard installation directories (GNUInstallDirs module) # Get GNU standard installation directories (GNUInstallDirs module)
# ============================================================================ # ============================================================================
......
...@@ -7,13 +7,6 @@ if (with-post-treatments) ...@@ -7,13 +7,6 @@ if (with-post-treatments)
add_subdirectory(post_treatments) add_subdirectory(post_treatments)
endif() endif()
# ============================================================================
# Find packages
# ============================================================================
find_package(ZLIB REQUIRED)
# ============================================================================ # ============================================================================
# Add targets add their dependencies # Add targets add their dependencies
# ============================================================================ # ============================================================================
......
...@@ -3,12 +3,6 @@ ...@@ -3,12 +3,6 @@
# ============================================================================ # ============================================================================
add_subdirectory(SFMT-src-1.4) add_subdirectory(SFMT-src-1.4)
# ============================================================================
# Find packages
# ============================================================================
find_package(ZLIB REQUIRED)
# ============================================================================ # ============================================================================
# Add targets add their dependencies # Add targets add their dependencies
# ============================================================================ # ============================================================================
......
# ============================================================================
# Find packages
# ============================================================================
find_package(ZLIB REQUIRED)
# ============================================================================ # ============================================================================
# Add targets add their dependencies # Add targets add their dependencies
# ============================================================================ # ============================================================================
......
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
# Tell cmake about subdirectories to look into # Tell cmake about subdirectories to look into
# ============================================================================ # ============================================================================
# ============================================================================
# Find packages
# ============================================================================
find_package(ZLIB REQUIRED)
# ============================================================================ # ============================================================================
# libaevol-post is a library that contains classes shared by several # libaevol-post is a library that contains classes shared by several
# post-treatments # post-treatments
......
# Google Test headers # Google Test headers
add_subdirectory(googletest) add_subdirectory(googletest)
# We need zlib
find_package(ZLIB REQUIRED)
# Libraries to link unit tests against # Libraries to link unit tests against
set(test_libs set(test_libs
aevol aevol
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment