coffee/uchardet
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/uchardet/uchardet.git synced 2026-01-01 03:12:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from nu774/fixes

Browse Source 
Fixes
This commit is contained in:
Carbo Kuo 2015-06-22 16:09:54 +02:00
commit 5653243699
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -22,10 +22,10 @@ set (
######## Windows
if (WIN32)
set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
set(CMAKE_STATIC_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
endif (WIN32)
#if (WIN32)
# set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
# set(CMAKE_STATIC_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
#endif (WIN32)
######## Directory

9
src/CMakeLists.txt
View File

@ -85,6 +85,15 @@ install(
LIBRARY DESTINATION
${DIR_LIBRARY}
)
else (NOT WIN32)
install(
TARGETS
${UCHARDET_TARGET}
RUNTIME DESTINATION
${DIR_BIN}
ARCHIVE DESTINATION
${DIR_LIBRARY}
)
endif (NOT WIN32)
install(

5
src/symbols.cmake
View File

@ -19,7 +19,7 @@ if (APPLE)
set(LINK_FLAGS
"${LINK_FLAGS} -Wl,-exported_symbols_list,'${_symbols_list}'")
elseif (CMAKE_C_COMPILER_ID STREQUAL GNU)
elseif (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
# Create a version script for GNU ld.
set(_symbols "{ global: ${UCHARDET_SYMBOLS}; local: *; };")
set(_version_script "${CMAKE_CURRENT_BINARY_DIR}/version.script")
@ -30,8 +30,7 @@ elseif (CMAKE_C_COMPILER_ID STREQUAL GNU)
endif (APPLE)
set_target_properties(
${LIBUCHARDET_TARGET}
${LIBUCHARDET_STATIC_TARGET}
${UCHARDET_TARGET}
PROPERTIES
LINK_FLAGS
"${LINK_FLAGS}"