-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move find logic from root CMakeLists.txt into FindOSPRay.cmake Remove top-level use of ospray include_directories and link_directories (put them in CMakeLists.txt where needed). Remove duplicate use of add_definitions for VISIT_OSPRAY. It's needed many places, so it is set in the find module. Removed unnecessary VISIT_OSRPAY logic from avtplotter CMakeLists.txt
- Loading branch information
Showing
6 changed files
with
137 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| #***************************************************************************** | ||
| # | ||
| # Copyright (c) 2000 - 2019, Lawrence Livermore National Security, LLC | ||
| # Produced at the Lawrence Livermore National Laboratory | ||
| # LLNL-CODE-442911 | ||
| # All rights reserved. | ||
| # | ||
| # This file is part of VisIt. For details, see https://visit.llnl.gov/. The | ||
| # full copyright notice is contained in the file COPYRIGHT located at the root | ||
| # of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions are met: | ||
| # | ||
| # - Redistributions of source code must retain the above copyright notice, | ||
| # this list of conditions and the disclaimer below. | ||
| # - Redistributions in binary form must reproduce the above copyright notice, | ||
| # this list of conditions and the disclaimer (as noted below) in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # - Neither the name of the LLNS/LLNL nor the names of its contributors may | ||
| # be used to endorse or promote products derived from this software without | ||
| # specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| # ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY, | ||
| # LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY | ||
| # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | ||
| # DAMAGE. | ||
| # | ||
| # Modifications: | ||
| # | ||
| #***************************************************************************** | ||
|
|
||
| IF(VISIT_OSPRAY) | ||
|
|
||
| # -- this is a hack for TBB_ROOT | ||
| IF(NOT DEFINED TBB_ROOT) | ||
| SET(TBB_ROOT ${VISIT_TBB_ROOT}) | ||
| ENDIF() | ||
| SET(embree_DIR ${EMBREE_DIR}) | ||
| MARK_AS_ADVANCED(ospray_DIR) | ||
| MARK_AS_ADVANCED(embree_DIR) | ||
|
|
||
| # setup ospray | ||
| # we have to search for the osprayConfig.cmake file in the ospray install | ||
| # folder. Because ospray sometimes install its library in <...>/lib64 | ||
| # folder instead of the <...>/lib folder, we have to check both | ||
| # possibilities | ||
| FIND_PACKAGE(ospray REQUIRED | ||
| PATHS | ||
| ${OSPRAY_DIR}/lib/cmake/ospray-${OSPRAY_VERSION} | ||
| ${OSPRAY_DIR}/lib64/cmake/ospray-${OSPRAY_VERSION} | ||
| NO_DEFAULT_PATH) | ||
| ADD_DEFINITIONS(-DVISIT_OSPRAY) | ||
| # append additional module libraries | ||
| list(APPEND OSPRAY_LIBRARIES | ||
| ${LIBRARY_PATH_PREFIX}ospray_module_ispc${LIBRARY_SUFFIX} | ||
| ${LIBRARY_PATH_PREFIX}ospray_module_visit${LIBRARY_SUFFIX} | ||
| ${LIBRARY_PATH_PREFIX}ospray_module_visit_common${LIBRARY_SUFFIX}) | ||
|
|
||
| # install ospray libs follow visit's standard | ||
| # | ||
| # -- OSPRAY_LIBRARIES contains also libtbb and libembree, so we dont | ||
| # have to handle embree and tbb seperately. As for ISPC, since ISPC | ||
| # is only a compiler and will only be needed when we are compiling | ||
| # ospray source, we dont have to install ISPC at all here for VisIt. | ||
| # | ||
| # on linux ospray have libraries in a form of: | ||
| # libospray[xxx].so | ||
| # libospray[xxx].so.0 | ||
| # libospray[xxx].so.[version] | ||
| # | ||
| # on mac ospray have libraries in a form of: | ||
| # libospray[xxx].dylib | ||
| # libospray[xxx].0.dylib | ||
| # libospray[xxx].[version].dylib | ||
| # | ||
| # on windows | ||
| # libospray[xxx].lib | ||
| # libospray[xxx].dll | ||
| # | ||
| # -- installing headers | ||
| IF(VISIT_INSTALL_THIRD_PARTY AND NOT VISIT_HEADERS_SKIP_INSTALL) | ||
| INSTALL(DIRECTORY ${OSPRAY_INCLUDE_DIR}/ospray | ||
| DESTINATION | ||
| DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE} | ||
| FILE_PERMISSIONS OWNER_WRITE OWNER_READ | ||
| GROUP_WRITE GROUP_READ | ||
| WORLD_READ | ||
| DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE | ||
| GROUP_WRITE GROUP_READ GROUP_EXECUTE | ||
| WORLD_READ WORLD_EXECUTE | ||
| PATTERN ".svn" EXCLUDE) | ||
| ENDIF() | ||
| # -- installing libs | ||
| IF(NOT VISIT_OSPRAY_SKIP_INSTALL) | ||
| FOREACH(l ${OSPRAY_LIBRARIES}) | ||
| # here because the CMake variable OSPRAY_LIBRARIES contains words | ||
| # like 'optimized' and 'debug', we should skip them | ||
| IF( (NOT "${l}" STREQUAL "optimized") AND | ||
| (NOT "${l}" STREQUAL "debug")) | ||
| GET_FILENAME_COMPONENT(_name_ ${l} NAME_WE) | ||
| IF( (NOT WIN32) AND | ||
| (NOT "${_name_}" STREQUAL "libtbb_debug") AND | ||
| (NOT "${_name_}" STREQUAL "libtbbmalloc_debug") AND | ||
| (NOT "${_name_}" STREQUAL "libtbb") AND | ||
| (NOT "${_name_}" STREQUAL "libtbbmalloc") AND | ||
| (NOT "${_name_}" STREQUAL "libembree3") ) | ||
| THIRD_PARTY_INSTALL_LIBRARY(${l}.0) | ||
| ENDIF() | ||
| THIRD_PARTY_INSTALL_LIBRARY(${l}) | ||
| ENDIF() | ||
| ENDFOREACH() | ||
| ENDIF() | ||
|
|
||
| # debug | ||
| MESSAGE(STATUS "OSPRAY_INCLUDE_DIR: " ${OSPRAY_INCLUDE_DIR}) | ||
| MESSAGE(STATUS "OSPRAY_LIBRARIES: " ${OSPRAY_LIBRARIES}) | ||
| MESSAGE(STATUS "OSPRay for VisIt: ON") | ||
|
|
||
| ELSE(VISIT_OSPRAY) | ||
| MESSAGE(STATUS "OSPRay for VisIt: OFF") | ||
| ENDIF(VISIT_OSPRAY) | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters