aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Farrugia <mark.farrugia@fiberdyne.com.au>2019-04-16 12:40:20 +1000
committerMark Farrugia <mark.farrugia@fiberdyne.com.au>2019-04-16 12:49:21 +1000
commit052bf4ee8ac2c8772a926374bfd5d22bb3faa877 (patch)
tree4d9dcb4667436f621d1013bd6de792ffb64a12cd
parent648a5dfc291738f655fa903f2e5f6899817e8126 (diff)
Revert "Add support for installing as a library"
This reverts commit 2b26533b81621dbf1359c5e64dd7a59e6d327f62. Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
-rw-r--r--CMakeLists.txt28
-rw-r--r--avirt.pc.in11
2 files changed, 1 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e48f289..d56960b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,24 +2,7 @@
# LIBAVIRT CONFIGURATION LIBRARY
#-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.3)
-
-include(GNUInstallDirs)
-
-set(TARGET_NAME "avirt")
-set(PROJECT_PRETTY_NAME "AVIRT")
-set(PROJECT_DESCRIPTION "ALSA Virtual Dynamic Sound Driver userspace library")
-set(PROJECT_URL "https://gerrit.automotivelinux.org:29418/src/libavirt")
-set(PROJECT_AUTHOR "Farrugia, Mark")
-set(PROJECT_AUTHOR_MAIL "mark.farrugia@fiberdyne.com.au")
-set(PROJECT_LICENSE "APL2.0")
-set(PROJECT_LANGUAGES "C")
-
-if(NOT CMAKE_INSTALL_PREFIX)
- set(CMAKE_INSTALL_PREFIX "/usr")
-endif()
-
-add_compile_options(-DAFB_BINDING_VERSION=3 -Wall -Wextra -Wconversion -Wno-unused-parameter -Wno-sign-compare -Wno-sign-conversion -Werror=maybe-uninitialized -Werror=implicit-function-declaration -ffunction-sections -fdata-sections -fPIC)
+PROJECT_TARGET_ADD(avirt)
# Target
file(GLOB SOURCE_FILES "src/avirt-*.c")
@@ -27,12 +10,3 @@ add_library(avirt STATIC ${SOURCE_FILES})
# Target includes
target_include_directories(avirt PUBLIC include)
-
-# Install
-configure_file(avirt.pc.in avirt.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avirt.pc
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(TARGETS ${TARGET_NAME}
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES include/avirt/avirt.h
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/avirt)
diff --git a/avirt.pc.in b/avirt.pc.in
deleted file mode 100644
index 7acefa6..0000000
--- a/avirt.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: @TARGET_NAME@
-Description: @PROJECT_DESCRIPTION@
-Version: @PROJECT_VERSION@
-URL: @PROJECT_URL@
-Libs: -L@CMAKE_INSTALL_LIBDIR@ -l@TARGET_NAME@
-Cflags: -I${includedir} \ No newline at end of file