Add latest q4a/xray-16 linux changes (merge)

Author: Zegeri

CMakeLists.txt

@@ -4,8 +4,54 @@ project(OpenXRay)
 include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
+if(NOT WIN32)
+	set(CMAKE_INSTALL_PREFIX "") # Skip all *nix-style installing for a while. Use DESTDIR
+endif()
+
 include(cotire)
 
+function(xr_install tgt)
+	if(NOT MSVC)
+		install(TARGETS ${tgt} DESTINATION "."
+			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+				GROUP_READ GROUP_EXECUTE
+				WORLD_READ WORLD_EXECUTE) # chmod 755
+	else()
+		install(TARGETS ${tgt}
+			CONFIGURATIONS Debug
+			RUNTIME DESTINATION Debug/
+			LIBRARY DESTINATION Debug/)
+		install(FILES $<TARGET_PDB_FILE:${tgt}>
+			CONFIGURATIONS Debug
+			DESTINATION Debug/ )
+		install(TARGETS ${tgt}
+			CONFIGURATIONS Release
+			RUNTIME DESTINATION Release/
+			LIBRARY DESTINATION Release/)
+	endif()
+endfunction()
+
+# Use only if install defined outside target directory(like luabind, for example)
+function(xr_install_file tgt)
+        if(NOT MSVC)
+                install(FILES $<TARGET_FILE:${tgt}> DESTINATION "."
+                        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                                GROUP_READ GROUP_EXECUTE
+                                WORLD_READ WORLD_EXECUTE) # chmod 755
+        else()
+                install($<TARGET_FILE:${tgt}>
+                        CONFIGURATIONS Debug
+                        RUNTIME DESTINATION Debug/)
+                install(FILES $<TARGET_PDB_FILE:${tgt}>
+                        CONFIGURATIONS Debug
+                        DESTINATION Debug/ )
+                install($<TARGET_FILE:${tgt}>
+                        CONFIGURATIONS Release
+                        RUNTIME DESTINATION Release/)
+        endif()
+endfunction()
+
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
@@ -34,6 +80,8 @@ elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
     set(LUA_LIBRARIES luajit-debug)
 endif()
 
+set(LUA_FOUND true)
+
 message("CMake build ${CMAKE_BUILD_TYPE}, CFLAGS=${CMAKE_C_FLAGS}, CXXFLAGS=${CMAKE_CXX_FLAGS}")
 
 add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL)

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)

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})

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})

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})