modification libdash cmake file 29/7029/4
authorAngelo Mantellini (manangel) <[email protected]>
Tue, 6 Jun 2017 15:35:38 +0000 (17:35 +0200)
committerAngelo Mantellini (manangel) <[email protected]>
Tue, 6 Jun 2017 16:16:41 +0000 (18:16 +0200)
Change-Id: I2784be54050f6de42f0d5b5b76b5bac12c09261a
Signed-off-by: Angelo Mantellini (manangel) <[email protected]>
libdash/CMakeLists.txt

index d2c88cf..89cfd6b 100644 (file)
@@ -174,9 +174,6 @@ set(SOURCE_FILES
         source/libdash.cpp
         source/targetver.h)
 
-find_package(LibXml2 REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(CURL REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 include_directories(${WLIB_INCLUDE_DIRS})
 include_directories(${CURL_INCLUDE_DIRS})
@@ -184,10 +181,10 @@ include_directories(include)
 
 add_library(dash SHARED ${SOURCE_FILES})
 set_target_properties(dash PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(dash ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES} ${ANDROID_LIBRARIES})
+target_link_libraries(dash ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${CURL_LIBRARIES} ${ANDROID_LIBRARIES} ${CURL_LIBRARIES})
 message("libxml ${LIBXML2_LIBRARIES} ${LIBXML2_INCLUDE_DIR}")
-install(TARGETS dash DESTINATION ${CMAKE_INSTALL_PREFIX}/lib PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ COMPONENT library)
-install(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libdash COMPONENT headers)
+install(TARGETS dash DESTINATION ${CMAKE_INSTALL_PREFIX}/lib PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+install(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libdash)
 
 # Generate DEB / RPM packages