Skip to content

Commit 520d2e0

Browse files
authored
Merge pull request #2 from MCWertGaming/cmake_fix
fixed cmake install
2 parents fb9417d + 3a8b842 commit 520d2e0

File tree

2 files changed

+32
-18
lines changed

2 files changed

+32
-18
lines changed

CMakeLists.txt

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@ set_target_properties(cpp-terminal PROPERTIES
2626
PUBLIC_HEADER "cpp-terminal/terminal.h;cpp-terminal/terminal_base.h;cpp-terminal/version.h"
2727
)
2828

29-
set(CPPTERMINAL_CMAKECONFIG_INCLUDE_DIR "include" CACHE STRING "install include directory")
30-
include(CMakePackageConfigHelpers)
31-
configure_package_config_file(${PROJECT_NAME}Config.cmake.in
32-
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
33-
INSTALL_DESTINATION lib/${PROJECT_NAME}/cmake
34-
PATH_VARS CPPTERMINAL_CMAKECONFIG_INCLUDE_DIR)
35-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
36-
DESTINATION lib/${PROJECT_NAME}/cmake )
37-
38-
3929
if (CPPTERMINAL_ENABLE_TESING)
4030
enable_testing()
4131
add_subdirectory(tests)
@@ -46,10 +36,40 @@ if (CPPTERMINAL_BUILD_EXAMPLES)
4636
endif()
4737

4838
if (CPPTERMINAL_ENABLE_INSTALL)
49-
install(TARGETS cpp-terminal
39+
install(TARGETS cpp-terminal EXPORT cpp-terminalTargets
5040
RUNTIME DESTINATION bin
5141
LIBRARY DESTINATION lib
5242
ARCHIVE DESTINATION lib
5343
PUBLIC_HEADER DESTINATION include/cpp-terminal
5444
)
45+
46+
include(CMakePackageConfigHelpers)
47+
48+
write_basic_package_version_file(
49+
"${CMAKE_CURRENT_BINARY_DIR}/cpp-terminal/cpp-terminalConfigVersion.cmake"
50+
VERSION ${CPPTERMINAL_VERSION}
51+
COMPATIBILITY AnyNewerVersion
52+
)
53+
54+
export(EXPORT cpp-terminalTargets
55+
FILE "${CMAKE_CURRENT_BINARY_DIR}/cpp-terminal/cpp-terminalTargets.cmake"
56+
)
57+
58+
set(ConfigPackageLocation lib/cmake/cpp-terminal)
59+
60+
configure_file(cpp-terminalConfig.cmake.in
61+
"${CMAKE_CURRENT_BINARY_DIR}/cpp-terminal/cpp-terminalConfig.cmake"
62+
)
63+
64+
install(
65+
FILES
66+
"${CMAKE_CURRENT_BINARY_DIR}/cpp-terminal/cpp-terminalConfig.cmake"
67+
"${CMAKE_CURRENT_BINARY_DIR}/cpp-terminal/cpp-terminalConfigVersion.cmake"
68+
"${CMAKE_CURRENT_BINARY_DIR}/cpp-terminal/cpp-terminalTargets.cmake"
69+
DESTINATION
70+
${ConfigPackageLocation}
71+
COMPONENT
72+
Devel
73+
)
74+
5575
endif()

cpp-terminalConfig.cmake.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
@PACKAGE_INIT@
22

3-
set_and_check(@PROJECT_NAME@_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CPPTERMINAL_CMAKECONFIG_INCLUDE_DIR@")
4-
5-
check_required_components(@PROJECT_NAME@)
6-
7-
add_library(@PROJECT_NAME@ INTERFACE IMPORTED)
8-
set_property(TARGET @PROJECT_NAME@ PROPERTY INTERFACE_INCLUDE_DIRECTORIES
9-
${@PROJECT_NAME@_INCLUDE_DIR})
3+
include("${CMAKE_INSTALL_PREFIX}/${ConfigPackageLocation}/cpp-terminalTargets.cmake")

0 commit comments

Comments
 (0)