Commit 6cbcdb12 authored by Michael Turner's avatar Michael Turner
Browse files

Merge branch 'feature/bl_upgrade' of gitlab.nektar.info:meshing/nektar into feature/bl_upgrade

parents 1536dedf 2e3c1fb3
......@@ -4,31 +4,31 @@ MACRO(CHANGE_EXTENSION output var new_ext)
SET(${output} ${Path}/${FileName}.${new_ext})
ENDMACRO()
MACRO(SET_COMMON_PROPERTIES name)
SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX -g)
SET_TARGET_PROPERTIES(${name} PROPERTIES MINSIZEREL_POSTFIX -ms)
SET_TARGET_PROPERTIES(${name} PROPERTIES RELWITHDEBINFO_POSTFIX -rg)
IF( MSVC )
# Disable the warnings about duplicate copy/assignment methods
# Disable the warnings about duplicate copy/assignment methods
# (4521, 4522)
# Disable the warning that arrays are default intialized (4351)
# Disable the warning that arrays are default intialized (4351)
# Disable "forcing value to bool 'true' or 'false' (performance
# warning)" warning (4800)
# 4250 - Inheritance via dominance. Nektar appears to be handling the
# 4250 - Inheritance via dominance. Nektar appears to be handling the
# diamond correctly.
# 4373 - Overriding a virtual method with parameters that differ by const
# or volatile conforms to the standard.
# /Za is necessary to prevent temporaries being bound to reference
# parameters.
SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS
SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS
"/wd4521 /wd4522 /wd4351 /wd4018 /wd4800 /wd4250 /wd4373")
# Enable source level parallel builds.
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
ENDIF( MSVC )
ENDIF( MSVC )
IF( ${CMAKE_COMPILER_IS_GNUCXX} )
IF(NEKTAR_ENABLE_PROFILE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
......@@ -43,19 +43,19 @@ MACRO(SET_COMMON_PROPERTIES name)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DNEKTAR_DEBUG")
IF ( NEKTAR_FULL_DEBUG )
SET(CMAKE_CXX_FLAGS_DEBUG
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -DNEKTAR_FULLDEBUG")
ENDIF( NEKTAR_FULL_DEBUG)
IF( NOT MSVC )
SET(CMAKE_CXX_FLAGS_DEBUG
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-deprecated -Wno-sign-compare")
SET(CMAKE_CXX_FLAGS_RELEASE
SET(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wno-deprecated -Wno-sign-compare")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wall -Wno-deprecated -Wno-sign-compare")
IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(CMAKE_CXX_FLAGS_DEBUG
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -fpermissive")
ENDIF()
ENDIF( NOT MSVC)
......@@ -65,10 +65,10 @@ MACRO(SET_COMMON_PROPERTIES name)
APPEND PROPERTY COMPILE_DEFINITIONS
NEKTAR_VERSION=\"${NEKTAR_VERSION}\")
SET(CMAKE_CXX_FLAGS_RELEASE
SET(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -DNEKTAR_RELEASE")
ENDIF(NOT ${CMAKE_CXX_FLAGS_DEBUG} MATCHES ".*DNEKTAR_DEBUG.*")
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
# The static libraries must be compiled with position independent
# code on 64 bit Linux.
......@@ -78,18 +78,18 @@ ENDMACRO(SET_COMMON_PROPERTIES name)
MACRO(SETUP_PRECOMPILED_HEADERS sourceFiles precompiledHeader)
IF( NEKTAR_USE_PRECOMPILED_HEADERS )
IF( MSVC )
# /Yu"stdafx.h"
IF( MSVC )
# /Yu"stdafx.h"
#MESSAGE(${${precompiledHeader}})
#MESSAGE(${${sourceFiles}})
SET_SOURCE_FILES_PROPERTIES(${${sourceFiles}}
SET_SOURCE_FILES_PROPERTIES(${${sourceFiles}}
PROPERTIES COMPILE_FLAGS "/Yu\"${${precompiledHeader}}\"")
LIST(GET ${sourceFiles} 0 OUTVAR)
#MESSAGE(${OUTVAR})
SET_SOURCE_FILES_PROPERTIES(${OUTVAR}
SET_SOURCE_FILES_PROPERTIES(${OUTVAR}
PROPERTIES COMPILE_FLAGS "/Yc\"${${precompiledHeader}}\"")
ENDIF()
ENDIF()
ENDIF()
ENDMACRO()
......@@ -99,9 +99,9 @@ MACRO(ADD_NEKTAR_EXECUTABLE name component sources)
ELSE( ${ARGC} LESS 4 )
ADD_EXECUTABLE(${name} ${${sources}} ${${ARGV3}})
ENDIF( ${ARGC} LESS 4)
SET_COMMON_PROPERTIES(${name})
IF( ${CMAKE_SYSTEM} MATCHES "Linux.*" )
# The boost thread library needs pthread on linux.
GET_TARGET_PROPERTY(THE_COMPILE_FLAGS ${name} COMPILE_FLAGS)
......@@ -116,15 +116,15 @@ MACRO(ADD_NEKTAR_EXECUTABLE name component sources)
SET(THE_LINK_FLAGS "")
ENDIF(NOT THE_LINK_FLAGS)
SET_TARGET_PROPERTIES(${name}
SET_TARGET_PROPERTIES(${name}
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} -pthread")
SET_TARGET_PROPERTIES(${name}
SET_TARGET_PROPERTIES(${name}
PROPERTIES LINK_FLAGS "${THE_LINK_FLAGS} -pthread")
ENDIF( ${CMAKE_SYSTEM} MATCHES "Linux.*" )
SET_PROPERTY(TARGET ${name} PROPERTY FOLDER ${component})
INSTALL(TARGETS ${name}
INSTALL(TARGETS ${name}
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT ${component} OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} COMPONENT ${component} OPTIONAL
LIBRARY DESTINATION ${NEKTAR_LIB_DIR} COMPONENT ${component} OPTIONAL)
......@@ -139,11 +139,11 @@ MACRO(ADD_NEKTAR_LIBRARY name component type)
SET_COMMON_PROPERTIES(${name})
INSTALL(TARGETS ${name}
EXPORT Nektar++Libraries
INSTALL(TARGETS ${name}
EXPORT Nektar++Libraries
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT ${component} OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} COMPONENT ${component} OPTIONAL
LIBRARY DESTINATION ${NEKTAR_LIB_DIR} COMPONENT ${component} OPTIONAL)
LIBRARY DESTINATION ${NEKTAR_LIB_DIR} COMPONENT ${component} OPTIONAL)
ENDMACRO(ADD_NEKTAR_LIBRARY name component type)
......
......@@ -24,7 +24,7 @@ IF(NEKTAR_USE_MESHGEN)
SET(OCC_LIBRARIES_TMP PTKernel TKernel TKMath TKBRep TKIGES TKSTEP TKSTEPAttr
TKSTEP209 TKSTEPBase TKShapeSchema TKGeomBase TKGeomAlgo TKG3d TKG2d
TKXSBase TKPShape TKTopAlgo)
TKXSBase TKPShape TKTopAlgo TKShHealing)
FOREACH(OCC_LIB ${OCC_LIBRARIES_TMP})
LIST(APPEND OCC_LIBRARIES ${TPDIST}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${OCC_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
ENDFOREACH()
......@@ -56,10 +56,10 @@ IF(NEKTAR_USE_MESHGEN)
)
# Patch OS X libraries to fix install name problems.
#EXTERNALPROJECT_ADD_STEP(opencascade-6.9 patch-install-path
# COMMAND bash ${CMAKE_SOURCE_DIR}/cmake/scripts/patch-occ.sh ${TPSRC}/opencascade-6.8/i686/lib ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR}
# DEPENDEES build
# DEPENDERS install)
EXTERNALPROJECT_ADD_STEP(opencascade-6.9 patch-install-path
COMMAND bash ${CMAKE_SOURCE_DIR}/cmake/scripts/patch-occ.sh ${TPDIST}/lib ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR}
ALWAYS 1
DEPENDEES install)
MESSAGE(STATUS "Build OpenCascade: ${TPDIST}/lib")
LINK_DIRECTORIES(${TPDIST}/lib)
......
......@@ -6,6 +6,9 @@ install_path=$2
for file in $path/*.dylib
do
if [ -L $file ]; then
continue
fi
echo Repairing: $file
install_name_tool -id $install_path/`basename $file` $file
DYLIBS=`otool -L $file | grep -v "/" | awk -F' ' '{ print $1 }'`
......
......@@ -119,8 +119,7 @@ ADD_NEKTAR_TEST_LENGTHY(StarTec/StraightRW)
# MeshGen test
IF(NEKTAR_USE_MESHGEN)
ADD_NEKTAR_TEST (MeshGen/cylinder)
ADD_NEKTAR_TEST (MeshGen/sphere)
ADD_NEKTAR_TEST_LENGTHY (MeshGen/predator)
ADD_NEKTAR_TEST_LENGTHY (MeshGen/rev)
ADD_NEKTAR_TEST (MeshGen/cylinder)
ADD_NEKTAR_TEST (MeshGen/sphere)
ADD_NEKTAR_TEST_LENGTHY(MeshGen/predator)
ENDIF()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment