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
3582df6a
Commit
3582df6a
authored
Dec 09, 2013
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
molding mercury.
parent
d8b270ca
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
footprint_info.cpp
common/footprint_info.cpp
+1
-1
CMakeLists.txt
cvpcb/CMakeLists.txt
+3
-1
CMakeLists.txt
pcbnew/CMakeLists.txt
+2
-4
No files found.
common/footprint_info.cpp
View file @
3582df6a
...
@@ -321,7 +321,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
...
@@ -321,7 +321,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
i
+=
jobz
;
i
+=
jobz
;
}
}
// Wait for all the wor
d
er threads to complete, it does not matter in what order
// Wait for all the wor
k
er threads to complete, it does not matter in what order
// we wait for them as long as a full sweep is made. Think of the great race,
// we wait for them as long as a full sweep is made. Think of the great race,
// everyone must finish.
// everyone must finish.
for
(
unsigned
i
=
0
;
i
<
threads
.
size
();
++
i
)
for
(
unsigned
i
=
0
;
i
<
threads
.
size
();
++
i
)
...
...
cvpcb/CMakeLists.txt
View file @
3582df6a
...
@@ -107,7 +107,6 @@ target_link_libraries( cvpcb
...
@@ -107,7 +107,6 @@ target_link_libraries( cvpcb
${
GDI_PLUS_LIBRARIES
}
${
GDI_PLUS_LIBRARIES
}
${
GLEW_LIBRARIES
}
${
GLEW_LIBRARIES
}
${
CAIRO_LIBRARIES
}
${
CAIRO_LIBRARIES
}
${
Boost_LIBRARIES
}
)
)
# Only for win32 cross compilation using MXE
# Only for win32 cross compilation using MXE
...
@@ -127,6 +126,9 @@ if( BUILD_GITHUB_PLUGIN )
...
@@ -127,6 +126,9 @@ if( BUILD_GITHUB_PLUGIN )
target_link_libraries
(
cvpcb github_plugin
)
target_link_libraries
(
cvpcb github_plugin
)
endif
()
endif
()
# Must follow github_plugin
target_link_libraries
(
cvpcb
${
Boost_LIBRARIES
}
)
###
###
# Add cvpcb as install target
# Add cvpcb as install target
...
...
pcbnew/CMakeLists.txt
View file @
3582df6a
...
@@ -379,7 +379,7 @@ if( KICAD_SCRIPTING_MODULES )
...
@@ -379,7 +379,7 @@ if( KICAD_SCRIPTING_MODULES )
${
GDI_PLUS_LIBRARIES
}
${
GDI_PLUS_LIBRARIES
}
${
PYTHON_LIBRARIES
}
${
PYTHON_LIBRARIES
}
${
PCBNEW_EXTRA_LIBS
}
${
PCBNEW_EXTRA_LIBS
}
${
Boost_LIBRARIES
}
${
Boost_LIBRARIES
}
# must follow GITHUB
)
)
# create .i files from XML doxygen parsing, docstrings.i will include all of them
# create .i files from XML doxygen parsing, docstrings.i will include all of them
...
@@ -533,8 +533,6 @@ endif()
...
@@ -533,8 +533,6 @@ endif()
# Link executable target pcbnew with correct libraries
# Link executable target pcbnew with correct libraries
###
###
message
(
STATUS
"Boost_LIBRARIES:
${
Boost_LIBRARIES
}
"
)
target_link_libraries
(
pcbnew
target_link_libraries
(
pcbnew
3d-viewer
3d-viewer
pcbcommon
pcbcommon
...
@@ -553,7 +551,7 @@ target_link_libraries( pcbnew
...
@@ -553,7 +551,7 @@ target_link_libraries( pcbnew
${
PCBNEW_EXTRA_LIBS
}
${
PCBNEW_EXTRA_LIBS
}
${
GLEW_LIBRARIES
}
${
GLEW_LIBRARIES
}
${
CAIRO_LIBRARIES
}
${
CAIRO_LIBRARIES
}
${
Boost_LIBRARIES
}
${
Boost_LIBRARIES
}
# must follow GITHUB
)
)
# Only for win32 cross compilation using MXE
# Only for win32 cross compilation using MXE
...
...
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