Skip to content

Commit 2d816a5

Browse files
committed
Fix path issues of CMake.
1 parent 6f75a57 commit 2d816a5

File tree

5 files changed

+33
-38
lines changed

5 files changed

+33
-38
lines changed

CMakeLists.txt

+26-7
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,32 @@ endif (WIN32)
6262
######## Directory
6363

6464
set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
65-
set (DIR_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX})
66-
set (DIR_LIBRARY_STATIC ${CMAKE_STATIC_LIBRARY_PREFIX})
67-
set (DIR_INCLUDE include)
68-
set (DIR_SHARE share)
69-
set (DIR_BIN bin)
70-
set (PKGDATADIR ${DIR_PREFIX}/${DIR_SHARE}/opencc)
71-
set (LOCALEDIR ${DIR_PREFIX}/${DIR_SHARE}/locale)
65+
set (DIR_LIBRARY ${DIR_PREFIX}/${CMAKE_SHARED_LIBRARY_PREFIX})
66+
set (DIR_LIBRARY_STATIC ${DIR_PREFIX}/${CMAKE_STATIC_LIBRARY_PREFIX})
67+
set (DIR_INCLUDE ${DIR_PREFIX}/include)
68+
set (DIR_SHARE ${DIR_PREFIX}/share)
69+
set (DIR_BIN ${DIR_PREFIX}/bin)
70+
set (DIR_ETC ${DIR_PREFIX}/etc)
71+
72+
if (DEFINED CMAKE_INSTALL_LIBDIR)
73+
set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR})
74+
set (DIR_LIBRARY_STATIC ${CMAKE_INSTALL_LIBDIR})
75+
endif (DEFINED CMAKE_INSTALL_LIBDIR)
76+
77+
if (DEFINED SHARE_INSTALL_PREFIX)
78+
set (DIR_SHARE ${SHARE_INSTALL_PREFIX})
79+
endif (DEFINED SHARE_INSTALL_PREFIX)
80+
81+
if (DEFINED INCLUDE_INSTALL_DIR)
82+
set (DIR_INCLUDE ${INCLUDE_INSTALL_DIR})
83+
endif (DEFINED INCLUDE_INSTALL_DIR)
84+
85+
if (DEFINED SYSCONF_INSTALL_DIR)
86+
set (DIR_ETC ${SYSCONF_INSTALL_DIR})
87+
endif (DEFINED SYSCONF_INSTALL_DIR)
88+
89+
set (DIR_SHARE_OPENCC ${DIR_SHARE}/opencc)
90+
set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)
7291

7392
######## Configuration
7493

data/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ foreach(DICT_PREFIX simp_to_trad trad_to_simp)
3333
FILES
3434
${CMAKE_BINARY_DIR}/data/${DICT}.ocd
3535
DESTINATION
36-
${DIR_SHARE}/opencc
36+
${DIR_SHARE_OPENCC}
3737
)
3838

3939
set_directory_properties(
@@ -56,5 +56,5 @@ install(
5656
FILES
5757
${CONFIG_FILES}
5858
DESTINATION
59-
${DIR_SHARE}/opencc
59+
${DIR_SHARE_OPENCC}
6060
)

opencc.pc.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefix=@DIR_PREFIX@
22
exec_prefix=${prefix}
3-
libdir=${prefix}/@DIR_LIBRARY@
4-
includedir=${prefix}/@DIR_INCLUDE@
3+
libdir=@DIR_LIBRARY@
4+
includedir=@DIR_INCLUDE@
55

66
Name: opencc
77
Description: Open Chinese Convert

po/CMakeLists.txt

+1-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
11
file(STRINGS LINGUAS LANGUAGES)
22
separate_arguments(LANGUAGES)
33
set(DOMAIN ${PACKAGE_NAME})
4-
set(LOCALE_INSTALL ${DIR_SHARE}/locale)
5-
set(LOCALEDIR po)
6-
7-
############ Validation. ###########
8-
9-
find_program(GETTEXT_MSGINIT_EXECUTABLE msginit)
10-
if(NOT GETTEXT_MSGINIT_EXECUTABLE)
11-
message(FATAL_ERROR "msginit not found")
12-
endif(NOT GETTEXT_MSGINIT_EXECUTABLE)
13-
14-
find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
15-
if(NOT GETTEXT_XGETTEXT_EXECUTABLE )
16-
message(FATAL_ERROR "xgettext not found")
17-
endif(NOT GETTEXT_XGETTEXT_EXECUTABLE )
18-
19-
find_program(GETTEXT_MSGCAT_EXECUTABLE msgcat)
20-
if(NOT GETTEXT_MSGCAT_EXECUTABLE )
21-
message(FATAL_ERROR "msgcat not found")
22-
endif(NOT GETTEXT_MSGCAT_EXECUTABLE )
23-
24-
find_program(GETTEXT_MSGATTRIB_EXECUTABLE msgattrib)
25-
if(NOT GETTEXT_MSGATTRIB_EXECUTABLE)
26-
message(FATAL_ERROR "msgattrib not found")
27-
endif(NOT GETTEXT_MSGATTRIB_EXECUTABLE)
284

295
foreach(LANG ${LANGUAGES})
306

@@ -51,7 +27,7 @@ foreach(LANG ${LANGUAGES})
5127
RENAME
5228
${DOMAIN}.mo
5329
DESTINATION
54-
${LOCALE_INSTALL}/${LANG}/LC_MESSAGES
30+
${DIR_SHARE_LOCALE}/${LANG}/LC_MESSAGES
5531
)
5632

5733
endforeach(LANG ${LANGUAGES})

src/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ set (LIBOPENCC_TARGET libopencc)
3737
set (LIBOPENCC_STATIC_TARGET libopencc_static)
3838

3939
add_definitions(
40-
-DPKGDATADIR="${PKGDATADIR}"
41-
-DLOCALEDIR="${LOCALEDIR}"
40+
-DPKGDATADIR="${DIR_SHARE_OPENCC}"
41+
-DLOCALEDIR="${DIR_SHARE_LOCALE}"
4242
-DVERSION="${OPENCC_VERSION}"
4343
-DBYTEORDER=${BYTEORDER}
4444
-DPACKAGE_NAME="${PACKAGE_NAME}"

0 commit comments

Comments
 (0)