Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
T.J. Corona
CMB-SuperBuild
Commits
eabdb7e2
Commit
eabdb7e2
authored
Aug 24, 2015
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32: use zlib, bzip2, and freetype from python tarball
parent
c4ed6396
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
42 deletions
+6
-42
CMakeLists.txt
CMakeLists.txt
+0
-8
Projects/win32/bzip2.cmake
Projects/win32/bzip2.cmake
+2
-0
Projects/win32/freetype-build.cmake
Projects/win32/freetype-build.cmake
+0
-10
Projects/win32/freetype-install.cmake
Projects/win32/freetype-install.cmake
+0
-8
Projects/win32/freetype.cmake
Projects/win32/freetype.cmake
+2
-16
Projects/win32/zlib.cmake
Projects/win32/zlib.cmake
+2
-0
No files found.
CMakeLists.txt
View file @
eabdb7e2
...
...
@@ -182,14 +182,6 @@ if (WIN32)
find_program
(
NMAKE_PATH nmake
)
mark_as_advanced
(
DEVENV_PATH NMAKE_PATH
)
endif
()
# Freetype uses its own build system on win32...
find_program
(
FTJAM_EXECUTABLE jam
)
mark_as_advanced
(
FTJAM_EXECUTABLE
)
if
(
freetype_ENABLED
)
if
(
NOT FTJAM_EXECUTABLE
)
message
(
FATAL_ERROR
"FreeType's 'jam' build tool not found! Download it from http://sourceforge.net/projects/freetype/files/ftjam/2.5.2/ and set FTJAM_EXECUTABLE appropriately."
)
endif
()
endif
()
endif
()
#-----------------------------------------------------------------------------
include
(
CMBModules
)
...
...
Projects/win32/bzip2.cmake
0 → 100644
View file @
eabdb7e2
add_external_dummy_project
(
bzip2
DEPENDS python
)
Projects/win32/freetype-build.cmake
deleted
100644 → 0
View file @
c4ed6396
set
(
ENV{JAM_TOOLSET} VISUALC
)
execute_process
(
COMMAND
${
FTJAM_EXECUTABLE
}
WORKING_DIRECTORY
${
WORKING_DIRECTORY
}
OUTPUT_VARIABLE output
ERROR_VARIABLE error
RESULT_VARIABLE rv
)
if
(
NOT
${
rv
}
EQUAL 0
)
message
(
FATAL_ERROR
"Error building freetype!
\n
${
output
}
\n
${
error
}
"
)
endif
()
Projects/win32/freetype-install.cmake
deleted
100644 → 0
View file @
c4ed6396
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy_if_different
"
${
SOURCE_DIR
}
/objs/freetype.lib"
"
${
INSTALL_DIR
}
/lib/freetype.lib"
)
execute_process
(
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy_directory
"
${
SOURCE_DIR
}
/include"
"
${
INSTALL_DIR
}
/include/freetype2"
)
Projects/win32/freetype.cmake
View file @
eabdb7e2
add_external_project
(
freetype
DEPENDS zlib
CONFIGURE_COMMAND
""
BUILD_IN_SOURCE 1
BUILD_COMMAND
${
CMAKE_COMMAND
}
-DFTJAM_EXECUTABLE:PATH=
${
FTJAM_EXECUTABLE
}
-DWORKING_DIRECTORY:PATH=<SOURCE_DIR>
-P
${
SuperBuild_PROJECTS_DIR
}
/win32/freetype-build.cmake
INSTALL_COMMAND
${
CMAKE_COMMAND
}
-DSOURCE_DIR:PATH=<SOURCE_DIR>
-DINSTALL_DIR:PATH=<INSTALL_DIR>
-P
${
SuperBuild_PROJECTS_DIR
}
/win32/freetype-install.cmake
)
add_external_dummy_project
(
freetype
DEPENDS python
)
Projects/win32/zlib.cmake
0 → 100644
View file @
eabdb7e2
add_external_dummy_project
(
zlib
DEPENDS python
)
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