diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index b6abfef55..9ea68c931 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -31,5 +31,5 @@ if (DOXYGEN_FOUND) COMMENT "Generating API documentation with Doxygen" VERBATIM) install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR}) + DESTINATION share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR}) endif() diff --git a/ogre/src/CMakeLists.txt b/ogre/src/CMakeLists.txt index c50430c0e..ff5615a36 100644 --- a/ogre/src/CMakeLists.txt +++ b/ogre/src/CMakeLists.txt @@ -46,7 +46,7 @@ gz_build_tests(TYPE UNIT ENVIRONMENT GZ_RENDERING_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}) # Note that plugins are currently being installed in 2 places: /lib and the engine-plugins dir -install(TARGETS ${ogre_target} DESTINATION ${GZ_RENDERING_ENGINE_INSTALL_DIR}) +install(TARGETS ${ogre_target} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) if(WIN32) # tests needs .dll in the same directory @@ -66,7 +66,7 @@ if (WIN32) ${GZ_RENDERING_ENGINE_INSTALL_DIR}\/${unversioned})") else() EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${versioned} ${unversioned}) - INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_INSTALL_DIR}) + INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) endif() add_subdirectory(media) diff --git a/ogre/src/media/fonts/CMakeLists.txt b/ogre/src/media/fonts/CMakeLists.txt index 67ee66c4a..5a21ac22b 100644 --- a/ogre/src/media/fonts/CMakeLists.txt +++ b/ogre/src/media/fonts/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB files "*ttf" "*png" "*fontdef") -install(FILES ${files} DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/ogre/media/fonts) -install(DIRECTORY liberation-sans DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/ogre/media/fonts) +install(FILES ${files} DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/ogre/media/fonts) +install(DIRECTORY liberation-sans DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/ogre/media/fonts) diff --git a/ogre/src/media/materials/programs/CMakeLists.txt b/ogre/src/media/materials/programs/CMakeLists.txt index 8d19dd395..a3391dbc7 100644 --- a/ogre/src/media/materials/programs/CMakeLists.txt +++ b/ogre/src/media/materials/programs/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB files "*.glsl") -install(FILES ${files} DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/ogre/media/materials/programs) +install(FILES ${files} DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/ogre/media/materials/programs) diff --git a/ogre/src/media/materials/scripts/CMakeLists.txt b/ogre/src/media/materials/scripts/CMakeLists.txt index b739e94f8..3d43bb392 100644 --- a/ogre/src/media/materials/scripts/CMakeLists.txt +++ b/ogre/src/media/materials/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB files "*.material" "*.compositor") -install(FILES ${files} DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/ogre/media/materials/scripts) +install(FILES ${files} DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/ogre/media/materials/scripts) diff --git a/ogre/src/media/materials/textures/CMakeLists.txt b/ogre/src/media/materials/textures/CMakeLists.txt index 90f0fc4de..abcd5f9fb 100644 --- a/ogre/src/media/materials/textures/CMakeLists.txt +++ b/ogre/src/media/materials/textures/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB files "*.png") -install(FILES ${files} DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/ogre/media/materials/textures) +install(FILES ${files} DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/ogre/media/materials/textures) diff --git a/ogre/src/media/rtshaderlib150/CMakeLists.txt b/ogre/src/media/rtshaderlib150/CMakeLists.txt index 2cb12d93f..2aae04baf 100644 --- a/ogre/src/media/rtshaderlib150/CMakeLists.txt +++ b/ogre/src/media/rtshaderlib150/CMakeLists.txt @@ -10,5 +10,5 @@ SGXLib_NormalMapLighting.glsl SGXLib_PerPixelLighting.glsl ) -install(FILES ${files} DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/ogre/media/rtshaderlib150) +install(FILES ${files} DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/ogre/media/rtshaderlib150) diff --git a/ogre2/src/CMakeLists.txt b/ogre2/src/CMakeLists.txt index ef328190a..0111d3200 100644 --- a/ogre2/src/CMakeLists.txt +++ b/ogre2/src/CMakeLists.txt @@ -72,7 +72,7 @@ set (versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_LOWER}-${engine_name set (unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) # Note that plugins are currently being installed in 2 places: /lib and the engine-plugins dir -install(TARGETS ${ogre2_target} DESTINATION ${GZ_RENDERING_ENGINE_INSTALL_DIR}) +install(TARGETS ${ogre2_target} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) if (WIN32) # disable MSVC inherit via dominance warning @@ -82,7 +82,7 @@ if (WIN32) ${GZ_RENDERING_ENGINE_INSTALL_DIR}\/${unversioned})") else() EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${versioned} ${unversioned}) - INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_INSTALL_DIR}) + INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) endif() if (NOT (APPLE OR WIN32)) @@ -100,4 +100,4 @@ gz_build_tests(TYPE UNIT LIB_DEPS ${ogre2_target} ENVIRONMENT GZ_RENDERING_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}) -install(DIRECTORY "media" DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/ogre2) +install(DIRECTORY "media" DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/ogre2) diff --git a/optix/src/CMakeLists.txt b/optix/src/CMakeLists.txt index daa896a29..d8bb16d7b 100644 --- a/optix/src/CMakeLists.txt +++ b/optix/src/CMakeLists.txt @@ -46,7 +46,7 @@ gz_build_tests(TYPE UNIT ENVIRONMENT GZ_RENDERING_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}) # Note that plugins are currently being installed in 2 places: /lib and the engine-plugins dir -install(TARGETS ${optix_target} DESTINATION ${GZ_RENDERING_ENGINE_INSTALL_DIR}) +install(TARGETS ${optix_target} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) set (versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) set (unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) @@ -59,7 +59,7 @@ if (WIN32) ${GZ_RENDERING_ENGINE_INSTALL_DIR}\/${unversioned})") else() EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${versioned} ${unversioned}) - INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_INSTALL_DIR}) + INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) endif() if("${CUDA_VERSION}" VERSION_LESS "9") diff --git a/src/base/media/materials/textures/CMakeLists.txt b/src/base/media/materials/textures/CMakeLists.txt index 5d9f3f249..c76e3cd25 100644 --- a/src/base/media/materials/textures/CMakeLists.txt +++ b/src/base/media/materials/textures/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB files "*.png") -install(FILES ${files} DESTINATION ${GZ_RENDERING_RESOURCE_PATH}/media/materials/textures) +install(FILES ${files} DESTINATION ${GZ_RENDERING_RELATIVE_RESOURCE_PATH}/media/materials/textures)