fixed: GETBeam support with IFEM_AS_SUBMODULE

git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@2914 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
akva
2014-08-28 13:58:47 +00:00
committed by Knut Morten Okstad
parent 25e73b2f05
commit 74f658c3c1
2 changed files with 4 additions and 0 deletions

View File

@@ -59,6 +59,9 @@ IF(IFEM_PATH OR IFEM_AS_SUBMODULE)
ADD_SUBDIRECTORY(${IFEM_PATH} IFEM.dir)
INCLUDE(${CMAKE_BINARY_DIR}/IFEM.dir/IFEMFlags.cmake)
SET(IFEM_LIBRARIES IFEM)
IF(IFEM_USE_GETBEAM)
set(IFEM_LIBRARIES ${IFEM_LIBRARIES} ${CMAKE_CURRENT_BINARY_DIR}/IFEM.dir/lib/libGETBeam.a)
ENDIF(IFEM_USE_GETBEAM)
ELSE(IFEM_AS_SUBMODULE)
# Build is in-tree
MESSAGE(STATUS "Using in-tree IFEM")

View File

@@ -195,6 +195,7 @@ ENDIF(IFEM_USE_OPENMP)
# Geometrically exact Timoshenko beam
IF(IFEM_USE_GETBEAM)
SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} -DHAS_GETBEAM=${IFEM_USE_GETBEAM}")
SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} -DHAS_GETBEAM=${IFEM_USE_GETBEAM}")
ENDIF(IFEM_USE_GETBEAM)
# Portability issues