Commit d0c01a26 authored by Blake Nelson's avatar Blake Nelson

Updated boost target link libraries to use BOOST_LIBRARY form instead of...

Updated boost target link libraries to use BOOST_LIBRARY form instead of BOOST_LIBRARY_RELEASE and BOOST_LIBRARY_DEBUG.


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@2105 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent acf45cfc
......@@ -29,10 +29,10 @@ MACRO(ADD_EXERCISE_EXECUTABLE name source)
# add them here.
TARGET_LINK_LIBRARIES(${name}
${NEKTAR++_LIBRARIES}
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized ${Boost_DATE_TIME_LIBRARY_RELEASE} debug ${Boost_DATE_TIME_LIBRARY_DEBUG}
${Boost_THREAD_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${Boost_ZLIB_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
optimized tinyxml debug tinyxml)
SET_LAPACK_LINK_LIBRARIES(${name})
......
......@@ -230,12 +230,12 @@ MACRO(ADD_NEKTAR_EXECUTABLE name sources)
TARGET_LINK_LIBRARIES(${name}
optimized LibUtilities debug LibUtilities-g
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_DATE_TIME_LIBRARY_RELEASE} debug ${Boost_DATE_TIME_LIBRARY_DEBUG}
optimized ${Boost_FILESYSTEM_LIBRARY_RELEASE} debug ${Boost_FILESYSTEM_LIBRARY_DEBUG}
optimized ${Boost_SYSTEM_LIBRARY_RELEASE} debug ${Boost_SYSTEM_LIBRARY_DEBUG}
${Boost_THREAD_LIBRARY}
${Boost_ZLIB_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
optimized tinyxml debug tinyxml
)
......
......@@ -32,10 +32,10 @@ MACRO(ADD_SOLVER_EXECUTABLE name source)
# add them here.
TARGET_LINK_LIBRARIES(${name}
${NEKTAR++_LIBRARIES}
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized ${Boost_DATE_TIME_LIBRARY_RELEASE} debug ${Boost_DATE_TIME_LIBRARY_DEBUG}
${Boost_THREAD_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${Boost_ZLIB_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
optimized tinyxml debug tinyxml)
SET_LAPACK_LINK_LIBRARIES(${name})
......
......@@ -39,8 +39,7 @@ IF( NEKTAR++_FOUND )
# add them here.
TARGET_LINK_LIBRARIES(${ProjectName}
${NEKTAR++_LIBRARIES}
optimized ${Boost_THREAD_LIBRARY_RELEASE}
debug ${Boost_THREAD_LIBRARY_DEBUG})
${Boost_THREAD_LIBRARY}
SET_LAPACK_LINK_LIBRARIES(${ProjectName})
ENDIF( NEKTAR++_FOUND )
......
# Find an installed Nektar++. Will not find a Nektar++ development environment.
SET(NEKTAR_SEARCH_PATH
${CMAKE_SOURCE_DIR}/../../Nektar++/dist
${CMAKE_BINARY_DIR}/../Nektar++/dist/
/usr/include
/usr/local/include
)
FIND_PATH(NEKTAR++_ROOT_DIR Nektar++Config.cmake ${NEKTAR_SEARCH_PATH} )
IF (NEKTAR++_ROOT_DIR)
SET(NEKTAR++_FOUND TRUE)
ELSE (NEKTAR++_ROOT_DIR)
SET(NEKTAR++_FOUND FALSE)
ENDIF (NEKTAR++_ROOT_DIR)
IF( NEKTAR++_FOUND )
INCLUDE(${NEKTAR++_ROOT_DIR}/Nektar++Config.cmake)
SET(NEKTAR++_INCLUDE_DIRS ${NEKTAR++_ROOT_DIR}/include)
SET(NEKTAR++_LIBRARY_DIRS ${NEKTAR++_ROOT_DIR}/lib)
SET(NEKTAR++_LIBRARIES LibUtilities LocalRegions MultiRegions SpatialDomains StdRegions)
# TODO - This is a little awkward because Nektar++ already knows what
# preprocessor definitions are defined, but I can't find a way to
# access them. This is a maintenance issue.
IF( NEKTAR_USE_MEMORY_POOLS )
ADD_DEFINITIONS(-DNEKTAR_MEMORY_POOL_ENABLED)
ELSE( NEKTAR_USE_MEMORY_POOLS )
REMOVE_DEFINITIONS(-DNEKTAR_MEMORY_POOL_ENABLED)
ENDIF( NEKTAR_USE_MEMORY_POOLS )
ELSE( NEKTAR++_FOUND )
SET(NEKTAR++_DEFINITIONS "")
SET(NEKTAR++_INCLUDE_DIRS "")
ENDIF( NEKTAR++_FOUND )
......@@ -33,10 +33,10 @@ MACRO(ADD_UTILITIES_EXECUTABLE name source)
# add them here.
TARGET_LINK_LIBRARIES(${name}
${NEKTAR++_LIBRARIES}
optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
optimized ${Boost_DATE_TIME_LIBRARY_RELEASE} debug ${Boost_DATE_TIME_LIBRARY_DEBUG}
${Boost_THREAD_LIBRARY}
${Boost_IOSTREAMS_LIBRARY}
${Boost_ZLIB_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
optimized tinyxml debug tinyxml)
SET_LAPACK_LINK_LIBRARIES(${name})
......
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