Skip to content

Commit f94d986

Browse files
ChenPi11ChenPi11
committed
Remove ${srcdir} ${bindir} in build-aux.
1 parent ec1efe0 commit f94d986

File tree

2 files changed

+34
-32
lines changed

2 files changed

+34
-32
lines changed

‎CMakeLists.txt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ else()
3737
endif()
3838
get_filename_component(BUILD_AUX "${BUILD_AUX}" ABSOLUTE)
3939
include("${BUILD_AUX}/cmake/cppp.cmake")
40-
# ----------------------------------------------------------------------------------
4140

41+
cppp_init_nls_util()
42+
43+
# ----------------------------------------------------------------------------------
4244
check_have_visibility()
4345

4446
if(MSVC)
@@ -53,21 +55,21 @@ elseif(HAVE_VISIBILITY)
5355
else()
5456
set(DLL_VARIABLE "")
5557
endif()
56-
configure_file("${srcdir}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp")
57-
configure_file("${srcdir}/windows/libcppp-reiconv.rc.in" "${outdir}/windows/libcppp-reiconv.rc")
58+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp")
59+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/libcppp-reiconv.rc.in" "${CMAKE_BINARY_DIR}/windows/libcppp-reiconv.rc")
5860

5961
# Generate header file for install
6062
if(WIN32)
6163
set(DLL_VARIABLE "__declspec(dllimport)")
6264
else()
6365
set(DLL_VARIABLE "")
6466
endif()
65-
configure_file("${srcdir}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp.inst")
66-
cppp_nls_autotranslate("${output_includedir}/cppp/reiconv.hpp.inst" "${srcdir}/lang")
67+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp.inst")
68+
cppp_nls_autotranslate("${output_includedir}/cppp/reiconv.hpp.inst" "${CMAKE_CURRENT_SOURCE_DIR}/lang")
6769

6870
# Add includes
69-
include_directories("${srcdir}/lib")
70-
include_directories("${srcdir}/lib/generated")
71+
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/lib")
72+
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/lib/generated")
7173
include_directories("${output_includedir}")
7274

7375
# Add definitions
@@ -77,7 +79,7 @@ if(ENABLE_EXTRA)
7779
endif()
7880

