diff src/mime/CMakeLists.txt @ 2:9d9266316a91

Resync with Git
author Eric Wing <ewing . public |-at-| gmail . com>
date Fri, 29 Aug 2008 22:48:39 -0700
parents cf0892e34f45
children
line wrap: on
line diff
--- a/src/mime/CMakeLists.txt	Wed Aug 27 22:44:22 2008 -0700
+++ b/src/mime/CMakeLists.txt	Fri Aug 29 22:48:39 2008 -0700
@@ -16,7 +16,7 @@
 )
 
 
-IF(WANTS_BUILD_SHARED_LIBRARY)
+IF(WANTS_BUILD_MODULE_LIBRARY)
 	ADD_LIBRARY(luamime_library_module MODULE ${luasocket_MIME_PUBLIC_HEADERS} ${luasocket_MIME})
 	SET_TARGET_PROPERTIES(luamime_library_module PROPERTIES
 		PREFIX ""
@@ -24,25 +24,28 @@
 	)
 	SET_TARGET_PROPERTIES(luamime_library_module PROPERTIES COMPILE_FLAGS "${LUASOCKET_C_FLAGS}")
 	TARGET_LINK_LIBRARIES(luamime_library_module ${LUA_LIBRARIES} ${LUASOCKET_LINK_FLAGS})
-ENDIF(WANTS_BUILD_SHARED_LIBRARY)
-#IF(WANTS_BUILD_STATIC_LIBRARY)
+ENDIF(WANTS_BUILD_MODULE_LIBRARY)
+
+IF(WANTS_BUILD_STATIC_LIBRARY)
 	ADD_LIBRARY(luamime_library_static STATIC ${luasocket_MIME_PUBLIC_HEADERS} ${luasocket_MIME})
-	SET_TARGET_PROPERTIES(luamime_library_static PROPERTIES OUTPUT_NAME "mime")
+	SET_TARGET_PROPERTIES(luamime_library_static PROPERTIES OUTPUT_NAME "luasocketmime")
 	SET_TARGET_PROPERTIES(luamime_library_static PROPERTIES COMPILE_FLAGS "${LUASOCKET_C_FLAGS}")
 	TARGET_LINK_LIBRARIES(luamime_library_static ${LUA_LIBRARIES} ${LUASOCKET_LINK_FLAGS})
-#ENDIF(WANTS_BUILD_STATIC_LIBRARY)
+ENDIF(WANTS_BUILD_STATIC_LIBRARY)
 
-INSTALL(TARGETS
-	luamime_library_static
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-	#	ARCHIVE DESTINATION lib/static
-)
+IF(WANTS_BUILD_STATIC_LIBRARY)
+	INSTALL(TARGETS
+		luamime_library_static
+		#		RUNTIME DESTINATION bin
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib
+		#	ARCHIVE DESTINATION lib/static
+	)
+ENDIF(WANTS_BUILD_STATIC_LIBRARY)
 
-IF(WANTS_BUILD_SHARED_LIBRARY)
+IF(WANTS_BUILD_MODULE_LIBRARY)
 	INSTALL(TARGETS luamime_library_module DESTINATION ${LUAPACKAGE_CDIR}/mime)
-ENDIF(WANTS_BUILD_SHARED_LIBRARY)
+ENDIF(WANTS_BUILD_MODULE_LIBRARY)
 
 INSTALL(FILES ${luamime_RESOURCE_FILES} DESTINATION ${LUAPACKAGE_LDIR}/mime)
 INSTALL(FILES ${luasocket_MIME_PUBLIC_HEADERS} DESTINATION include)