Skip to content

Commit

Permalink
Merge pull request #4 from gabm/master
Browse files Browse the repository at this point in the history
Problem: cppfs cannot be installed to non-system directories in system-dir-install
  • Loading branch information
Stefan Buschmann authored Jul 16, 2017
2 parents f96c714 + c841456 commit bc221a2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ option(OPTION_SELF_CONTAINED "Create a self-contained install with all dependenc
option(OPTION_BUILD_TESTS "Build tests." ON)
option(OPTION_BUILD_DOCS "Build documentation." OFF)
option(OPTION_BUILD_EXAMPLES "Build examples." OFF)
option(OPTION_FORCE_SYSTEM_DIR_INSTALL "Force system dir install" OFF)


#
Expand Down Expand Up @@ -119,7 +120,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU
endif()

# Installation paths
if(UNIX AND SYSTEM_DIR_INSTALL)
if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL)
# Install into the system (/usr/bin or /usr/local/bin)
set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
Expand Down

0 comments on commit bc221a2

Please sign in to comment.