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
fa9f2f04
Commit
fa9f2f04
authored
Oct 19, 2014
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MSYS2 build configuration issues.
parent
5c952a2a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
2 deletions
+31
-2
CMakeLists.txt
CMakeLists.txt
+2
-1
FindwxWidgets.cmake
CMakeModules/FindwxWidgets.cmake
+29
-1
No files found.
CMakeLists.txt
View file @
fa9f2f04
...
...
@@ -617,7 +617,8 @@ if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
# Get the correct Python site package install path from the Python interpreter found by
# FindPythonInterp unless the user specifically defined a custom path.
if
(
NOT PYTHON_SITE_PACKAGE_PATH
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import distutils.sysconfig;print
\"
%s
\"
%distutils.sysconfig.get_python_lib()"
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import distutils.sysconfig;print
\"
%s
\"
%distutils.sysconfig.get_python_lib(plat_specific=0, standard_lib=0, prefix='')"
# execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig;print\"%s\"%distutils.sysconfig.get_python_lib()"
OUTPUT_VARIABLE PYTHON_SITE_PACKAGE_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
...
...
CMakeModules/FindwxWidgets.cmake
View file @
fa9f2f04
...
...
@@ -840,6 +840,34 @@ else(wxWidgets_FIND_STYLE STREQUAL "win32")
endif
(
RET EQUAL 0
)
endif
(
wxWidgets_CONFIG_EXECUTABLE
)
# When using wx-config in MSYS, the include paths are UNIX style paths which may or may
# not work correctly depending on you MSYS/MinGW configuration. CMake expects native
# paths internally.
if
(
wxWidgets_FOUND AND MSYS
)
find_program
(
_cygpath_exe cygpath ONLY_CMAKE_FIND_ROOT_PATH
)
dbg_msg_v
(
"_cygpath_exe:
${
_cygpath_exe
}
"
)
if
(
_cygpath_exe
)
set
(
_tmp_path
""
)
foreach
(
_path
${
wxWidgets_INCLUDE_DIRS
}
)
execute_process
(
COMMAND cygpath -w
${
_path
}
OUTPUT_VARIABLE _native_path
RESULT_VARIABLE _retv
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
if
(
_retv EQUAL 0
)
file
(
TO_CMAKE_PATH
${
_native_path
}
_native_path
)
dbg_msg_v
(
"Path
${
_path
}
converted to
${
_native_path
}
"
)
set
(
_tmp_path
"
${
_tmp_path
}
${
_native_path
}
"
)
endif
()
endforeach
()
dbg_msg
(
"Setting wxWidgets_INCLUDE_DIRS =
${
_tmp_path
}
"
)
set
(
wxWidgets_INCLUDE_DIRS
${
_tmp_path
}
)
separate_arguments
(
wxWidgets_INCLUDE_DIRS
)
list
(
REMOVE_ITEM wxWidgets_INCLUDE_DIRS
""
)
endif
()
endif
()
#=====================================================================
# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
#=====================================================================
...
...
@@ -900,7 +928,7 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args
(
wxWidgets
FOUND_VAR wxWidgets_FOUND
REQUIRED_VARS wxWidgets_LIBRARIES
REQUIRED_VARS wxWidgets_LIBRARIES
wxWidgets_INCLUDE_DIRS
VERSION_VAR wxWidgets_VERSION_STRING
)
...
...
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