diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-02-11 12:48:58 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-02-11 12:48:58 +0100 |
| commit | 94d90dd045463a540fe14880b1c04e2ce44a1efe (patch) | |
| tree | 90be7ed7f773d2d627341281373fd22473db21aa | |
| parent | Add CMake configuration, delete ninja files (diff) | |
| download | libmm-94d90dd045463a540fe14880b1c04e2ce44a1efe.tar.gz libmm-94d90dd045463a540fe14880b1c04e2ce44a1efe.zip | |
CMakeLists: include fixes, include tree structure modified
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | cmake/MMConfig.cmake.in | 2 | ||||
| -rw-r--r-- | include/mm (renamed from include/mm.hpp) | 0 | ||||
| -rw-r--r-- | include/mmvec.hpp (renamed from include/mm/mmvec.hpp) | 0 |
5 files changed, 15 insertions, 2 deletions
@@ -1,2 +1,3 @@ build .ninja* +CMakeFiles diff --git a/CMakeLists.txt b/CMakeLists.txt index c31e16b..6e7d073 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,8 +63,20 @@ install(TARGETS mm set_target_properties(mm PROPERTIES EXPORT_NAME MM) + +if ("${CMAKE_SYSTEM}" MATCHES "Linux") + +# too bad but no other simpler choise +file(GLOB INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + # install public headers -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(FILES ${INCLUDE_FILES} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mm +) + +endif() + +# TODO, install setup for windows too # export targets install(EXPORT mm-targets diff --git a/cmake/MMConfig.cmake.in b/cmake/MMConfig.cmake.in index c338eae..b2857ae 100644 --- a/cmake/MMConfig.cmake.in +++ b/cmake/MMConfig.cmake.in @@ -1,6 +1,6 @@ get_filename_component(MM_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -list(REMOVE_AT CMAKE_MODULE_PATH -1) +#list(REMOVE_AT CMAKE_MODULE_PATH -1) if (NOT TARGET MM::MM) include("${MM_CMAKE_DIR}/MMTargets.cmake") diff --git a/include/mm.hpp b/include/mm index 7e9f02b..7e9f02b 100644 --- a/include/mm.hpp +++ b/include/mm diff --git a/include/mm/mmvec.hpp b/include/mmvec.hpp index db3c390..db3c390 100644 --- a/include/mm/mmvec.hpp +++ b/include/mmvec.hpp |