From 34426542593ecea28124b8e36dc2f94a76f8730d Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 19 Jul 2014 10:25:55 +0200 Subject: [PATCH] Remove lib prefix from plugins --- cmake/Modules/ObsHelpers.cmake | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 6f1fa0203..372ad3f7b 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -348,16 +348,14 @@ function(install_obs_pdb ttype target) endfunction() macro(install_obs_core target) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) + if(APPLE) + set(_bit_suffix "") + elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_bit_suffix "64bit/") else() set(_bit_suffix "32bit/") endif() - if(APPLE) - set(_bit_suffix "") - endif() - if("${ARGV1}" STREQUAL "EXPORT") export_obs_core("${target}" "${ARGV2}") else() @@ -391,15 +389,16 @@ macro(install_obs_core target) endmacro() macro(install_obs_plugin target) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) + if(APPLE) + set(_bit_suffix "") + elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_bit_suffix "64bit/") else() set(_bit_suffix "32bit/") endif() - if(APPLE) - set(_bit_suffix "") - endif() + set_target_properties(${target} PROPERTIES + PREFIX "") install(TARGETS ${target} LIBRARY DESTINATION "${OBS_PLUGIN_DESTINATION}"