Skip to content

Commit 269155c

Browse files
CMake: set reasonable default value for CMAKE_INSTALL_PREFIX
1 parent 38c6b7e commit 269155c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,12 @@ file(RELATIVE_PATH DILIGENT_CORE_DIR "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOUR
429429
SET(DILIGENT_CORE_DIR ${DILIGENT_CORE_DIR} CACHE INTERNAL "Diligent Core installation directory")
430430

431431
SET(DILIGENT_CORE_INSTALL_LIBS_LIST "" CACHE INTERNAL "Core libraries installation list")
432-
# CMAKE_INSTALL_PREFIX must be absolute otherwise rpath won't work
433-
if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
434-
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_PREFIX}" CACHE FILEPATH "Installation path" FORCE)
432+
433+
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
434+
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation path" FORCE)
435+
elseif (NOT IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
436+
# CMAKE_INSTALL_PREFIX must be absolute otherwise rpath won't work
437+
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_PREFIX}" CACHE PATH "Installation path" FORCE)
435438
message("Transformed CMAKE_INSTALL_PREFIX into absolute path: " ${CMAKE_INSTALL_PREFIX})
436439
endif()
437440

0 commit comments

Comments
 (0)