Fixed installation of tlo-parsing and vkext (#1105)

VKCOM · Oct 9, 2024 · 3385397 · 3385397
1 parent bed2e4d
commit 3385397
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/cmake/init-global-vars.cmake b/cmake/init-global-vars.cmake
@@ -71,10 +71,6 @@ set_property(SOURCE ${COMMON_DIR}/version-string.cpp
              PROPERTY COMPILE_DEFINITIONS
              COMMIT="${GIT_COMMIT} ${VERSION_SUFFIX}" BUILD_TIMESTAMP=${BUILD_TIMESTAMP})
 
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(CMAKE_INSTALL_PREFIX "/." CACHE PATH "install prefix" FORCE)
-endif()
-
 set(VK_INSTALL_DIR /usr/share/vkontakte)
 set(INSTALL_KPHP_SOURCE ${VK_INSTALL_DIR}/kphp_source)
 

diff --git a/vkext/vkext.cmake b/vkext/vkext.cmake
@@ -10,7 +10,7 @@ function(install_vkext PHP_VERSION)
 
     install(FILES ${OBJS_DIR}/vkext/modules${PHP_VERSION}/vkext.so
             COMPONENT ${COMPONENT_NAME}
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/${VKEXT_LIB_DESTINATION})
+            DESTINATION ${VKEXT_LIB_DESTINATION})
 
     install(FILES ${VKEXT_DIR}/vkext.ini
             COMPONENT ${COMPONENT_NAME}