Skip to content

Commit 7a4ba79

Browse files
corbett5corbett5
committed
Fixing install.
1 parent bb9456a commit 7a4ba79

File tree

8 files changed

+100
-58
lines changed

8 files changed

+100
-58
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
cmake_minimum_required( VERSION 3.9 )
22

3+
# Set version number
4+
set( LVARRAY_VERSION_MAJOR 0 )
5+
set( LVARRAY_VERSION_MINOR 0 )
6+
set( LVARRAY_VERSION_PATCHLEVEL 0 )
7+
38
# check if LvArray is build as a submodule or a separate project
49
get_directory_property( parent_dir PARENT_DIRECTORY )
510
if(parent_dir)
@@ -58,7 +63,7 @@ if( ENABLE_OPENMP )
5863
endif()
5964

6065
if( ENABLE_RAJA )
61-
set( lvarray_dependencies ${lvarray_dependencies} raja )
66+
set( lvarray_dependencies ${lvarray_dependencies} RAJA )
6267
endif()
6368

6469
if( ENABLE_CALIPER )

‎cmake/Config.cmake‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,13 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/src/LvArrayConfig.hpp.in
3737
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/src/LvArrayConfig.hpp.in
3838
${CMAKE_CURRENT_SOURCE_DIR}/docs/doxygen/LvArrayConfig.hpp )
3939

40+
# Install the generated header.
4041
install( FILES ${CMAKE_BINARY_DIR}/include/LvArrayConfig.hpp
4142
DESTINATION include )
43+
44+
# Configure and install the CMake config
45+
configure_file( ${CMAKE_CURRENT_LIST_DIR}/lvarray-config.cmake.in
46+
${PROJECT_BINARY_DIR}/share/lvarray/cmake/lvarray-config.cmake)
47+
48+
install( FILES ${PROJECT_BINARY_DIR}/share/lvarray/cmake/lvarray-config.cmake
49+
DESTINATION share/lvarray/cmake/)

‎cmake/FindRAJA.cmake‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎cmake/SetupTPL.cmake‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
1-
set( thirdPartyLibs "")
1+
set(thirdPartyLibs "")
22

33
################################
44
# RAJA
55
################################
6-
if( EXISTS ${RAJA_DIR})
7-
message(STATUS "Using system RAJA found at ${RAJA_DIR}")
8-
else()
9-
message(STATUS "Using RAJA from thirdPartyLibs")
6+
if(NOT EXISTS ${RAJA_DIR})
107
set(RAJA_DIR ${GEOSX_TPL_DIR}/raja)
118
endif()
129

13-
include(${CMAKE_SOURCE_DIR}/cmake/FindRAJA.cmake)
14-
if (NOT RAJA_FOUND)
15-
message(FATAL_ERROR "RAJA not found in ${RAJA_DIR}. Maybe you need to build it")
16-
endif()
17-
blt_register_library( NAME RAJA
18-
INCLUDES ${RAJA_INCLUDE_DIRS}
19-
LIBRARIES ${RAJA_LIBRARY}
20-
TREAT_INCLUDES_AS_SYSTEM ON )
10+
message(STATUS "Using RAJA from ${RAJA_DIR}")
11+
12+
find_package(RAJA REQUIRED PATHS ${RAJA_DIR})
2113

2214
set(ENABLE_RAJA ON CACHE BOOL "")
2315

24-
set( thirdPartyLibs ${thirdPartyLibs} raja )
16+
set(thirdPartyLibs ${thirdPartyLibs} RAJA)
2517

2618

2719
###############################
@@ -45,7 +37,6 @@ endif()
4537
################################
4638
# CHAI
4739
################################
48-
# include(cmake/FindCHAI.cmake)
4940
if(ENABLE_CHAI)
5041
if(NOT ENABLE_UMPIRE)
5142
message(FATAL_ERROR "umpire must be enabled to use chai.")
@@ -77,7 +68,7 @@ endif()
7768

7869

7970
################################
80-
# CALIPER and Adiak
71+
# CALIPER
8172
################################
8273
if(ENABLE_CALIPER)
8374
if(NOT EXISTS ${CALIPER_DIR})
@@ -101,9 +92,9 @@ if(ENABLE_CALIPER)
10192
TREAT_INCLUDES_AS_SYSTEM ON)
10293

10394
set(thirdPartyLibs ${thirdPartyLibs} caliper)
95+
else()
96+
message(STATUS "Not using caliper.")
10497
endif()
10598

10699

107-
108-
109-
set( thirdPartyLibs ${thirdPartyLibs} CACHE STRING "" )
100+
set(thirdPartyLibs ${thirdPartyLibs} CACHE STRING "")

