From e7feb356279fe49366ca9f661e6a587db589251b Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Mon, 21 Mar 2016 21:17:14 +0300 Subject: [PATCH] cmake: rename UCHARDET_STATIC_{TARGET -> LIBRARY} for clarity --- src/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 97e63bf..a19bded 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,7 +43,7 @@ set( set (UCHARDET_LIBRARY libuchardet) if (BUILD_STATIC AND BUILD_SHARED_LIBS) - set (UCHARDET_STATIC_TARGET libuchardet_static) + set (UCHARDET_STATIC_LIBRARY libuchardet_static) endif () add_definitions( @@ -57,13 +57,13 @@ add_library( ${UCHARDET_SOURCES} ) -if (UCHARDET_STATIC_TARGET) +if (UCHARDET_STATIC_LIBRARY) add_library( - ${UCHARDET_STATIC_TARGET} + ${UCHARDET_STATIC_LIBRARY} STATIC ${UCHARDET_SOURCES} ) -endif (UCHARDET_STATIC_TARGET) +endif (UCHARDET_STATIC_LIBRARY) set_target_properties( ${UCHARDET_LIBRARY} @@ -78,16 +78,16 @@ set_target_properties( 0 ) -if (UCHARDET_STATIC_TARGET) +if (UCHARDET_STATIC_LIBRARY) set_target_properties( - ${UCHARDET_STATIC_TARGET} + ${UCHARDET_STATIC_LIBRARY} PROPERTIES LINKER_LANGUAGE CXX OUTPUT_NAME uchardet ) -endif (UCHARDET_STATIC_TARGET) +endif (UCHARDET_STATIC_LIBRARY) if (CMAKE_BUILD_TYPE MATCHES Debug) add_definitions( @@ -116,14 +116,14 @@ else (NOT WIN32) ) endif (NOT WIN32) -if (UCHARDET_STATIC_TARGET) +if (UCHARDET_STATIC_LIBRARY) install( TARGETS - ${UCHARDET_STATIC_TARGET} + ${UCHARDET_STATIC_LIBRARY} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -endif (UCHARDET_STATIC_TARGET) +endif (UCHARDET_STATIC_LIBRARY) install( FILES