]>
Commit | Line | Data |
---|---|---|
1 | diff --git a/libmodman/CMakeLists.txt b/libmodman/CMakeLists.txt | |
2 | index 0aff593..9e419ce 100644 | |
3 | --- a/libmodman/CMakeLists.txt | |
4 | +++ b/libmodman/CMakeLists.txt | |
5 | @@ -30,15 +30,15 @@ if(NOT WIN32 AND NOT APPLE) | |
6 | configure_file(libmodman-2.0.pc.in | |
7 | ${CMAKE_CURRENT_BINARY_DIR}/libmodman-2.0.pc @ONLY) | |
8 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmodman-2.0.pc | |
9 | - DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) | |
10 | + DESTINATION lib/pkgconfig) | |
11 | endif() | |
12 | ||
13 | # CMake Find helper | |
14 | -if (NOT WIN32 AND NOT APPLE) | |
15 | +if (1) | |
16 | configure_file(Findlibmodman.cmake.in | |
17 | ${CMAKE_CURRENT_BINARY_DIR}/Findlibmodman.cmake @ONLY) | |
18 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Findlibmodman.cmake | |
19 | - DESTINATION ${SHARE_INSTALL_DIR}/cmake/Modules) | |
20 | + DESTINATION share/${PROJECT_NAME}) | |
21 | endif() | |
22 | ||
23 | # Define the library itself | |
24 | @@ -50,8 +50,13 @@ if(NOT WIN32) | |
25 | target_link_libraries(modman dl) | |
26 | endif() | |
27 | set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1.0.0 SOVERSION 1) | |
28 | -install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR}) | |
29 | -install(FILES module_manager.hpp module.hpp DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}) | |
30 | +install( | |
31 | + TARGETS modman | |
32 | + RUNTIME DESTINATION bin | |
33 | + LIBRARY DESTINATION lib | |
34 | + ARCHIVE DESTINATION lib | |
35 | +) | |
36 | +install(FILES module_manager.hpp module.hpp DESTINATION include/${PROJECT_NAME}) | |
37 | ||
38 | ### Tests | |
39 | add_testdirectory(test) |