Peter M. Groen / CLI11

Commit c72057d877c06a14f5c9ac29bf59334dd3e45e1f

Authored by Khem Raj
Committed by Henry Schreiner
1 parent b979d3a3

clang and cross-compile fixes (#373) 

* Add CLANG_TIDY check

Signed-off-by: Khem Raj <raj.khem@gmail.com>

* Use GNUInstallDirs instead of hard-coded path

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
CMakeLists.txt
  View file @c72057d
... ... @@ -75,7 +75,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
75 75 endif()
76 76 endif()
77 77  
78   - if(NOT CMAKE_VERSION VERSION_LESS 3.6)
  78 + if(NOT CMAKE_VERSION VERSION_LESS 3.6 AND CLANG_TIDY)
79 79 # Add clang-tidy if available
80 80 option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
81 81 find_program(
... ... @@ -146,17 +146,18 @@ endif()
146 146 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CLI11ConfigVersion.cmake.in"
147 147 "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" @ONLY)
148 148  
  149 +include(GNUInstallDirs)
149 150 # These installs only make sense for a local project
150 151 if(CUR_PROJ)
151 152 # Make version available in the install
152 153 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake"
153   - DESTINATION lib/cmake/CLI11)
  154 + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11)
154 155  
155 156 # Install the export target as a file
156 157 install(EXPORT CLI11Targets
157 158 FILE CLI11Config.cmake
158 159 NAMESPACE CLI11::
159   - DESTINATION lib/cmake/CLI11)
  160 + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11)
160 161  
161 162 # Use find_package on the installed package
162 163 export(TARGETS CLI11
... ...