Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
918c5d84
Commit
918c5d84
authored
Jun 18, 2011
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Brians patch
parent
c1802037
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
CMakeLists.txt
kicad/minizip/CMakeLists.txt
+5
-3
No files found.
kicad/minizip/CMakeLists.txt
View file @
918c5d84
...
@@ -4,11 +4,12 @@ if(ZLIB_FOUND)
...
@@ -4,11 +4,12 @@ if(ZLIB_FOUND)
else
(
ZLIB_FOUND
)
else
(
ZLIB_FOUND
)
message
(
STATUS
"Check for installed zlib -- not found"
)
message
(
STATUS
"Check for installed zlib -- not found"
)
message
(
STATUS
"Use wxWidgets zlib"
)
message
(
STATUS
"Use wxWidgets zlib"
)
# zlib is not installed, and in this case wxWidgets creates its own zlib library
# zlib is not installed, and in this case wxWidgets creates its own zlib library
# include files are in ${wxWidgets_ROOT_DIR}/src/zlib
# include files are in ${wxWidgets_ROOT_DIR}/src/zlib
# and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)
# and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)
# and we try to use it
# and we try to use it
# Unfortunately, we have no way to know exactl
t
y the path of zlib.h because this file
# Unfortunately, we have no way to know exactly the path of zlib.h because this file
# is in wxWidgets sources, not in wxWidgets include path.
# is in wxWidgets sources, not in wxWidgets include path.
find_path
(
ZLIB_INCLUDE_DIR
find_path
(
ZLIB_INCLUDE_DIR
zlib.h
zlib.h
...
@@ -16,10 +17,11 @@ else(ZLIB_FOUND)
...
@@ -16,10 +17,11 @@ else(ZLIB_FOUND)
DOC
"location of zlib include files"
DOC
"location of zlib include files"
)
)
find_file
(
find_file
(
ZLIB_LIBRARIES NAMES
${
wxWidgets_LIB_DIR
}
/libwxzlib-2.8.a
ZLIB_LIBRARIES NAMES
${
wxWidgets_LIB_DIR
}
/libwxzlib-2.8.a
ZLIB_LIBRARIES NAMES
${
wxWidgets_LIB_DIR
}
/libwxzlib-2.9.a libwxzlib.a
ZLIB_LIBRARIES NAMES
${
wxWidgets_LIB_DIR
}
/libwxzlib-2.9.a libwxzlib.a
PATHS
${
wxWidgets_ROOT_DIR
}
/lib/ PATH_SUFFIXES gcc_dll
PATHS
${
wxWidgets_ROOT_DIR
}
/lib/
PATH_SUFFIXES gcc_lib gcc_dll
DOC
"location of wxzlib library file"
DOC
"location of wxzlib library file"
)
)
endif
(
ZLIB_FOUND
)
endif
(
ZLIB_FOUND
)
...
...
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