Skip to content

Commit d3ac46d

Browse files
authored
Revert to using simple CMAKE_INSTALL_PREFIX
1 parent 4787949 commit d3ac46d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ set_target_properties(oup PROPERTIES EXPORT_NAME oup::oup)
1010

1111
target_sources(oup INTERFACE
1212
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/oup/observable_unique_ptr.hpp>
13-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/oup/observable_unique_ptr.hpp>)
13+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/oup/observable_unique_ptr.hpp>)
1414
target_include_directories(oup INTERFACE
1515
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
16-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
16+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
1717
target_compile_features(oup INTERFACE cxx_std_17)
1818

1919
# Setup install target and exports
2020
install(FILES ${PROJECT_SOURCE_DIR}/include/oup/observable_unique_ptr.hpp
21-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/oup)
21+
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/oup)
2222
install(TARGETS oup EXPORT oup-targets)
2323

2424
install(EXPORT oup-targets
25-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oup COMPONENT Development)
25+
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oup COMPONENT Development)
2626

2727
export(EXPORT oup-targets)
2828

@@ -31,13 +31,13 @@ include(CMakePackageConfigHelpers)
3131
configure_package_config_file(
3232
"${PROJECT_SOURCE_DIR}/cmake/oup-config.cmake.in"
3333
"${PROJECT_BINARY_DIR}/oup-config.cmake"
34-
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}
34+
INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
3535
NO_CHECK_REQUIRED_COMPONENTS_MACRO
3636
NO_SET_AND_CHECK_MACRO)
3737

3838
install(FILES
3939
"${PROJECT_BINARY_DIR}/oup-config.cmake"
40-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oup COMPONENT Development)
40+
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/oup COMPONENT Development)
4141

4242
# Setup tests
4343
if (OUP_DO_TEST)

0 commit comments

Comments
 (0)