From 393b3d09717b6d357cb4a25a623bab14fa1bc9c5 Mon Sep 17 00:00:00 2001 From: Vladimir Timofeev Date: Mon, 24 Nov 2014 15:50:53 +0300 Subject: [PATCH] cmake: Disable try to link with static system installed libs, seems that linux distros not supported this option mostly --- cmake/Modules/CocosBuildHelpers.cmake | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cmake/Modules/CocosBuildHelpers.cmake b/cmake/Modules/CocosBuildHelpers.cmake index 07a8e79f1b..932d808b3d 100644 --- a/cmake/Modules/CocosBuildHelpers.cmake +++ b/cmake/Modules/CocosBuildHelpers.cmake @@ -59,16 +59,8 @@ endmacro() # Also if BUILD_SHARED_LIBS variable off, it is try to use _STATIC_* vars before function(cocos_use_pkg target pkg) set(prefix ${pkg}) - if(NOT BUILD_SHARED_LIBS) - set(prefix_static ${pkg}_STATIC) - else() - set(prefix_static) - endif() set(_include_dirs) - if(prefix_static AND ${prefix_static}_INCLUDE_DIRS) - set(_include_dirs ${${prefix_static}_INCLUDE_DIRS}) - endif() if(NOT _include_dirs) set(_include_dirs ${${prefix}_INCLUDE_DIRS}) endif() @@ -82,9 +74,6 @@ function(cocos_use_pkg target pkg) endif() set(_library_dirs) - if(prefix_static AND ${prefix_static}_LIBRARY_DIRS) - set(_library_dirs ${${prefix_static}_LIBRARY_DIRS}) - endif() if(NOT _library_dirs) set(_library_dirs ${${prefix}_LIBRARY_DIRS}) endif() @@ -94,9 +83,6 @@ function(cocos_use_pkg target pkg) endif() set(_libs) - if(prefix_static AND ${prefix_static}_LIBRARIES) - set(_libs ${${prefix_static}_LIBRARIES}) - endif() if(NOT _libs) set(_libs ${${prefix}_LIBRARIES}) endif() @@ -109,9 +95,6 @@ function(cocos_use_pkg target pkg) endif() set(_defs) - if(prefix_static AND ${prefix_static}_CFLAGS_OTHER) - set(_defs ${${prefix_static}_CFLAGS_OTHER}) - endif() if(NOT _defs) set(_defs ${${prefix}_DEFINITIONS}) endif()