Skip to content
Snippets Groups Projects
Verified Commit b3942db5 authored by Paul Dechamps's avatar Paul Dechamps :speech_balloon:
Browse files

(ci) Follow dart commit and updated install rules

Avoid forcing installation location
parent f9cd6574
No related branches found
No related tags found
1 merge request!1BLASTER v1.0
......@@ -78,15 +78,15 @@ 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)
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)
ELSE()
IF(NOT(CMAKE_INSTALL_PREFIX MATCHES "blaster$"))
SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/blaster" CACHE STRING "Install location" FORCE)
ENDIF()
ENDIF()
IF(UNIX)
......@@ -102,7 +102,7 @@ ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY( blast )
# -- FINAL
MESSAGE(STATUS "PROJECT: ${CMAKE_PROJECT_NAME}")
MESSAGE(STATUS "PROJECT: ${PROJECT_NAME}")
MESSAGE(STATUS "* SYSTEM NAME=\"${CMAKE_SYSTEM_NAME}\"")
MESSAGE(STATUS "* CXX COMPILER: ${CMAKE_CXX_COMPILER_ID}")
MESSAGE(STATUS "* CXX STANDARD: ${CMAKE_CXX_STANDARD}")
......
......@@ -21,8 +21,8 @@ MACRO_AddTest(${CMAKE_CURRENT_SOURCE_DIR}/tests)
# Add to install
INSTALL(FILES ${CMAKE_CURRENT_LIST_DIR}/__init__.py
${CMAKE_CURRENT_LIST_DIR}/coupler.py
${CMAKE_CURRENT_LIST_DIR}/utils.py
${CMAKE_CURRENT_LIST_DIR}/blCoupler.py
${CMAKE_CURRENT_LIST_DIR}/blUtils.py
DESTINATION blast)
INSTALL(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/api
${CMAKE_CURRENT_LIST_DIR}/interfaces
......
Subproject commit becec3ebf3e3eafcc2a454215a5fb6688a1d0f67
Subproject commit 4d01a1dee135a7489b51093546ea41aa64f15352
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