blob: 5716e79e8c104bbafc22a422acb9835463b456a6 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- CMakeLists.txt.orig 2016-10-04 12:45:35 UTC
+++ CMakeLists.txt
@@ -50,7 +50,6 @@ else()
endif()
configure_file(config.h.cmakein config.h @ONLY)
-configure_file(libilbc.pc.in libilbc.pc @ONLY)
#############################################################################
## Configure output files
@@ -175,8 +174,9 @@ target_link_libraries(ilbc ${CMAKE_THREA
## Compiler flags
#############################################################################
-if(${CMAKE_COMPILER_IS_GNUCC})
- set(CMAKE_C_FLAGS "-O2 -Wall -Wextra -Werror -fvisibility=hidden -Wno-unused-parameter -fno-strict-aliasing")
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
+ "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ set(CMAKE_C_FLAGS "-Wall -Wextra -fvisibility=hidden -Wno-unused-parameter -fno-strict-aliasing")
endif()
###################################################################################################
@@ -186,12 +186,7 @@ endif()
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "${prefix}")
set(includedir "${prefix}/include")
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-if (${LIB64})
- set(libdir "${exec_prefix}/lib64")
-else()
- set(libdir "${exec_prefix}/lib")
-endif()
+set(libdir "${exec_prefix}/lib")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libilbc.pc
DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
@@ -201,3 +196,5 @@ install(TARGETS ilbc
ARCHIVE DESTINATION ${libdir}
LIBRARY DESTINATION ${libdir}
RUNTIME DESTINATION bin)
+
+configure_file(libilbc.pc.in libilbc.pc @ONLY)
|
