diff options
Diffstat (limited to 'src/cegui-1-fixes.patch')
| -rw-r--r-- | src/cegui-1-fixes.patch | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/src/cegui-1-fixes.patch b/src/cegui-1-fixes.patch index cda415d..ee04dad 100644 --- a/src/cegui-1-fixes.patch +++ b/src/cegui-1-fixes.patch @@ -26,19 +26,25 @@ index 1111111..2222222 100644 get_target_property(_TARGET_EXISTS ${_TARGET_NAME}_Static TYPE) if (_TARGET_EXISTS) -@@ -167,8 +169,10 @@ macro (cegui_add_dependency _TARGET_NAME _DEP_NAME) +@@ -167,11 +169,13 @@ macro (cegui_add_dependency _TARGET_NAME _DEP_NAME) ########################################################################### # NON-STATIC VERSION OF TARGET ########################################################################### - if (${_DEP_NAME}_DEFINITIONS) - set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${${_DEP_NAME}_DEFINITIONS} ) +- endif() +- if (${_DEP_NAME}_COMPILE_FLAGS) +- set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_FLAGS ${${_DEP_NAME}_COMPILE_FLAGS} ) + if (CEGUI_BUILD_SHARED_CONFIGURATION) + if (${_DEP_NAME}_DEFINITIONS) + set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${${_DEP_NAME}_DEFINITIONS} ) + endif() ++ if (${_DEP_NAME}_COMPILE_FLAGS) ++ set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_FLAGS ${${_DEP_NAME}_COMPILE_FLAGS} ) ++ endif() endif() - if (${_DEP_NAME}_COMPILE_FLAGS) - set_property( TARGET ${_TARGET_NAME} APPEND PROPERTY COMPILE_FLAGS ${${_DEP_NAME}_COMPILE_FLAGS} ) + + if (CEGUI_BUILD_SHARED_LIBS_WITH_STATIC_DEPENDENCIES) @@ -252,10 +256,12 @@ macro (cegui_add_library_impl _LIB_NAME _IS_MODULE _SOURCE_FILES_VAR _HEADER_FIL ########################################################################### # SHARED LIBRARY SET UP @@ -83,3 +89,23 @@ index 1111111..2222222 100644 if (CEGUI_BUILD_STATIC_CONFIGURATION) install(TARGETS ${_LIB_NAME}_Static + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Thu, 4 Aug 2016 13:30:13 +1000 +Subject: [PATCH] use cegui_target_link_libraries for minizip + + +diff --git a/cegui/src/CMakeLists.txt b/cegui/src/CMakeLists.txt +index 1111111..2222222 100644 +--- a/cegui/src/CMakeLists.txt ++++ b/cegui/src/CMakeLists.txt +@@ -86,7 +86,7 @@ endif () + if (CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER) + cegui_add_dependency(${CEGUI_TARGET_NAME} MINIZIP PRIVATE TRUE) + if (MINGW) +- target_link_libraries(${CEGUI_TARGET_NAME} shlwapi) ++ cegui_target_link_libraries(${CEGUI_TARGET_NAME} shlwapi) + endif () + endif () + |