[uchardet: 19/29] cmake: rename UCHARDET_{TARGET -> LIBRARY} for clarity
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [uchardet: 19/29] cmake: rename UCHARDET_{TARGET -> LIBRARY} for clarity
- Date: Sun, 27 Mar 2016 18:38:02 +0000 (UTC)
commit 1a1f4bfbd8daca2479fa89b8765d95cf69d9b061
Author: Ilya Tumaykin <itumaykin gmail com>
Date: Mon Mar 21 21:16:20 2016 +0300
cmake: rename UCHARDET_{TARGET -> LIBRARY} for clarity
src/CMakeLists.txt | 10 +++++-----
src/symbols.cmake | 2 +-
src/tools/CMakeLists.txt | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73c672a..97e63bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ set(
uchardet.cpp
)
-set (UCHARDET_TARGET libuchardet)
+set (UCHARDET_LIBRARY libuchardet)
if (BUILD_STATIC AND BUILD_SHARED_LIBS)
set (UCHARDET_STATIC_TARGET libuchardet_static)
endif ()
@@ -53,7 +53,7 @@ add_definitions(
)
add_library(
- ${UCHARDET_TARGET}
+ ${UCHARDET_LIBRARY}
${UCHARDET_SOURCES}
)
@@ -66,7 +66,7 @@ if (UCHARDET_STATIC_TARGET)
endif (UCHARDET_STATIC_TARGET)
set_target_properties(
- ${UCHARDET_TARGET}
+ ${UCHARDET_LIBRARY}
PROPERTIES
LINKER_LANGUAGE
CXX
@@ -99,7 +99,7 @@ endif (CMAKE_BUILD_TYPE MATCHES Debug)
if (NOT WIN32)
install(
TARGETS
- ${UCHARDET_TARGET}
+ ${UCHARDET_LIBRARY}
LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION
@@ -108,7 +108,7 @@ if (NOT WIN32)
else (NOT WIN32)
install(
TARGETS
- ${UCHARDET_TARGET}
+ ${UCHARDET_LIBRARY}
RUNTIME DESTINATION
${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION
diff --git a/src/symbols.cmake b/src/symbols.cmake
index 4cd630d..5f97979 100644
--- a/src/symbols.cmake
+++ b/src/symbols.cmake
@@ -28,7 +28,7 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
endif (APPLE)
set_target_properties(
- ${UCHARDET_TARGET}
+ ${UCHARDET_LIBRARY}
PROPERTIES
LINK_FLAGS
"${LINK_FLAGS}"
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 8e3ffa4..10dd604 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -10,7 +10,7 @@ add_executable(
target_link_libraries(
uchardet
- ${UCHARDET_TARGET}
+ ${UCHARDET_LIBRARY}
)
install(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]