Skip to content

Commit 68bee7f

Browse files
author
Martin D. Weinberg
committed
Adds support for installing public include libraries
1 parent 2668d32 commit 68bee7f

3 files changed

Lines changed: 52 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,14 @@ endif()
279279

280280
# Force installation of the yaml-cpp libraries
281281
install(TARGETS yaml-cpp DESTINATION lib)
282+
install(DIRECTORY ${PROJECT_SOURCE_DIR}/extern/yaml-cpp/include/
283+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
284+
FILES_MATCHING PATTERN "*.h")
285+
286+
# Install HighFive headers
287+
install(DIRECTORY ${PROJECT_SOURCE_DIR}/extern/HighFive/include/
288+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
289+
PATTERN "*.in" EXCLUDE)
282290

283291
# Check for doxygen is the user wants web docs
284292
if (BUILD_DOCS)

expui/BiorthBasis.H

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ namespace BasisClasses
201201
{
202202
// Sanity check
203203
if (x.size() != y.size() || x.size() != z.size())
204-
throw std::runtime_error("BiorthBasis::getAccelArray: "
204+
throw std::runtime_error("BiorthBasis::getAccel: "
205205
"x, y, z vectors must be of the same size");
206206

207207
// Resize the return array

expui/CMakeLists.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,49 @@ set_target_properties(expui PROPERTIES OUTPUT_NAME expui)
4444
target_include_directories(expui PUBLIC ${common_INCLUDE})
4545
target_link_libraries(expui PUBLIC ${common_LINKLIB})
4646

47+
# Add public headers from local directory
48+
target_sources(expui PUBLIC FILE_SET HEADERS
49+
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}"
50+
FILES
51+
${CMAKE_CURRENT_SOURCE_DIR}/Coefficients.H
52+
${CMAKE_CURRENT_SOURCE_DIR}/CoefStruct.H
53+
${CMAKE_CURRENT_SOURCE_DIR}/BasisFactory.H
54+
${CMAKE_CURRENT_SOURCE_DIR}/BiorthBasis.H
55+
${CMAKE_CURRENT_SOURCE_DIR}/BiorthBess.H
56+
${CMAKE_CURRENT_SOURCE_DIR}/FieldGenerator.H
57+
)
58+
59+
# Make the exp config header part of the public install
60+
target_sources(expui PUBLIC FILE_SET HEADERS
61+
BASE_DIRS "${CMAKE_BINARY_DIR}"
62+
FILES
63+
${CMAKE_BINARY_DIR}/config_exp.h
64+
)
65+
66+
# Add public headers from the main include directory
67+
target_sources(expui PUBLIC FILE_SET HEADERS
68+
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../include"
69+
FILES
70+
${CMAKE_CURRENT_SOURCE_DIR}/../include/DiskDensityFunc.H
71+
${CMAKE_CURRENT_SOURCE_DIR}/../include/ParticleReader.H
72+
${CMAKE_CURRENT_SOURCE_DIR}/../include/header.H
73+
${CMAKE_CURRENT_SOURCE_DIR}/../include/Particle.H
74+
${CMAKE_CURRENT_SOURCE_DIR}/../include/gadget.H
75+
${CMAKE_CURRENT_SOURCE_DIR}/../include/tipsy.H
76+
${CMAKE_CURRENT_SOURCE_DIR}/../include/BiorthCube.H
77+
${CMAKE_CURRENT_SOURCE_DIR}/../include/BiorthCyl.H
78+
${CMAKE_CURRENT_SOURCE_DIR}/../include/sltableMP2.H
79+
${CMAKE_CURRENT_SOURCE_DIR}/../include/SLGridMP2.H
80+
${CMAKE_CURRENT_SOURCE_DIR}/../include/YamlCheck.H
81+
${CMAKE_CURRENT_SOURCE_DIR}/../include/EmpCylSL.H
82+
${CMAKE_CURRENT_SOURCE_DIR}/../include/localmpi.H
83+
${CMAKE_CURRENT_SOURCE_DIR}/../include/exputils.H
84+
${CMAKE_CURRENT_SOURCE_DIR}/../include/massmodel.H
85+
${CMAKE_CURRENT_SOURCE_DIR}/../include/interp.H
86+
${CMAKE_CURRENT_SOURCE_DIR}/../include/orbit.H
87+
)
88+
89+
install(TARGETS expui FILE_SET HEADERS DESTINATION include/EXP)
4790
install(TARGETS expui DESTINATION lib)
4891

4992
# Configure and build the test routines

0 commit comments

Comments
 (0)