From a22e20459e48892d308cd6ce45fb3b00e15ec005 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 2 Oct 2018 03:18:41 +0000 Subject: [PATCH] cmake: add xr_install where it's needed --- Externals/CMakeLists.txt | 1 + Externals/OPCODE/CMakeLists.txt | 1 + Externals/luajit.cmake | 1 + Externals/ode/CMakeLists.txt | 1 + src/Layers/xrAPI/CMakeLists.txt | 2 ++ src/Layers/xrRenderPC_GL/CMakeLists.txt | 2 ++ src/Layers/xrRenderPC_R1/CMakeLists.txt | 2 ++ src/utils/xrLC_Light/CMakeLists.txt | 1 + src/xrAICore/CMakeLists.txt | 1 + src/xrCDB/CMakeLists.txt | 1 + src/xrCore/CMakeLists.txt | 1 + src/xrEngine/CMakeLists.txt | 2 ++ src/xrGame/CMakeLists.txt | 1 + src/xrNetServer/CMakeLists.txt | 1 + src/xrParticles/CMakeLists.txt | 2 ++ src/xrPhysics/CMakeLists.txt | 2 ++ src/xrScriptEngine/CMakeLists.txt | 2 ++ src/xrSound/CMakeLists.txt | 2 ++ src/xr_3da/CMakeLists.txt | 1 + 19 files changed, 27 insertions(+) diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt index d455e1d53e8..decc338b6e2 100644 --- a/Externals/CMakeLists.txt +++ b/Externals/CMakeLists.txt @@ -1,5 +1,6 @@ include(luajit.cmake) add_subdirectory(luabind) +xr_install_file(luabind) add_subdirectory(cximage) #add_subdirectory(lzo) #add_subdirectory(NVTT) diff --git a/Externals/OPCODE/CMakeLists.txt b/Externals/OPCODE/CMakeLists.txt index 5797928e9b1..6007761748d 100644 --- a/Externals/OPCODE/CMakeLists.txt +++ b/Externals/OPCODE/CMakeLists.txt @@ -15,3 +15,4 @@ add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME} set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore) +xr_install(${PROJECT_NAME}) diff --git a/Externals/luajit.cmake b/Externals/luajit.cmake index 312fa658b21..91eec225069 100644 --- a/Externals/luajit.cmake +++ b/Externals/luajit.cmake @@ -319,6 +319,7 @@ endif() add_library( ${LIB_NAME} SHARED ${LJCORE_C} ${DEPS} ) set_target_properties ( ${LIB_NAME} PROPERTIES PREFIX "" ) target_link_libraries ( ${LIB_NAME} ${LIBS} ) + xr_install(${LIB_NAME}) #endif() if(NOT ${BUILD_LIB_ONLY}) diff --git a/Externals/ode/CMakeLists.txt b/Externals/ode/CMakeLists.txt index 45ce66cc6a4..70f3106768a 100644 --- a/Externals/ode/CMakeLists.txt +++ b/Externals/ode/CMakeLists.txt @@ -13,3 +13,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_D add_definitions(-DdSINGLE -D_SECURE_SCL=0 -DLINUX -D_cdecl= -D__forceinline=inline) add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES}) +xr_install(${PROJECT_NAME}) diff --git a/src/Layers/xrAPI/CMakeLists.txt b/src/Layers/xrAPI/CMakeLists.txt index 4775c6be095..c53478f7498 100644 --- a/src/Layers/xrAPI/CMakeLists.txt +++ b/src/Layers/xrAPI/CMakeLists.txt @@ -6,3 +6,5 @@ add_definitions(-DXRAPI_EXPORTS) add_library(${PROJECT_NAME} SHARED "xrAPI.cpp" "stdafx.h") set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") +xr_install(${PROJECT_NAME}) + diff --git a/src/Layers/xrRenderPC_GL/CMakeLists.txt b/src/Layers/xrRenderPC_GL/CMakeLists.txt index 87ed415056c..2d9eebbefb8 100644 --- a/src/Layers/xrRenderPC_GL/CMakeLists.txt +++ b/src/Layers/xrRenderPC_GL/CMakeLists.txt @@ -44,3 +44,5 @@ add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME} set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrCDB xrEngine xrParticles xrScriptEngine xrAPI GLEW luabind ${LUA_LIBRARIES}) +xr_install(${PROJECT_NAME}) + diff --git a/src/Layers/xrRenderPC_R1/CMakeLists.txt b/src/Layers/xrRenderPC_R1/CMakeLists.txt index a7429c30fde..16162f75f66 100644 --- a/src/Layers/xrRenderPC_R1/CMakeLists.txt +++ b/src/Layers/xrRenderPC_R1/CMakeLists.txt @@ -22,3 +22,5 @@ add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME} set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore luabind LuaJIT xrCDB xrEngine xrParticles xrScriptEngine xrAPI xrMiscMath ${SDL_LIBRARIES}) +xr_install(${PROJECT_NAME}) + diff --git a/src/utils/xrLC_Light/CMakeLists.txt b/src/utils/xrLC_Light/CMakeLists.txt index 03e99a7f170..1c440f36861 100644 --- a/src/utils/xrLC_Light/CMakeLists.txt +++ b/src/utils/xrLC_Light/CMakeLists.txt @@ -21,3 +21,4 @@ add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME} set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrCDB zlib xrLCUtil) +xr_install(${PROJECT_NAME}) diff --git a/src/xrAICore/CMakeLists.txt b/src/xrAICore/CMakeLists.txt index ea4968ce0c1..3ff9686bada 100644 --- a/src/xrAICore/CMakeLists.txt +++ b/src/xrAICore/CMakeLists.txt @@ -31,3 +31,4 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath xrAPI xrScriptEngine luabind ${LUA_LIBRARIES}) +xr_install(${PROJECT_NAME}) diff --git a/src/xrCDB/CMakeLists.txt b/src/xrCDB/CMakeLists.txt index e7eae983057..128c40d9f28 100644 --- a/src/xrCDB/CMakeLists.txt +++ b/src/xrCDB/CMakeLists.txt @@ -19,3 +19,4 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath OPCODE xrAPI ${SDL_LIBRARIES}) +xr_install(${PROJECT_NAME}) diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt index da38da1371f..4fe125698b3 100644 --- a/src/xrCore/CMakeLists.txt +++ b/src/xrCore/CMakeLists.txt @@ -33,3 +33,4 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrMiscMath ${SDL_LIBRARIES} ${LZO_LIBRARIES} ${CRYPTO++_LIBRARIES} ${PUGIXML_LIBRARY} ${TBB_LIBRARIES}) +xr_install(${PROJECT_NAME}) diff --git a/src/xrEngine/CMakeLists.txt b/src/xrEngine/CMakeLists.txt index 03bab6d667e..318bb1c4e09 100644 --- a/src/xrEngine/CMakeLists.txt +++ b/src/xrEngine/CMakeLists.txt @@ -35,3 +35,5 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath luabind xrAPI xrSound xrScriptEngine ${LUA_LIBRARIES} ${THEORA_LIBRARY} ${OGG_LIBRARIES} xrCDB xrPhysics ${FREEIMAGE_LIBRARY} openal ${LOCKFILE_LIBRARIES} ${SDL_LIBRARIES}) +xr_install(${PROJECT_NAME}) + diff --git a/src/xrGame/CMakeLists.txt b/src/xrGame/CMakeLists.txt index dbbf3130a01..019e8ecf7c9 100644 --- a/src/xrGame/CMakeLists.txt +++ b/src/xrGame/CMakeLists.txt @@ -114,3 +114,4 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrEngine xrMiscMath luabind xrAPI xrAICore xrSound xrScriptEngine cximage ${LUA_LIBRARIES} pugixml xrCDB xrPhysics ${SDL_LIBRARIES}) +xr_install(${PROJECT_NAME}) diff --git a/src/xrNetServer/CMakeLists.txt b/src/xrNetServer/CMakeLists.txt index bb7c4acb40d..2b607e389f3 100644 --- a/src/xrNetServer/CMakeLists.txt +++ b/src/xrNetServer/CMakeLists.txt @@ -19,3 +19,4 @@ add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME} set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore) +xr_install(${PROJECT_NAME}) diff --git a/src/xrParticles/CMakeLists.txt b/src/xrParticles/CMakeLists.txt index ac5f0bbcd43..cb7e344af62 100644 --- a/src/xrParticles/CMakeLists.txt +++ b/src/xrParticles/CMakeLists.txt @@ -23,3 +23,5 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath) +xr_install(${PROJECT_NAME}) + diff --git a/src/xrPhysics/CMakeLists.txt b/src/xrPhysics/CMakeLists.txt index 51881b70634..db5cc6ef8ca 100644 --- a/src/xrPhysics/CMakeLists.txt +++ b/src/xrPhysics/CMakeLists.txt @@ -29,3 +29,5 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath ODE xrScriptEngine xrAPI xrCDB xrSound) +xr_install(${PROJECT_NAME}) + diff --git a/src/xrScriptEngine/CMakeLists.txt b/src/xrScriptEngine/CMakeLists.txt index fde758ddf10..92ac900f8ce 100644 --- a/src/xrScriptEngine/CMakeLists.txt +++ b/src/xrScriptEngine/CMakeLists.txt @@ -21,3 +21,5 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrAPI xrCore luabind ${LUA_LIBRARIES}) +xr_install(${PROJECT_NAME}) + diff --git a/src/xrSound/CMakeLists.txt b/src/xrSound/CMakeLists.txt index 8cd1805d63a..952af48038b 100644 --- a/src/xrSound/CMakeLists.txt +++ b/src/xrSound/CMakeLists.txt @@ -32,3 +32,5 @@ cotire(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrMiscMath xrAPI xrCDB ${OGG_LIBRARIES} openal vorbis vorbisfile) +xr_install(${PROJECT_NAME}) + diff --git a/src/xr_3da/CMakeLists.txt b/src/xr_3da/CMakeLists.txt index 9fb22a59298..f5d0d09fdf5 100644 --- a/src/xr_3da/CMakeLists.txt +++ b/src/xr_3da/CMakeLists.txt @@ -19,3 +19,4 @@ add_executable(${PROJECT_NAME} ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__IN set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_link_libraries(${PROJECT_NAME} xrCore xrAPI xrEngine) +xr_install(${PROJECT_NAME})