Преглед изворни кода

Remove lib prefix from plugins

BtbN пре 11 година
родитељ
комит
3442654259
1 измењених фајлова са 8 додато и 9 уклоњено
  1. 8 9
      cmake/Modules/ObsHelpers.cmake

+ 8 - 9
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}"