Combine utility target installs

This commit is contained in:
Chris Robinson
2020-04-14 23:37:48 -07:00
parent cd6908fd19
commit 8ef8b5e215
2 changed files with 6 additions and 13 deletions
+6 -6
View File
@@ -1344,6 +1344,12 @@ if(ALSOFT_UTILS)
target_compile_options(sofa-info PRIVATE ${C_FLAGS})
target_link_libraries(sofa-info PRIVATE ${LINKER_FLAGS} sofa-support)
endif()
message(STATUS "Building utility programs")
if(TARGET alsoft-config)
set(UTIL_TARGETS ${UTIL_TARGETS} alsoft-config)
message(STATUS "Building configuration program")
endif()
message(STATUS "")
if(ALSOFT_INSTALL_UTILS)
install(TARGETS ${UTIL_TARGETS}
@@ -1351,12 +1357,6 @@ if(ALSOFT_UTILS)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
message(STATUS "Building utility programs")
if(TARGET alsoft-config)
message(STATUS "Building configuration program")
endif()
message(STATUS "")
endif()
-7
View File
@@ -16,15 +16,8 @@ if(Qt5Widgets_FOUND)
target_link_libraries(alsoft-config Qt5::Widgets)
target_include_directories(alsoft-config PRIVATE "${alsoft-config_BINARY_DIR}"
"${OpenAL_BINARY_DIR}")
set_property(TARGET alsoft-config APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
set_target_properties(alsoft-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OpenAL_BINARY_DIR})
if(TARGET build_version)
add_dependencies(alsoft-config build_version)
endif()
install(TARGETS alsoft-config
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif()