CMake:
- Accumulate environment variables, to be used later to run some command in proper environment.
This commit is contained in:
parent
57df145536
commit
440d8e0757
@ -188,6 +188,11 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
|
||||
MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
|
||||
MARK_AS_ADVANCED(SALOME_NETGENPLUGIN_INSTALL_RES_DATA)
|
||||
|
||||
# Accumulate environment variables for NETGENPLUGIN module
|
||||
SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
|
||||
${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
|
||||
SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
|
||||
|
||||
# Sources
|
||||
# ========
|
||||
|
||||
|
@ -46,6 +46,9 @@ SET_AND_CHECK(NETGENPLUGIN_INCLUDE_DIRS "${NETGENPLUGIN_ROOT_DIR_EXP}/@SALOME_IN
|
||||
SET(NETGENPLUGIN_INCLUDE_DIRS "${NETGENPLUGIN_INCLUDE_DIRS};@_SalomeNETGENPLUGIN_EXTRA_HEADERS@")
|
||||
SET(NETGENPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
|
||||
|
||||
# Package specific environment variables
|
||||
@_SalomeNETGENPLUGIN_EXTRA_ENV_FULL@
|
||||
|
||||
#### Now the specificities
|
||||
|
||||
# Options exported by the package:
|
||||
|
@ -29,3 +29,7 @@ SALOME_FIND_PACKAGE(SalomeNETGENPLUGIN SalomeNETGENPLUGIN CONFIG)
|
||||
IF(NOT SalomeNETGENPLUGIN_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found Salome NETGENPLUGIN: ${NETGENPLUGIN_ROOT_DIR}")
|
||||
ENDIF()
|
||||
|
||||
FOREACH(_res ${SalomeNETGENPLUGIN_EXTRA_ENV})
|
||||
SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeNETGENPLUGIN_EXTRA_ENV_${_res}}")
|
||||
ENDFOREACH()
|
@ -20,4 +20,7 @@
|
||||
SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Netgen NETGEN_INCLUDE_DIRS 1)
|
||||
MARK_AS_ADVANCED(NETGEN_INCLUDE_DIRS NETGEN_LIBRARIES)
|
||||
|
||||
SALOME_ACCUMULATE_HEADERS(NETGEN_INCLUDE_DIRS)
|
||||
IF(NETGEN_FOUND)
|
||||
SALOME_ACCUMULATE_HEADERS(NETGEN_INCLUDE_DIRS)
|
||||
SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${NETGEN_LIBRARIES})
|
||||
ENDIF()
|
||||
|
Loading…
Reference in New Issue
Block a user