‎cmake/lvarray-config.cmake.in‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#########################################################################################
2+
# Copyright (c) 2020, Lawrence Livermore National Security, LLC and LvArray contributors.
3+
# All rights reserved.
4+
# See the LICENSE file for details.
5+
# SPDX-License-Identifier: (BSD-3-Clause)
6+
#########################################################################################
7+
8+
if (NOT LVARRAY_CONFIG_LOADED)
9+
set(LVARRAY_CONFIG_LOADED TRUE)
10+
include(@CMAKE_INSTALL_PREFIX@/share/lvarray/cmake/lvarray.cmake)
11+
endif()
12+
13+
# Export version number
14+
set(LVARRAY_VERSION_MAJOR @LVARRAY_VERSION_MAJOR@)
15+
set(LVARRAY_VERSION_MINOR @LVARRAY_VERSION_MINOR@)
16+
set(LVARRAY_VERSION_PATCHLEVEL @LVARRAY_VERSION_PATCHLEVEL@)

‎host-configs/LLNL/[email protected]‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
set(CONFIG_NAME "[email protected]" CACHE PATH "")
2+
3+
set(COMPILER_DIR /usr/tce/packages/clang/clang-10.0.0/ )
4+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
5+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
6+
7+
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
8+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
9+
10+
set(MPI_HOME /usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0 CACHE PATH "")
11+
12+
set(ENABLE_FORTRAN OFF CACHE BOOL "")
13+
14+
# set(RAJA_DIR /usr/WS2/corbett5/RAJA/[email protected] CACHE PATH "")
15+
16+
# set(ENABLE_UMPIRE ON CACHE BOOL "")
17+
# set(UMPIRE_DIR /usr/WS2/corbett5/Umpire/[email protected] CACHE PATH "")
18+
19+
# set(ENABLE_CHAI ON CACHE BOOL "")
20+
# set(CHAI_DIR /usr/WS2/corbett5/CHAI2/[email protected] CACHE PATH "")
21+
22+
set(ENABLE_CALIPER OFF CACHE BOOL "")
23+
set(ENABLE_PAPI OFF CACHE BOOL "")
24+
set(USE_ADDR2LINE ON CACHE BOOL "")
25+
26+
set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "")
27+
28+
set(ENABLE_OPENMP ON CACHE BOOL "")
29+
set(CUDA_ENABLED OFF CACHE BOOL "")
30+
31+
set(ENABLE_TOTALVIEW_OUTPUT OFF CACHE BOOL "Enables Totalview custom view" FORCE)

‎host-configs/LLNL/[email protected]‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
set(CONFIG_NAME "[email protected]" CACHE PATH "")
2+
3+
set(COMPILER_DIR /usr/tce/packages/clang/clang-10.0.0/ )
4+
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
5+
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
6+
7+
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
8+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")
9+
10+
set(RAJA_DIR /usr/WS2/corbett5/CHAI3/install[email protected] CACHE PATH "")
11+
12+
set(ENABLE_UMPIRE ON CACHE BOOL "")
13+
set(UMPIRE_DIR /usr/WS2/corbett5/CHAI3/install[email protected] CACHE PATH "")
14+
15+
set(ENABLE_CHAI ON CACHE BOOL "")
16+
set(CHAI_DIR /usr/WS2/corbett5/CHAI3/install[email protected] CACHE PATH "")
17+
18+
set(ENABLE_CALIPER OFF CACHE BOOL "")
19+
set(ENABLE_PAPI OFF CACHE BOOL "")
20+
set(USE_ADDR2LINE ON CACHE BOOL "")
21+
22+
set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "")
23+
24+
set(ENABLE_OPENMP ON CACHE BOOL "")
25+
set(CUDA_ENABLED OFF CACHE BOOL "")
26+
27+
set(ENABLE_TOTALVIEW_OUTPUT OFF CACHE BOOL "Enables Totalview custom view" FORCE)

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ install( TARGETS lvarray
5757
install( EXPORT lvarray
5858
DESTINATION share/lvarray/cmake/ )
5959

60-
install( FILES ${lvarray_headers} DESTINATION include
61-
)
60+
install( DIRECTORY . DESTINATION include/LvArray FILES_MATCHING PATTERN *.hpp )
61+
install( DIRECTORY . DESTINATION include/LvArray FILES_MATCHING PATTERN *.h )
6262

6363
lvarray_add_code_checks( PREFIX lvarray
6464
EXCLUDES "blt/*" )

0 commit comments

Comments
 (0)