From dd94c5d7e9ff1f853445dc500ea4de2451a28938 Mon Sep 17 00:00:00 2001
From: gregoire kubler <gregoire.kubler@proton.me>
Date: Tue, 28 May 2024 07:17:38 +0200
Subject: [PATCH] chore : aidge_install is in the prefix path
---
CMakeLists.txt | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2ffd9e5..85a3eae7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,6 @@ execute_process(
ERROR_QUIET
)
message(STATUS "Latest git commit: ${GIT_COMMIT_HASH}")
-
-# Define a preprocessor macro with the Git commit version
add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
# Note : project name is {project} and python module name is also {project}
@@ -43,7 +41,6 @@ if(CMAKE_COMPILER_IS_GNUCXX AND COVERAGE)
Include(CodeCoverage)
endif()
-
##############################################
# Create target and set properties
file(GLOB_RECURSE src_files "src/*.cpp")
@@ -52,20 +49,13 @@ file(GLOB_RECURSE inc_files "include/*.hpp")
##############################################
#Â creating library
add_library(${module_name} ${src_files} ${inc_files})
-# PYTHON BINDING
-if (PYBIND)
- find_package(Python REQUIRED)
- if (${Python_VERSION_MAJOR} LESS 3)
- MESSAGE(FATAL_ERROR "Unsupported Python version. Python 3.0.0+ is required")
- endif()
- generate_python_binding(${project} ${module_name})
- # Handles Python + pybind11 headers dependencies
- target_link_libraries(${module_name}
- PUBLIC
- pybind11::pybind11
- )
+if(NOT $ENV{AIDGE_INSTALL} STREQUAL "")
+ set(CMAKE_INSTALL_PREFIX $ENV{AIDGE_INSTALL})
+ list(APPEND CMAKE_PREFIX_PATH $ENV{AIDGE_INSTALL})
+ message(WARNING "Env var AIDGE_INSTALL detected. Set CMAKE_INSTALL_PREFIX & added to CMAKE_PREFIX_PATH = $ENV{AIDGE_INSTALL}")
endif()
+
##############################################
# Find aidge dependencies
find_package(aidge_core REQUIRED)
@@ -128,11 +118,6 @@ endif()
##############################################
# Installation instructions
-if(NOT $ENV{AIDGE_INSTALL} STREQUAL "")
- set(CMAKE_INSTALL_PREFIX $ENV{AIDGE_INSTALL})
- message(WARNING "CMAKE_INSTALL_PREFIX set to env variable AIDGE_INSTALL by default = ${CMAKE_INSTALL_PREFIX}")
-endif()
-
include(GNUInstallDirs)
set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
--
GitLab