зеркало из https://github.com/microsoft/vcpkg.git
[urho3d] Remove from the registry. (#41451)
This commit is contained in:
Billy O'Neal
GitHub
Родитель
c45ac46dcc
Коммит
d84a84b087
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
|
||||
index 866fc22..ee02d2e 100644
|
||||
--- a/Source/CMakeLists.txt
|
||||
+++ b/Source/CMakeLists.txt
|
||||
@@ -147,8 +147,12 @@ endif ()
|
||||
|
||||
# In order to get clean module segregation, always exclude player/samples from AAR
|
||||
if (NOT ANDROID)
|
||||
+ if (URHO3D_BUILD_TOOLS)
|
||||
add_subdirectory (Tools)
|
||||
+ endif()
|
||||
+ if (URHO3D_BUILD_SAMPLES)
|
||||
add_subdirectory (Samples)
|
||||
+ endif()
|
||||
endif ()
|
||||
|
||||
if (URHO3D_EXTRAS)
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff --git a/Source/ThirdParty/AngelScript/CMakeLists.txt b/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||||
index 6709cf5fc..4842f20b1 100644
|
||||
--- a/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||||
@@ -44,10 +44,10 @@ if (ARM)
|
||||
elseif (MSVC AND URHO3D_64BIT)
|
||||
enable_language (ASM_MASM)
|
||||
# Commented out due to cmake bug - todo: Recheck if this workaround is still necessary when increasing CMake minimum version
|
||||
- #set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm)
|
||||
+ set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm)
|
||||
# As a temporary workaround
|
||||
- add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM")
|
||||
- set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm)
|
||||
+ #add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM")
|
||||
+ #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm)
|
||||
endif ()
|
||||
list (APPEND SOURCE_FILES ${ASM_FILES})
|
||||
|
||||
diff --git a/Source/ThirdParty/LibCpuId/CMakeLists.txt b/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||||
index 0aecafb06..677fd4b84 100644
|
||||
--- a/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||||
@@ -33,10 +33,10 @@ endif ()
|
||||
if (MSVC AND URHO3D_64BIT)
|
||||
enable_language (ASM_MASM)
|
||||
# Commented out due to cmake bug
|
||||
- #set (ASM_FILES src/masm-x64.asm)
|
||||
+ set (ASM_FILES src/masm-x64.asm)
|
||||
# As a temporary workaround
|
||||
- add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM")
|
||||
- set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm)
|
||||
+ #add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM")
|
||||
+ #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm)
|
||||
endif ()
|
||||
|
||||
# Define source files
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/Source/Urho3D/CMakeLists.txt b/Source/Urho3D/CMakeLists.txt
|
||||
index ae341cb3e..743302069 100644
|
||||
--- a/Source/Urho3D/CMakeLists.txt
|
||||
+++ b/Source/Urho3D/CMakeLists.txt
|
||||
@@ -316,6 +316,7 @@ if (URHO3D_LUA)
|
||||
else ()
|
||||
set (ALTERNATE_COMMAND CMAKE_COMMAND ${CMAKE_COMMAND} -E env CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND})
|
||||
endif ()
|
||||
+ set(CMAKE_DISABLE_SOURCE_CHANGES OFF)
|
||||
ExternalProject_Add (tolua++
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/toluapp/src/bin
|
||||
CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake
|
||||
index ad5fbd0..f1ee2e8 100644
|
||||
--- a/cmake/Modules/FindReadline.cmake
|
||||
+++ b/cmake/Modules/FindReadline.cmake
|
||||
@@ -48,4 +48,8 @@ endif ()
|
||||
include (FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args (Readline REQUIRED_VARS READLINE_LIBRARIES READLINE_INCLUDE_DIRS FAIL_MESSAGE "Could NOT find Readline development library")
|
||||
|
||||
+if (READLINE_FOUND)
|
||||
+ set(READLINE_LIBRARIES ${READLINE_LIBRARIES} curses)
|
||||
+endif()
|
||||
+
|
||||
mark_as_advanced (READLINE_INCLUDE_DIRS READLINE_LIBRARIES)
|
||||
diff --git a/cmake/Modules/UrhoCommon.cmake b/cmake/Modules/UrhoCommon.cmake
|
||||
index b196095..9dd0ee9 100644
|
||||
--- a/cmake/Modules/UrhoCommon.cmake
|
||||
+++ b/cmake/Modules/UrhoCommon.cmake
|
||||
@@ -226,9 +226,9 @@ if (CMAKE_PROJECT_NAME STREQUAL Urho3D)
|
||||
option (URHO3D_TESTING "Enable testing support")
|
||||
# By default this option is off (i.e. we use the MSVC dynamic runtime), this can be switched on if using Urho3D as a STATIC library
|
||||
cmake_dependent_option (URHO3D_STATIC_RUNTIME "Use static C/C++ runtime libraries and eliminate the need for runtime DLLs installation (VS only)" FALSE "MSVC" FALSE)
|
||||
- if (((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE) AND NOT ANDROID AND NOT IOS AND NOT TVOS AND NOT WEB AND NOT WIN32)
|
||||
+ if (URHO3D_ENABLE_READLINE AND ((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE) AND NOT ANDROID AND NOT IOS AND NOT TVOS AND NOT WEB AND NOT WIN32)
|
||||
# Find GNU Readline development library for Lua interpreter and SQLite's isql
|
||||
- find_package (Readline)
|
||||
+ find_package (Readline REQUIRED)
|
||||
endif ()
|
||||
if (CPACK_SYSTEM_NAME STREQUAL Linux)
|
||||
cmake_dependent_option (URHO3D_USE_LIB64_RPM "Enable 64-bit RPM CPack generator using /usr/lib64 and disable all other generators (Debian-based host only)" FALSE "URHO3D_64BIT AND NOT HAS_LIB64" FALSE)
|
||||
|
|
@ -1,187 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b8f54e9..1c23bbc 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -37,7 +37,6 @@ set (PATH_SUFFIX Urho3D)
|
||||
if (WIN32)
|
||||
set (SCRIPT_EXT .bat)
|
||||
if (CMAKE_HOST_WIN32)
|
||||
- set (PATH_SUFFIX .)
|
||||
if (URHO3D_64BIT AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
string (REPLACE " (x86)" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
endif ()
|
||||
@@ -45,7 +44,7 @@ if (WIN32)
|
||||
else ()
|
||||
set (SCRIPT_EXT .sh)
|
||||
endif ()
|
||||
-if (URHO3D_64BIT)
|
||||
+if (0)
|
||||
# Install to 'lib64' when one of these conditions is true
|
||||
if ((MINGW AND CMAKE_CROSSCOMPILING) OR URHO3D_USE_LIB64_RPM OR (HAS_LIB64 AND NOT URHO3D_USE_LIB_DEB))
|
||||
set (LIB_SUFFIX 64)
|
||||
@@ -59,7 +58,7 @@ set (DEST_LIBRARY_DIR lib${LIB_SUFFIX}/${PATH_SUFFIX})
|
||||
set (DEST_PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
|
||||
# Install application launcher scripts
|
||||
file (GLOB APP_SCRIPTS ${CMAKE_SOURCE_DIR}/bin/*${SCRIPT_EXT})
|
||||
-install (PROGRAMS ${APP_SCRIPTS} DESTINATION ${DEST_RUNTIME_DIR}) # DEST_RUNTIME_DIR variable is set by the set_output_directories() macro call in the UrhoCommon module
|
||||
+install (PROGRAMS ${APP_SCRIPTS} DESTINATION ${DEST_SHARE_DIR}/script) # DEST_RUNTIME_DIR variable is set by the set_output_directories() macro call in the UrhoCommon module
|
||||
# Install CMake modules and toolchains provided by and for Urho3D
|
||||
install (DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/ DESTINATION ${DEST_SHARE_DIR}/cmake) # Note: the trailing slash is significant
|
||||
# Install CMake build scripts and rakefile
|
||||
diff --git a/Docs/CMakeLists.txt b/Docs/CMakeLists.txt
|
||||
index 9993d07..9a58363 100644
|
||||
--- a/Docs/CMakeLists.txt
|
||||
+++ b/Docs/CMakeLists.txt
|
||||
@@ -99,7 +99,7 @@ if (DOXYGEN_FOUND)
|
||||
execute_process (COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt.new)
|
||||
file (GLOB_RECURSE API_PKG_FILES ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs/*.pkg)
|
||||
add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox
|
||||
- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -L ToDoxHook.lua -P -o ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt
|
||||
+ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -L ToDoxHook.lua -P -o ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt
|
||||
DEPENDS tolua++ ${API_PKG_FILES} ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs/ToDoxHook.lua
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs
|
||||
COMMENT "Dumping LuaScript API to LuaScriptAPI.dox")
|
||||
diff --git a/Source/ThirdParty/LuaJIT/CMakeLists.txt b/Source/ThirdParty/LuaJIT/CMakeLists.txt
|
||||
index f1ec925..c310fcc 100644
|
||||
--- a/Source/ThirdParty/LuaJIT/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/LuaJIT/CMakeLists.txt
|
||||
@@ -603,7 +603,7 @@ if (NOT CMAKE_PROJECT_NAME MATCHES ^Urho3D-ExternalProject-LuaJIT AND NOT IOS AN
|
||||
|
||||
# Install dependency files required by luajit
|
||||
if (DEST_RUNTIME_DIR)
|
||||
- install (DIRECTORY ${LUAJIT_DEP_DIR} DESTINATION ${DEST_RUNTIME_DIR})
|
||||
+ install (DIRECTORY ${LUAJIT_DEP_DIR} DESTINATION share/Urho3D)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
diff --git a/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt b/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt
|
||||
index 0cd69fc..e761ef6 100644
|
||||
--- a/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt
|
||||
@@ -52,7 +52,7 @@ if (URHO3D_UPDATE_SOURCE_TREE)
|
||||
endif ()
|
||||
file (GLOB TOLUA lua/*.lua)
|
||||
add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c
|
||||
- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -o ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c -H ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.h -n tolua tolua_scons.pkg 2>${NULL_DEVICE} || ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/toluabind.c ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c
|
||||
+ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -o ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c -H ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.h -n tolua tolua_scons.pkg 2>${NULL_DEVICE} || ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/toluabind.c ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c
|
||||
${UPDATE_COMMAND}
|
||||
DEPENDS ${TOLUA} tolua_scons.pkg
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt
|
||||
index 65b59d9..db8f5cd 100644
|
||||
--- a/Source/Tools/CMakeLists.txt
|
||||
+++ b/Source/Tools/CMakeLists.txt
|
||||
@@ -51,24 +51,24 @@ if (CMAKE_CROSSCOMPILING)
|
||||
if (URHO3D_PACKAGING)
|
||||
ExternalProject_Add (PackageTool
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Tools/PackageTool
|
||||
- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
+ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
${ALTERNATE_COMMAND})
|
||||
add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/PackageTool)
|
||||
if (CMAKE_HOST_WIN32 AND NOT HAS_MKLINK)
|
||||
add_dependencies (PackageTool Urho3D) # Ensure Urho3D headers are fresh when building PackageTool externally on Windows host system without MKLINK
|
||||
endif ()
|
||||
- install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/PackageTool DESTINATION ${DEST_RUNTIME_DIR}/tool)
|
||||
+ install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/PackageTool DESTINATION ${DEST_RUNTIME_DIR})
|
||||
endif ()
|
||||
if (URHO3D_GENERATEBINDINGS)
|
||||
ExternalProject_Add (BindingGenerator
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Tools/BindingGenerator
|
||||
- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
+ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
${ALTERNATE_COMMAND})
|
||||
add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator)
|
||||
if (CMAKE_HOST_WIN32 AND NOT HAS_MKLINK)
|
||||
add_dependencies (BindingGenerator Urho3D)
|
||||
endif ()
|
||||
- install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator DESTINATION ${DEST_RUNTIME_DIR}/tool)
|
||||
+ install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator DESTINATION ${DEST_RUNTIME_DIR})
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
diff --git a/Source/Urho3D/CMakeLists.txt b/Source/Urho3D/CMakeLists.txt
|
||||
index 7433020..8161011 100644
|
||||
--- a/Source/Urho3D/CMakeLists.txt
|
||||
+++ b/Source/Urho3D/CMakeLists.txt
|
||||
@@ -283,7 +283,7 @@ if (URHO3D_BINDINGS)
|
||||
endif ()
|
||||
ExternalProject_Add (AutoBinder
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Clang-Tools
|
||||
- CMAKE_ARGS -D URHO3D_CLANG_TOOLS=AutoBinder -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool/clang -D DEST_INCLUDE_DIR=${DEST_INCLUDE_DIR} -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
+ CMAKE_ARGS -D URHO3D_CLANG_TOOLS=AutoBinder -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d/clang -D DEST_INCLUDE_DIR=${DEST_INCLUDE_DIR} -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
${ALTERNATE_COMMAND})
|
||||
add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/clang/AutoBinder)
|
||||
file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/generated)
|
||||
@@ -319,10 +319,10 @@ if (URHO3D_LUA)
|
||||
set(CMAKE_DISABLE_SOURCE_CHANGES OFF)
|
||||
ExternalProject_Add (tolua++
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/toluapp/src/bin
|
||||
- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
+ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
|
||||
${TRAVIS_ANDROID_FIX}
|
||||
${ALTERNATE_COMMAND})
|
||||
- add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/tolua++)
|
||||
+ add_make_clean_files (${CMAKE_BINARY_DIR}/tools/urho3d/tolua++)
|
||||
else ()
|
||||
# Otherwise, build it internally as per normal
|
||||
add_subdirectory (../ThirdParty/toluapp/src/bin ../ThirdParty/toluapp/src/bin)
|
||||
@@ -343,7 +343,7 @@ if (URHO3D_LUA)
|
||||
list (APPEND LUA_GEN_CPP_FILES ${GEN_CPP_FILE})
|
||||
file (GLOB PKG_FILES LuaScript/pkgs/${DIR}/*.pkg)
|
||||
add_custom_command (OUTPUT ${GEN_CPP_FILE}
|
||||
- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${GEN_CPP_FILE} ${NAME}
|
||||
+ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${GEN_CPP_FILE} ${NAME}
|
||||
DEPENDS tolua++ ${API_PKG_FILE} ${PKG_FILES} LuaScript/pkgs/ToCppHook.lua
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaScript/pkgs
|
||||
COMMENT "Generating tolua++ API binding on the fly for ${DIR}")
|
||||
diff --git a/cmake/Modules/UrhoCommon.cmake b/cmake/Modules/UrhoCommon.cmake
|
||||
index cfac648..b196095 100644
|
||||
--- a/cmake/Modules/UrhoCommon.cmake
|
||||
+++ b/cmake/Modules/UrhoCommon.cmake
|
||||
@@ -1358,7 +1358,7 @@ macro (find_Urho3D_tool VAR NAME)
|
||||
find_program (${VAR} ${NAME} HINTS ${ARG_HINTS} PATHS ${ARG_PATHS} PATH_SUFFIXES ${ARG_PATH_SUFFIXES} DOC ${ARG_DOC} NO_DEFAULT_PATH)
|
||||
mark_as_advanced (${VAR}) # Hide it from cmake-gui in non-advanced mode
|
||||
if (NOT ${VAR})
|
||||
- set (${VAR} ${CMAKE_BINARY_DIR}/bin/tool/${NAME})
|
||||
+ set (${VAR} ${CMAKE_BINARY_DIR}/tools/urho3d/${NAME})
|
||||
if (ARG_MSG_MODE AND NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
|
||||
message (${ARG_MSG_MODE}
|
||||
"Could not find ${VAR} tool in the Urho3D build tree or Urho3D SDK. Your project may not build successfully without this tool. "
|
||||
@@ -1515,8 +1515,8 @@ macro (setup_executable)
|
||||
if (ARG_TOOL)
|
||||
list (APPEND TARGET_PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES)
|
||||
if (NOT ARG_PRIVATE AND NOT DEST_RUNTIME_DIR MATCHES tool)
|
||||
- set_output_directories (${CMAKE_BINARY_DIR}/bin/tool LOCAL RUNTIME PDB)
|
||||
- set (RUNTIME_DIR ${CMAKE_BINARY_DIR}/bin/tool)
|
||||
+ set_output_directories (${CMAKE_BINARY_DIR}/tools/urho3d LOCAL RUNTIME PDB)
|
||||
+ set (RUNTIME_DIR ${CMAKE_BINARY_DIR}/tools/urho3d)
|
||||
endif ()
|
||||
endif ()
|
||||
if (NOT ARG_NODEPS)
|
||||
@@ -1570,7 +1570,6 @@ macro (setup_executable)
|
||||
endif ()
|
||||
if (DIRECT3D_DLL AND NOT DIRECT3D_DLL_INSTALLED)
|
||||
# Make a copy of the D3D DLL to the runtime directory in the installed location
|
||||
- install (FILES ${DIRECT3D_DLL} DESTINATION ${DEST_RUNTIME_DIR})
|
||||
set (DIRECT3D_DLL_INSTALLED TRUE)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -1692,7 +1691,7 @@ macro (setup_main_executable)
|
||||
if (URHO3D_PACKAGING)
|
||||
# Urho3D project builds the PackageTool as required; downstream project uses PackageTool found in the Urho3D build tree or Urho3D SDK
|
||||
find_Urho3d_tool (PACKAGE_TOOL PackageTool
|
||||
- HINTS ${CMAKE_BINARY_DIR}/bin/tool ${URHO3D_HOME}/bin/tool
|
||||
+ HINTS ${CMAKE_BINARY_DIR}/tools/urho3d ${URHO3D_HOME}/bin/tool
|
||||
DOC "Path to PackageTool" MSG_MODE WARNING)
|
||||
if (CMAKE_PROJECT_NAME STREQUAL Urho3D)
|
||||
set (PACKAGING_DEP DEPENDS PackageTool)
|
||||
@@ -1741,7 +1740,7 @@ macro (setup_main_executable)
|
||||
foreach (DIR ${RESOURCE_DIRS})
|
||||
list (FIND INSTALLED_RESOURCE_DIRS ${DIR} FOUND_INDEX)
|
||||
if (FOUND_INDEX EQUAL -1)
|
||||
- install (DIRECTORY ${DIR} DESTINATION ${DEST_SHARE_DIR}/resources)
|
||||
+ install (DIRECTORY ${DIR} DESTINATION tools/urho3d)
|
||||
list (APPEND INSTALLED_RESOURCE_DIRS ${DIR})
|
||||
endif ()
|
||||
# This cache variable is used to keep track of whether a resource directory has been instructed to be installed by CMake or not
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
diff --git a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
|
||||
index 6378d46..c8563db 100644
|
||||
--- a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
|
||||
+++ b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
|
||||
@@ -38,6 +38,9 @@
|
||||
#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
|
||||
# include <io.h>
|
||||
#endif
|
||||
+#ifdef __APPLE__
|
||||
+# include <unistd.h>
|
||||
+#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
# define WIDECHAR
|
||||
diff --git a/Source/ThirdParty/Civetweb/src/civetweb.c b/Source/ThirdParty/Civetweb/src/civetweb.c
|
||||
index 4d26e0a..2bd577e 100644
|
||||
--- a/Source/ThirdParty/Civetweb/src/civetweb.c
|
||||
+++ b/Source/ThirdParty/Civetweb/src/civetweb.c
|
||||
@@ -167,6 +167,8 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check");
|
||||
|
||||
#endif
|
||||
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
#if !defined(DEBUG_TRACE)
|
||||
#if defined(DEBUG)
|
||||
|
||||
diff --git a/Source/ThirdParty/SDL/CMakeLists.txt b/Source/ThirdParty/SDL/CMakeLists.txt
|
||||
index 5c4ef27..fd4c4dd 100644
|
||||
--- a/Source/ThirdParty/SDL/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/SDL/CMakeLists.txt
|
||||
@@ -428,15 +428,6 @@ if(USE_GCC OR USE_CLANG)
|
||||
list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing")
|
||||
endif()
|
||||
|
||||
- check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
|
||||
- if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
|
||||
- check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT)
|
||||
- # Urho3D - bug fix - SDL does not build cleanly for Android platform with this flag on, make a tweak here rather than changing on their code
|
||||
- if(HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT AND NOT ANDROID)
|
||||
- list(APPEND EXTRA_CFLAGS "-Werror=declaration-after-statement")
|
||||
- endif()
|
||||
- list(APPEND EXTRA_CFLAGS "-Wdeclaration-after-statement")
|
||||
- endif()
|
||||
|
||||
if(DEPENDENCY_TRACKING)
|
||||
check_c_source_compiles("
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO urho3d/Urho3D
|
||||
REF fff115a0c0cd50b8a34dfa20b4c5f33eb4f765c8
|
||||
SHA512 d13d310dc4711a305b3d8ee3497e4d3169f0219714f9658dcdc0c771a1834092aa7f2bc1778bc7cb41bd01ab0e52edc061c1a79d1163d454e56b2b8377b8fcea
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
asm_files.patch
|
||||
macosx.patch
|
||||
shared_libs.patch
|
||||
externalproject.patch
|
||||
add_options.patch
|
||||
fix-install.patch
|
||||
fix-dependency-readline.patch
|
||||
)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
set(URHO3D_LIB_TYPE "STATIC")
|
||||
else()
|
||||
set(URHO3D_LIB_TYPE "SHARED")
|
||||
endif()
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
readline URHO3D_ENABLE_READLINE
|
||||
tools URHO3D_BUILD_TOOLS
|
||||
examples URHO3D_BUILD_SAMPLES
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
-DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE}
|
||||
-DURHO3D_PCH=OFF
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Urho3D/CMake/Modules")
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/Urho3D/CMake/Modules)
|
||||
endif()
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/share/CMake/Modules")
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/CMake/Modules)
|
||||
endif()
|
||||
|
||||
# Handle tools
|
||||
if ("tools" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID)
|
||||
vcpkg_copy_tools(TOOL_NAMES AssetImporter OgreImporter PackageTool RampGenerator ScriptCompiler SpritePacker
|
||||
SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/urho3d"
|
||||
AUTO_CLEAN
|
||||
)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/tool" "${CURRENT_PACKAGES_DIR}/debug/bin/tool")
|
||||
|
||||
vcpkg_copy_tools(TOOL_NAMES Urho3DPlayer AUTO_CLEAN)
|
||||
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/Urho3DPlayer_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
|
||||
# Handle examples
|
||||
if ("examples" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID)
|
||||
file(GLOB URHO3D_BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
||||
foreach(URHO3D_BINARY ${URHO3D_BINARIES})
|
||||
get_filename_component(BINARY_NAME ${URHO3D_BINARY} NAME_WE)
|
||||
if (BINARY_NAME MATCHES "[0-9][0-9]\_.+")
|
||||
list(APPEND URHO3D_TOOLS ${BINARY_NAME})
|
||||
endif()
|
||||
endforeach()
|
||||
vcpkg_copy_tools(TOOL_NAMES ${URHO3D_TOOLS} AUTO_CLEAN)
|
||||
|
||||
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||
foreach(URHO3D_TOOL IN_LIST ${URHO3D_TOOLS})
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${URHO3D_TOOL}_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
||||
endforeach()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/luajit${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
||||
list(APPEND LUA_EXES "luajit")
|
||||
endif()
|
||||
if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/lua${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
||||
list(APPEND LUA_EXES "lua")
|
||||
endif()
|
||||
if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/luac${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
||||
list(APPEND LUA_EXES "luac")
|
||||
endif()
|
||||
vcpkg_copy_tools(TOOL_NAMES ${LUA_EXES} AUTO_CLEAN)
|
||||
|
||||
# Cleanup
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
# Fix includes
|
||||
list(APPEND SDL_RELATED_HEADERS
|
||||
"${CURRENT_PACKAGES_DIR}/include/Urho3D/Input/InputConstants.h"
|
||||
"${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/NamedPipe.h"
|
||||
"${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/RWOpsWrapper.h"
|
||||
)
|
||||
foreach (SDL_RELATED_HEADER IN LISTS SDL_RELATED_HEADERS)
|
||||
vcpkg_replace_string("${SDL_RELATED_HEADER}"
|
||||
"#include <SDL/"
|
||||
"#include <Urho3D/ThirdParty/SDL/"
|
||||
)
|
||||
endforeach()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/Urho3D/LuaScript/pkgs")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/Urho3D/ThirdParty/LuaJIT/jit")
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
@ -1,337 +0,0 @@
|
|||
diff --git a/Source/ThirdParty/AngelScript/CMakeLists.txt b/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||||
index 763dacd9c..3507c0d28 100644
|
||||
--- a/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||||
@@ -58,7 +58,7 @@ list (APPEND SOURCE_FILES ${ASM_FILES})
|
||||
set (INCLUDE_DIRS include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library (install dependency for Urho3D/Script/APITemplates.h)
|
||||
install_header_files (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/AngelScript FILES_MATCHING PATTERN *.h) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/Assimp/code/CMakeLists.txt b/Source/ThirdParty/Assimp/code/CMakeLists.txt
|
||||
index bdd82340e..55839dae0 100644
|
||||
--- a/Source/ThirdParty/Assimp/code/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/Assimp/code/CMakeLists.txt
|
||||
@@ -938,7 +938,7 @@ set (SOURCE_FILES ${assimp_src})
|
||||
list (APPEND TARGET_PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
|
||||
TARGET_LINK_LIBRARIES(Assimp optimized ${C4D_RELEASE_LIBRARIES})
|
||||
diff --git a/Source/ThirdParty/Box2D/CMakeLists.txt b/Source/ThirdParty/Box2D/CMakeLists.txt
|
||||
index 6768fe4c0..2ca2c89e6 100644
|
||||
--- a/Source/ThirdParty/Box2D/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/Box2D/CMakeLists.txt
|
||||
@@ -183,7 +183,7 @@ source_group(Rope FILES ${BOX2D_Rope_SRCS} ${BOX2D_Rope_HDRS})
|
||||
set (INCLUDE_DIRS .)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library (install dependency for Urho3D/Urho2D/PhysicsWorld2D.h and Urho3D/Urho2D/RigidBody2D.h)
|
||||
install_header_files (DIRECTORY Box2D DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty FILES_MATCHING PATTERN *.h)
|
||||
diff --git a/Source/ThirdParty/Bullet/CMakeLists.txt b/Source/ThirdParty/Bullet/CMakeLists.txt
|
||||
index 3e0419087..dbd506af0 100644
|
||||
--- a/Source/ThirdParty/Bullet/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/Bullet/CMakeLists.txt
|
||||
@@ -41,7 +41,7 @@ define_source_files (RECURSE GLOB_CPP_PATTERNS src/*.cpp GLOB_H_PATTERNS src/*.h
|
||||
set (INCLUDE_DIRS src)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library (install dependency for Urho3D/Physics/PhysicsWorld.h, Urho3D/Physics/RigidBody.h, and Urho3D/Physics/PhysicsUtils.h)
|
||||
install_header_files (DIRECTORY src/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/Bullet FILES_MATCHING PATTERN *.h) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/Civetweb/CMakeLists.txt b/Source/ThirdParty/Civetweb/CMakeLists.txt
|
||||
index a2d41caad..6b64ed719 100644
|
||||
--- a/Source/ThirdParty/Civetweb/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/Civetweb/CMakeLists.txt
|
||||
@@ -61,7 +61,7 @@ define_source_files (GLOB_CPP_PATTERNS src/*.c GLOB_H_PATTERNS include/*.h)
|
||||
set (INCLUDE_DIRS include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Link OpenSSL libraries
|
||||
if (URHO3D_SSL)
|
||||
diff --git a/Source/ThirdParty/Detour/CMakeLists.txt b/Source/ThirdParty/Detour/CMakeLists.txt
|
||||
index 7d78b5aeb..2fe08df47 100644
|
||||
--- a/Source/ThirdParty/Detour/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/Detour/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@ define_source_files (GLOB_CPP_PATTERNS Source/*.cpp GLOB_H_PATTERNS Include/*.h)
|
||||
set (INCLUDE_DIRS Include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY Include/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/Detour FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/DetourCrowd/CMakeLists.txt b/Source/ThirdParty/DetourCrowd/CMakeLists.txt
|
||||
index d8f915372..8b3d7d135 100644
|
||||
--- a/Source/ThirdParty/DetourCrowd/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/DetourCrowd/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@ define_source_files (GLOB_CPP_PATTERNS Source/*.cpp GLOB_H_PATTERNS Include/*.h)
|
||||
set (INCLUDE_DIRS Include ../Detour/Include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY Include/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/DetourCrowd FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/DetourTileCache/CMakeLists.txt b/Source/ThirdParty/DetourTileCache/CMakeLists.txt
|
||||
index 519fdae17..edf38ee27 100644
|
||||
--- a/Source/ThirdParty/DetourTileCache/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/DetourTileCache/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@ define_source_files (GLOB_CPP_PATTERNS Source/*.cpp GLOB_H_PATTERNS Include/*.h)
|
||||
set (INCLUDE_DIRS Include ../Detour/Include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY Include/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/DetourTileCache FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/ETCPACK/CMakeLists.txt b/Source/ThirdParty/ETCPACK/CMakeLists.txt
|
||||
index 555b2c28c..9f3dd54a0 100644
|
||||
--- a/Source/ThirdParty/ETCPACK/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/ETCPACK/CMakeLists.txt
|
||||
@@ -27,6 +27,6 @@ set (TARGET_NAME ETCPACK)
|
||||
set (SOURCE_FILES source/etcdec.cxx)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
|
||||
diff --git a/Source/ThirdParty/FreeType/CMakeLists.txt b/Source/ThirdParty/FreeType/CMakeLists.txt
|
||||
index 306af2e34..bbc4cab0a 100644
|
||||
--- a/Source/ThirdParty/FreeType/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/FreeType/CMakeLists.txt
|
||||
@@ -78,7 +78,7 @@ set (SOURCE_FILES
|
||||
set (INCLUDE_DIRS include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY include/freetype DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY)
|
||||
diff --git a/Source/ThirdParty/GLEW/CMakeLists.txt b/Source/ThirdParty/GLEW/CMakeLists.txt
|
||||
index 9ec4ab843..d5feebd96 100644
|
||||
--- a/Source/ThirdParty/GLEW/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/GLEW/CMakeLists.txt
|
||||
@@ -33,7 +33,7 @@ define_source_files (GLOB_CPP_PATTERNS *.c)
|
||||
set (INCLUDE_DIRS .)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library (install dependency for OGLGraphicsImpl.h)
|
||||
install_header_files (DIRECTORY ./ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/GLEW FILES_MATCHING PATTERN *.h) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/LZ4/CMakeLists.txt b/Source/ThirdParty/LZ4/CMakeLists.txt
|
||||
index 579407338..57f93de92 100644
|
||||
--- a/Source/ThirdParty/LZ4/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/LZ4/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ set (TARGET_NAME LZ4)
|
||||
define_source_files (GLOB_CPP_PATTERNS *.c)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY ./ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/LZ4 FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/LibCpuId/CMakeLists.txt b/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||||
index 6c4ab7291..5c4cc5069 100644
|
||||
--- a/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||||
@@ -47,7 +47,7 @@ list (APPEND SOURCE_FILES ${ASM_FILES})
|
||||
set (INCLUDE_DIRS src)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY src/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/LibCpuId FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/Lua/CMakeLists.txt b/Source/ThirdParty/Lua/CMakeLists.txt
|
||||
index a24c75025..f62491fa7 100644
|
||||
--- a/Source/ThirdParty/Lua/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/Lua/CMakeLists.txt
|
||||
@@ -34,7 +34,7 @@ if (READLINE_FOUND)
|
||||
endif ()
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library (no direct dependencies but library user may need them)
|
||||
install_header_files (DIRECTORY src/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/Lua FILES_MATCHING PATTERN *.h) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/LuaJIT/CMakeLists.txt b/Source/ThirdParty/LuaJIT/CMakeLists.txt
|
||||
index c86cd0755..f1ec9250d 100644
|
||||
--- a/Source/ThirdParty/LuaJIT/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/LuaJIT/CMakeLists.txt
|
||||
@@ -470,7 +470,7 @@ if (XCODE)
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
-setup_library (${EXCLUDE_FROM_ALL})
|
||||
+setup_library (STATIC ${EXCLUDE_FROM_ALL})
|
||||
if (XCODE AND NOT ARCH) # These variables are used to control the recursion as this script is recursive in nature on Xcode
|
||||
# Add external and custom targets to build Mach-O universal binary LuaJIT sub-library
|
||||
include (ExternalProject)
|
||||
diff --git a/Source/ThirdParty/MojoShader/CMakeLists.txt b/Source/ThirdParty/MojoShader/CMakeLists.txt
|
||||
index db48047ce..82394e70d 100644
|
||||
--- a/Source/ThirdParty/MojoShader/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/MojoShader/CMakeLists.txt
|
||||
@@ -31,7 +31,7 @@ if (MSVC)
|
||||
endif (MSVC)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY ./ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/MojoShader FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/PugiXml/CMakeLists.txt b/Source/ThirdParty/PugiXml/CMakeLists.txt
|
||||
index 1298ae9af..ccddcd965 100644
|
||||
--- a/Source/ThirdParty/PugiXml/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/PugiXml/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ set (TARGET_NAME PugiXml)
|
||||
define_source_files (GLOB_CPP_PATTERNS src/*.cpp GLOB_H_PATTERNS src/*.hpp)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY src/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/PugiXml FILES_MATCHING PATTERN *.hpp BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/Recast/CMakeLists.txt b/Source/ThirdParty/Recast/CMakeLists.txt
|
||||
index 618f28a51..643278164 100644
|
||||
--- a/Source/ThirdParty/Recast/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/Recast/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@ define_source_files (GLOB_CPP_PATTERNS Source/*.cpp GLOB_H_PATTERNS Include/*.h)
|
||||
set (INCLUDE_DIRS Include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY Include/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/Recast FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/SDL/CMakeLists.txt b/Source/ThirdParty/SDL/CMakeLists.txt
|
||||
index 5c4ef27da..9f48ca53c 100644
|
||||
--- a/Source/ThirdParty/SDL/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/SDL/CMakeLists.txt
|
||||
@@ -1600,7 +1600,7 @@ file (GLOB H_FILES include/*.h) # Adding the headers into source files list
|
||||
list (APPEND SOURCE_FILES ${H_FILES})
|
||||
|
||||
# Setup target as STATIC library (as the result we never use EXTRA_LDFLAGS linker flags)
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library (install dependency for InputEvents.h)
|
||||
install_header_files (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/SDL FILES_MATCHING PATTERN *.h USE_FILE_SYMLINK) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/SLikeNet/CMakeLists.txt b/Source/ThirdParty/SLikeNet/CMakeLists.txt
|
||||
index 0fef2defa..c2bfaabc9 100644
|
||||
--- a/Source/ThirdParty/SLikeNet/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/SLikeNet/CMakeLists.txt
|
||||
@@ -62,7 +62,7 @@ set (SOURCE_FILES ${CPP_FILES} ${H_FILES})
|
||||
set (INCLUDE_DIRS Source/include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY Source/include/slikenet/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/SLikeNet FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/SQLite/CMakeLists.txt b/Source/ThirdParty/SQLite/CMakeLists.txt
|
||||
index 0c42972b0..0cd33bfd3 100644
|
||||
--- a/Source/ThirdParty/SQLite/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/SQLite/CMakeLists.txt
|
||||
@@ -42,7 +42,7 @@ endforeach ()
|
||||
set (SOURCE_FILES src/sqlite3.c)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library
|
||||
install_header_files (DIRECTORY src/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/SQLite FILES_MATCHING PATTERN *.h) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/StanHull/CMakeLists.txt b/Source/ThirdParty/StanHull/CMakeLists.txt
|
||||
index faf4e3858..34362e419 100644
|
||||
--- a/Source/ThirdParty/StanHull/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/StanHull/CMakeLists.txt
|
||||
@@ -27,7 +27,7 @@ set (TARGET_NAME StanHull)
|
||||
define_source_files ()
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY ./ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/StanHull FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/WebP/CMakeLists.txt b/Source/ThirdParty/WebP/CMakeLists.txt
|
||||
index 7072f4663..54737cc82 100644
|
||||
--- a/Source/ThirdParty/WebP/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/WebP/CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@ if (ANDROID)
|
||||
endif ()
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY src/webp/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/webp FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/ik/CMakeLists.txt b/Source/ThirdParty/ik/CMakeLists.txt
|
||||
index 6868c6d88..57290a821 100644
|
||||
--- a/Source/ThirdParty/ik/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/ik/CMakeLists.txt
|
||||
@@ -75,7 +75,7 @@ configure_file (include/ik/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/gener
|
||||
set (INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/include/generated include)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building the Urho3D library
|
||||
install_header_files (DIRECTORY include/ik/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/ik FILES_MATCHING PATTERN *.h USE_FILE_SYMLINK BUILD_TREE_ONLY) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/nanodbc/CMakeLists.txt b/Source/ThirdParty/nanodbc/CMakeLists.txt
|
||||
index ca59b6acf..628a27d2f 100644
|
||||
--- a/Source/ThirdParty/nanodbc/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/nanodbc/CMakeLists.txt
|
||||
@@ -36,7 +36,7 @@ if (ODBC_DEFINES)
|
||||
endif ()
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library
|
||||
install_header_files (DIRECTORY nanodbc/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/nanodbc FILES_MATCHING PATTERN *.h) # Note: the trailing slash is significant
|
||||
diff --git a/Source/ThirdParty/toluapp/src/lib/CMakeLists.txt b/Source/ThirdParty/toluapp/src/lib/CMakeLists.txt
|
||||
index c84ed5c01..5a26bf2b5 100644
|
||||
--- a/Source/ThirdParty/toluapp/src/lib/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/toluapp/src/lib/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@ define_source_files (GLOB_CPP_PATTERNS *.c)
|
||||
set (INCLUDE_DIRS ../../include ../../../Lua${JIT}/src)
|
||||
|
||||
# Setup target
|
||||
-setup_library ()
|
||||
+setup_library (STATIC)
|
||||
|
||||
# Install headers for building and using the Urho3D library (no direct dependencies but library user may need them)
|
||||
install_header_files (DIRECTORY ../../include/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/toluapp FILES_MATCHING PATTERN *.h) # Note: the trailing slash is significant
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
set(URHO3D_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
if(NOT URHO3D_LIBRARIES)
|
||||
_find_package(${ARGS})
|
||||
endif()
|
||||
|
||||
set(CMAKE_MODULE_PATH ${URHO3D_PREV_MODULE_PATH})
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{
|
||||
"$note": "Due to the upstream modification of the dependent source code, the internal port of vcpkg cannot be used.",
|
||||
"name": "urho3d",
|
||||
"version-date": "2021-03-01",
|
||||
"port-version": 5,
|
||||
"description": "Urho3D is a free lightweight, cross-platform 2D and 3D game engine implemented in C++ and released under the MIT license. Greatly inspired by OGRE and Horde3D.",
|
||||
"homepage": "https://github.com/urho3d/Urho3D",
|
||||
"supports": "!(arm | uwp)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"examples": {
|
||||
"description": "Build examples."
|
||||
},
|
||||
"readline": {
|
||||
"description": "Enable readline.",
|
||||
"dependencies": [
|
||||
"readline"
|
||||
]
|
||||
},
|
||||
"tools": {
|
||||
"description": "Build tools."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -9172,10 +9172,6 @@
|
|||
"baseline": "1.1.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"urho3d": {
|
||||
"baseline": "2021-03-01",
|
||||
"port-version": 5
|
||||
},
|
||||
"uriparser": {
|
||||
"baseline": "0.9.8",
|
||||
"port-version": 0
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче