From ba6679f2b3127e206be91e16838e00c7856e4853 Mon Sep 17 00:00:00 2001 From: nu774 Date: Sat, 20 Jun 2015 12:25:00 +0900 Subject: [PATCH 1/2] fix: export symbols were not passed to the linker as intended --- src/symbols.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/symbols.cmake b/src/symbols.cmake index 2aa4601..9453baf 100644 --- a/src/symbols.cmake +++ b/src/symbols.cmake @@ -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}" From f5637b23b86ff14363d0cdd5eb0f032f90242c9d Mon Sep 17 00:00:00 2001 From: nu774 Date: Sat, 17 May 2014 20:30:01 +0900 Subject: [PATCH 2/2] fix for MinGW build --- CMakeLists.txt | 8 ++++---- src/CMakeLists.txt | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dde2cc..78e015b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b26a3b..0b36fd0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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(