mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-26 01:10:35 +05:00
Merge branch 'master' into gni/adaptation
This commit is contained in:
commit
f5e84513cd
@ -110,6 +110,8 @@ SET(StdMeshers_SCRIPTS
|
|||||||
StdMeshersBuilder.py
|
StdMeshersBuilder.py
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# additional preprocessor / compiler flags
|
||||||
|
ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
|
||||||
SET(SMeshHelper_HEADERS SMeshHelper.h SMeshHelper.i)
|
SET(SMeshHelper_HEADERS SMeshHelper.h SMeshHelper.i)
|
||||||
SET(SMeshHelper_SOURCES SMeshHelper.cxx ${SMeshHelper_HEADERS})
|
SET(SMeshHelper_SOURCES SMeshHelper.cxx ${SMeshHelper_HEADERS})
|
||||||
SET_SOURCE_FILES_PROPERTIES(SMeshHelper.i PROPERTIES CPLUSPLUS ON)
|
SET_SOURCE_FILES_PROPERTIES(SMeshHelper.i PROPERTIES CPLUSPLUS ON)
|
||||||
@ -122,6 +124,10 @@ ELSE()
|
|||||||
SWIG_ADD_LIBRARY(SMeshHelper LANGUAGE python SOURCES ${SMeshHelper_SOURCES})
|
SWIG_ADD_LIBRARY(SMeshHelper LANGUAGE python SOURCES ${SMeshHelper_SOURCES})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
SWIG_LINK_LIBRARIES(SMeshHelper ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SMESHEngine )
|
SWIG_LINK_LIBRARIES(SMeshHelper ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SMESHEngine )
|
||||||
|
SWIG_CHECK_GENERATION(SMeshHelper)
|
||||||
|
IF(WIN32)
|
||||||
|
SET_TARGET_PROPERTIES(_SMeshHelper PROPERTIES DEBUG_OUTPUT_NAME _SMeshHelper_d)
|
||||||
|
ENDIF(WIN32)
|
||||||
install(TARGETS _SMeshHelper DESTINATION ${SALOME_INSTALL_LIBS})
|
install(TARGETS _SMeshHelper DESTINATION ${SALOME_INSTALL_LIBS})
|
||||||
install(FILES ${SMeshHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
|
install(FILES ${SMeshHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
|
||||||
SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_SMeshHelper_REAL_NAME}")
|
SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_SMeshHelper_REAL_NAME}")
|
||||||
|
Loading…
Reference in New Issue
Block a user