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
4eec9fd0
Commit
4eec9fd0
authored
Apr 01, 2014
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix OpenMP link error on MinGW.
parent
4426d4c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
CMakeLists.txt
CMakeLists.txt
+7
-0
CMakeLists.txt
cvpcb/CMakeLists.txt
+1
-0
CMakeLists.txt
pcbnew/CMakeLists.txt
+2
-0
No files found.
CMakeLists.txt
View file @
4eec9fd0
...
...
@@ -157,10 +157,17 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
endif
()
find_package
(
OpenMP QUIET
)
if
(
OPENMP_FOUND
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
OpenMP_C_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
OpenMP_CXX_FLAGS
}
"
)
add_definitions
(
-DUSE_OPENMP
)
# MinGW does not include the OpenMP link library and FindOpenMP.cmake does not
# set it either. Not sure this is the most elegant solution but it works.
if
(
MINGW
)
set
(
OPENMP_LIBRARIES gomp
)
endif
()
endif
()
if
(
MINGW
)
...
...
cvpcb/CMakeLists.txt
View file @
4eec9fd0
...
...
@@ -116,6 +116,7 @@ if( USE_KIWAY_DLLS )
${
GLEW_LIBRARIES
}
${
CAIRO_LIBRARIES
}
${
PIXMAN_LIBRARY
}
${
OPENMP_LIBRARIES
}
)
# Only for win32 cross compilation using MXE
...
...
pcbnew/CMakeLists.txt
View file @
4eec9fd0
...
...
@@ -536,6 +536,7 @@ if( USE_KIWAY_DLLS )
OUTPUT_NAME pcbnew
PREFIX
${
KIFACE_PREFIX
}
SUFFIX
${
KIFACE_SUFFIX
}
COMPILE_FLAGS
${
OpenMP_CXX_FLAGS
}
)
target_link_libraries
(
pcbnew_kiface
3d-viewer
...
...
@@ -557,6 +558,7 @@ if( USE_KIWAY_DLLS )
${
PIXMAN_LIBRARY
}
${
Boost_LIBRARIES
}
# must follow GITHUB
${
PCBNEW_EXTRA_LIBS
}
# -lrt must follow Boost
${
OPENMP_LIBRARIES
}
)
set_source_files_properties
(
pcbnew.cpp PROPERTIES
# The KIFACE is in pcbnew.cpp, export it:
...
...
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