From 46a6681bf8e0985da2b39e82ad8679e6d78994a5 Mon Sep 17 00:00:00 2001
From: Paul Dechamps <paul.dechamps@uliege.be>
Date: Sat, 1 Feb 2025 17:51:55 +0100
Subject: [PATCH] (ci, install) Followed dartflo commit and modified install
 rules

Avoid modifying install path if the project is a submodule. In that case, installation is handled by the top project.
---
 CMakeLists.txt  | 8 +++-----
 modules/dartflo | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c855d2..03edcc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,15 +78,13 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # to find "amfe_def.h"
 ENABLE_TESTING()
 
 # -- INSTALL
-# Check if the project is the main project and the installation path is not specified
-IF(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND NOT(CMAKE_INSTALL_PREFIX MATCHES "blaster$"))
-    SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/blaster" CACHE STRING "Install location" FORCE)
-ENDIF()
-IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+IF(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+  IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE)
     STRING(REGEX REPLACE "\\\\" "/" PY_SITE ${PY_SITE})
     SET(CMAKE_INSTALL_PREFIX "${PY_SITE}/blaster" CACHE STRING "Install location" FORCE)
     SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
+  ENDIF()
 ENDIF()
 
 IF(UNIX)
diff --git a/modules/dartflo b/modules/dartflo
index 4d01a1d..aa8d1ed 160000
--- a/modules/dartflo
+++ b/modules/dartflo
@@ -1 +1 @@
-Subproject commit 4d01a1dee135a7489b51093546ea41aa64f15352
+Subproject commit aa8d1ed8bc1822bc2140aaf8a8d3160b9aa7bf46
-- 
GitLab