1
1
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
- index 6541f1b..3ba15ba 100644
2
+ index 6541f1b..058bf3b 100644
3
3
--- a/CMakeLists.txt
4
4
+++ b/CMakeLists.txt
5
5
@@ -1,6 +1,4 @@
@@ -40,7 +40,7 @@ index 6541f1b..3ba15ba 100644
40
40
else()
41
41
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -pedantic")
42
42
set(LIB_CFLAGS "-std=c11 -fvisibility=hidden -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L -Wno-missing-braces")
43
- @@ -223,32 +225,32 @@ configure_file(
43
+ @@ -223,32 +225,33 @@ configure_file(
44
44
${DOXYGEN_CONF_FILE}
45
45
)
46
46
@@ -66,7 +66,7 @@ index 6541f1b..3ba15ba 100644
66
66
- set_target_properties(libsoundio_static PROPERTIES
67
67
- OUTPUT_NAME ${SOUNDIO_STATIC_LIBNAME}
68
68
+ target_link_libraries(libsoundio LINK_PUBLIC ${LIBSOUNDIO_LIBS})
69
- + install(TARGETS libsoundio EXPORT libsoundio-export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
69
+ + install(TARGETS libsoundio EXPORT libsoundio-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
70
70
+ else()
71
71
+ add_library(libsoundio STATIC ${LIBSOUNDIO_SOURCES})
72
72
+ set_target_properties(libsoundio PROPERTIES PUBLIC_HEADER "${LIBSOUNDIO_HEADERS}")
@@ -76,8 +76,9 @@ index 6541f1b..3ba15ba 100644
76
76
LINKER_LANGUAGE C
77
77
)
78
78
- install(TARGETS libsoundio_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
79
+ + target_link_libraries(libsoundio LINK_PUBLIC ${LIBSOUNDIO_LIBS})
79
80
+ target_compile_definitions(libsoundio PUBLIC SOUNDIO_STATIC_LIBRARY)
80
- + install(TARGETS libsoundio EXPORT libsoundio-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
81
+ + install(TARGETS libsoundio EXPORT libsoundio-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
81
82
endif()
82
83
83
84
- install(FILES
@@ -88,7 +89,7 @@ index 6541f1b..3ba15ba 100644
88
89
89
90
# Example Programs
90
91
91
- @@ -257,44 +259 ,28 @@ if(BUILD_EXAMPLE_PROGRAMS)
92
+ @@ -257,44 +260 ,28 @@ if(BUILD_EXAMPLE_PROGRAMS)
92
93
set_target_properties(sio_sine PROPERTIES
93
94
LINKER_LANGUAGE C
94
95
COMPILE_FLAGS ${EXAMPLE_CFLAGS})
@@ -137,7 +138,7 @@ index 6541f1b..3ba15ba 100644
137
138
install(TARGETS sio_record DESTINATION ${CMAKE_INSTALL_BINDIR})
138
139
endif()
139
140
140
- @@ -308,7 +294 ,7 @@ if(BUILD_TESTS)
141
+ @@ -308,7 +295 ,7 @@ if(BUILD_TESTS)
141
142
)
142
143
143
144
add_executable(latency "${libsoundio_SOURCE_DIR}/test/latency.c" ${LIBSOUNDIO_SOURCES})
@@ -146,7 +147,7 @@ index 6541f1b..3ba15ba 100644
146
147
set_target_properties(latency PROPERTIES
147
148
LINKER_LANGUAGE C
148
149
COMPILE_FLAGS ${LIB_CFLAGS}
149
- @@ -318,31 +304 ,19 @@ if(BUILD_TESTS)
150
+ @@ -318,31 +305 ,19 @@ if(BUILD_TESTS)
150
151
set_target_properties(underflow PROPERTIES
151
152
LINKER_LANGUAGE C
152
153
COMPILE_FLAGS ${EXAMPLE_CFLAGS})
0 commit comments