Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-cmake-builder
Commits
71438dcf
Commit
71438dcf
authored
Apr 14, 2015
by
Ghislain MARY
Browse files
Install windows tools to the install prefix.
parent
2afed171
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
cmake/LinphoneCMakeBuilder.cmake
cmake/LinphoneCMakeBuilder.cmake
+5
-7
No files found.
cmake/LinphoneCMakeBuilder.cmake
View file @
71438dcf
...
...
@@ -81,11 +81,11 @@ if(WIN32)
COMMAND
"
${
CMAKE_COMMAND
}
"
"-E"
"tar"
"x"
"
${
CMAKE_BINARY_DIR
}
/linphone_builder_windows_tools.zip"
WORKING_DIRECTORY
${
_windows_tools_dir
}
)
file
(
MAKE_DIRECTORY
"
${
LINPHONE_BUILDER_WORK_DIR
}
/
w
in
dows_tools
"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/awk.exe"
"
${
LINPHONE_BUILDER_WORK_DIR
}
/
w
in
dows_tools
/awk.exe"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/nasm.exe"
"
${
LINPHONE_BUILDER_WORK_DIR
}
/
w
in
dows_tools
/nasm.exe"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/patch.exe"
"
${
LINPHONE_BUILDER_WORK_DIR
}
/
w
in
dows_tools
/patch.exe"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/sed.exe"
"
${
LINPHONE_BUILDER_WORK_DIR
}
/
w
in
dows_tools
/sed.exe"
)
file
(
MAKE_DIRECTORY
"
${
CMAKE_INSTALL_PREFIX
}
/
b
in"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/awk.exe"
"
${
CMAKE_INSTALL_PREFIX
}
/
b
in/awk.exe"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/nasm.exe"
"
${
CMAKE_INSTALL_PREFIX
}
/
b
in/nasm.exe"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/patch.exe"
"
${
CMAKE_INSTALL_PREFIX
}
/
b
in/patch.exe"
)
file
(
RENAME
"
${
_windows_tools_dir
}
/sed.exe"
"
${
CMAKE_INSTALL_PREFIX
}
/
b
in/sed.exe"
)
if
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
file
(
RENAME
"
${
_windows_tools_dir
}
/yasm-1.3.0-win64.exe"
"C:/MinGW/bin/yasm.exe"
)
else
()
...
...
@@ -96,7 +96,6 @@ endif()
find_program
(
PATCH_PROGRAM
NAMES patch patch.exe
HINTS
"
${
LINPHONE_BUILDER_WORK_DIR
}
/windows_tools"
)
if
(
NOT PATCH_PROGRAM
)
if
(
WIN32
)
...
...
@@ -108,7 +107,6 @@ endif()
find_program
(
SED_PROGRAM
NAMES sed sed.exe
HINTS
"
${
LINPHONE_BUILDER_WORK_DIR
}
/windows_tools"
)
if
(
NOT SED_PROGRAM
)
if
(
WIN32
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment