Skip to content

Commit 65e2482

Browse files
committed
Add version for funchook and remove soname.
1 parent 80eabe7 commit 65e2482

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

source/detours/funchook_detour/CMakeLists.txt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ set(target_depends funchook_detour_depends)
1414

1515
include(ExternalProject)
1616

17+
set(FUNCHOOK_VERSION 1.0.0)
18+
1719
if(WIN32)
1820
set(FUNCHOOK_LIBRARY_PREFIX "")
1921
set(FUNCHOOK_LIBRARY_SUFFIX "lib")
@@ -52,7 +54,7 @@ ExternalProject_Add(
5254
SOURCE_DIR ${FUNCHOOK_SOURCE_DIR}
5355
INSTALL_DIR ${FUNCHOOK_INSTALL_DIR}
5456
DOWNLOAD_COMMAND ${FUNCHOOK_DOWNLOAD_COMMAND}
55-
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX=${FUNCHOOK_INSTALL_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DFUNCHOOK_BUILD_SHARED=ON -DFUNCHOOK_BUILD_TESTS=OFF -DFUNCHOOK_BUILD_STATIC=OFF .
57+
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON -DCMAKE_INSTALL_PREFIX=${FUNCHOOK_INSTALL_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DFUNCHOOK_BUILD_SHARED=ON -DFUNCHOOK_BUILD_TESTS=OFF -DFUNCHOOK_BUILD_STATIC=OFF .
5658
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} --target ${FUNCHOOK_BUILD_TARGET}
5759
UPDATE_COMMAND ""
5860
BUILD_IN_SOURCE ON
@@ -265,18 +267,9 @@ target_link_libraries(${target}
265267
# Deployment
266268
#
267269

268-
if(WIN32)
269-
set(FUNCHOOK_LIBRARY_SONAME_INSTALL_DIR)
270-
else()
271-
set(FUNCHOOK_LIBRARY_SONAME_INSTALL_DIR
272-
${FUNCHOOK_LIBRARY_INSTALL_DIR}.1
273-
${FUNCHOOK_LIBRARY_INSTALL_DIR}.1.0.0)
274-
endif()
275-
276-
# Dependency (including symbolic links)
270+
# Dependency
277271
install(FILES
278272
${FUNCHOOK_LIBRARY_INSTALL_DIR}
279-
${FUNCHOOK_LIBRARY_SONAME_INSTALL_DIR}
280273
DESTINATION ${INSTALL_LIB}
281274
COMPONENT runtime
282275
)

source/detours/funchook_detour/scripts/download.bat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if not exist @FUNCHOOK_SOURCE_DIR@/.git (
55
if exist @FUNCHOOK_SOURCE_DIR@ (
66
rmdir /S /Q "@FUNCHOOK_SOURCE_DIR@"
77
)
8-
"@GIT_EXECUTABLE@" clone --single-branch --branch v1.0.0 --recursive https://github.com/kubo/funchook.git @FUNCHOOK_SOURCE_DIR@
8+
"@GIT_EXECUTABLE@" clone --single-branch --branch v@FUNCHOOK_VERSION@ --recursive https://github.com/kubo/funchook.git @FUNCHOOK_SOURCE_DIR@
99
)
1010

1111
rem Write empty CMake file to avoid cmake warnings

source/detours/funchook_detour/scripts/download.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ then
77
then
88
rm -rf @FUNCHOOK_SOURCE_DIR@
99
fi
10-
@GIT_EXECUTABLE@ clone --single-branch --branch v1.0.0 --recursive https://github.com/kubo/funchook.git @FUNCHOOK_SOURCE_DIR@
10+
@GIT_EXECUTABLE@ clone --single-branch --branch v@FUNCHOOK_VERSION@ --recursive https://github.com/kubo/funchook.git @FUNCHOOK_SOURCE_DIR@
1111
fi

0 commit comments

Comments
 (0)