7981
# Add library
80-
cppp_build_library(${PROJECT_NAME} "${srcdir}/lib/iconv.cpp" TRUE TRUE "${outdir}/windows/libcppp-reiconv.rc")
82+
cppp_build_library(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/lib/iconv.cpp" TRUE TRUE "${CMAKE_BINARY_DIR}/windows/libcppp-reiconv.rc")
8183

8284
# Include test suite.
8385
include("tests/tests.cmake")

‎tests/tests.cmake‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ if (ENABLE_TEST)
1010
message(STATUS "Test suite for 'cppp-reiconv' enabled.")
1111

1212
# Includes
13-
include_directories("${srcdir}/tests")
13+
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/tests")
1414
include_directories("${output_includedir}")
1515

1616
# Test executables
17-
add_executable(data-generator "${srcdir}/tests/data-generator.cpp")
18-
add_executable(check-stateful "${srcdir}/tests/check-stateful.cpp")
19-
add_executable(check-stateless "${srcdir}/tests/check-stateless.cpp")
20-
add_executable(test-shiftseq "${srcdir}/tests/test-shiftseq.cpp")
21-
add_executable(test-to-wchar "${srcdir}/tests/test-to-wchar.cpp")
22-
add_executable(sort "${srcdir}/tests/sort.cpp")
17+
add_executable(data-generator "${CMAKE_CURRENT_SOURCE_DIR}/tests/data-generator.cpp")
18+
add_executable(check-stateful "${CMAKE_CURRENT_SOURCE_DIR}/tests/check-stateful.cpp")
19+
add_executable(check-stateless "${CMAKE_CURRENT_SOURCE_DIR}/tests/check-stateless.cpp")
20+
add_executable(test-shiftseq "${CMAKE_CURRENT_SOURCE_DIR}/tests/test-shiftseq.cpp")
21+
add_executable(test-to-wchar "${CMAKE_CURRENT_SOURCE_DIR}/tests/test-to-wchar.cpp")
22+
add_executable(sort "${CMAKE_CURRENT_SOURCE_DIR}/tests/sort.cpp")
2323

2424
target_link_libraries(check-stateful libcppp-reiconv.static)
2525
target_link_libraries(check-stateless libcppp-reiconv.static)
@@ -37,45 +37,45 @@ if (ENABLE_TEST)
3737
macro(test state encoding)
3838
add_test( NAME "check-${state}-${encoding}"
3939
WORKING_DIRECTORY "${output_testsdir}"
40-
COMMAND "$<TARGET_FILE:check-${state}>" "${srcdir}/tests/data" "${encoding}" )
40+
COMMAND "$<TARGET_FILE:check-${state}>" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data" "${encoding}" )
4141
endmacro(test)
4242

4343
# Init test
4444

4545
add_custom_command(TARGET data-generator POST_BUILD
46-
COMMAND "$<TARGET_FILE:data-generator>" "utf-8" > "${srcdir}/tests/data/UTF-8.TXT"
46+
COMMAND "$<TARGET_FILE:data-generator>" "utf-8" > "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/UTF-8.TXT"
4747
WORKING_DIRECTORY "${output_testsdir}"
4848
COMMENT "Generating UTF-8 test data ... "
4949
)
50-
#{ cat $(srcdir)/GB18030-2005-BMP.TXT ; "$<TARGET_FILE:data-generator>" "gengb18030z" ; } | sort > GB18030-2005.TXT
51-
#{ test $(srcdir) = . || cp $(srcdir)/GB18030-2005.IRREVERSIBLE.TXT GB18030-2005.IRREVERSIBLE.TXT; }
52-
#$(SHELL) $(srcdir)/check-stateless . GB18030:2005
53-
#{ cat $(srcdir)/GB18030-2022-BMP.TXT ; "$<TARGET_FILE:data-generator>" "gengb18030z" ; } | sort > GB18030-2022.TXT
54-
#$(SHELL) $(srcdir)/check-stateless . GB18030:2022
55-
file(COPY_FILE "${srcdir}/tests/data/GB18030-2005-BMP.TXT" "${srcdir}/tests/data/GB18030-2005.TXT")
50+
#{ cat $(CMAKE_CURRENT_SOURCE_DIR)/GB18030-2005-BMP.TXT ; "$<TARGET_FILE:data-generator>" "gengb18030z" ; } | sort > GB18030-2005.TXT
51+
#{ test $(CMAKE_CURRENT_SOURCE_DIR) = . || cp $(CMAKE_CURRENT_SOURCE_DIR)/GB18030-2005.IRREVERSIBLE.TXT GB18030-2005.IRREVERSIBLE.TXT; }
52+
#$(SHELL) $(CMAKE_CURRENT_SOURCE_DIR)/check-stateless . GB18030:2005
53+
#{ cat $(CMAKE_CURRENT_SOURCE_DIR)/GB18030-2022-BMP.TXT ; "$<TARGET_FILE:data-generator>" "gengb18030z" ; } | sort > GB18030-2022.TXT
54+
#$(SHELL) $(CMAKE_CURRENT_SOURCE_DIR)/check-stateless . GB18030:2022
55+
file(COPY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005-BMP.TXT" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005.TXT")
5656
add_custom_command(TARGET data-generator POST_BUILD
57-
COMMAND "$<TARGET_FILE:data-generator>" "gb18030z" >> "${srcdir}/tests/data/GB18030-2005.TXT"
57+
COMMAND "$<TARGET_FILE:data-generator>" "gb18030z" >> "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005.TXT"
5858
WORKING_DIRECTORY "${output_testsdir}"
5959
COMMENT "Generating GB18030:2005 test data ... "
6060
)
6161
add_custom_command(TARGET data-generator POST_BUILD
62-
COMMAND "$<TARGET_FILE:sort>" "${srcdir}/tests/data/GB18030-2005.TXT" "${srcdir}/tests/data/GB18030-2005.TXT.tmp"
63-
COMMAND "${CMAKE_COMMAND}" -E copy "${srcdir}/tests/data/GB18030-2005.TXT.tmp" "${srcdir}/tests/data/GB18030-2005.TXT"
64-
COMMAND "${CMAKE_COMMAND}" -E remove "${srcdir}/tests/data/GB18030-2005.TXT.tmp"
62+
COMMAND "$<TARGET_FILE:sort>" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005.TXT" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005.TXT.tmp"
63+
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005.TXT.tmp" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005.TXT"
64+
COMMAND "${CMAKE_COMMAND}" -E remove "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2005.TXT.tmp"
6565
WORKING_DIRECTORY "${output_testsdir}"
6666
COMMENT "Sorting GB18030:2005 test data ... "
6767
)
6868

69-
file(COPY_FILE "${srcdir}/tests/data/GB18030-2022-BMP.TXT" "${srcdir}/tests/data/GB18030-2022.TXT")
69+
file(COPY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022-BMP.TXT" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022.TXT")
7070
add_custom_command(TARGET data-generator POST_BUILD
71-
COMMAND "$<TARGET_FILE:data-generator>" "gb18030z" >> "${srcdir}/tests/data/GB18030-2022.TXT"
71+
COMMAND "$<TARGET_FILE:data-generator>" "gb18030z" >> "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022.TXT"
7272
WORKING_DIRECTORY "${output_testsdir}"
7373
COMMENT "Generating GB18030:2022 test data ... "
7474
)
7575
add_custom_command(TARGET data-generator POST_BUILD
76-
COMMAND "$<TARGET_FILE:sort>" "${srcdir}/tests/data/GB18030-2022.TXT" "${srcdir}/tests/data/GB18030-2022.TXT.tmp"
77-
COMMAND "${CMAKE_COMMAND}" -E copy "${srcdir}/tests/data/GB18030-2022.TXT.tmp" "${srcdir}/tests/data/GB18030-2022.TXT"
78-
COMMAND "${CMAKE_COMMAND}" -E remove "${srcdir}/tests/data/GB18030-2022.TXT.tmp"
76+
COMMAND "$<TARGET_FILE:sort>" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022.TXT" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022.TXT.tmp"
77+
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022.TXT.tmp" "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022.TXT"
78+
COMMAND "${CMAKE_COMMAND}" -E remove "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/GB18030-2022.TXT.tmp"
7979
WORKING_DIRECTORY "${output_testsdir}"
8080
COMMENT "Sorting GB18030:2022 test data ... "
8181
)

0 commit comments

Comments
 (0)