Commit 4d7149b1 authored by f3nix's avatar f3nix

CMake: Fix bug in install targets.

parent c65942e1
...@@ -75,6 +75,5 @@ add_executable(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_EXTRA_SRCS} ${CVP ...@@ -75,6 +75,5 @@ add_executable(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_EXTRA_SRCS} ${CVP
target_link_libraries(cvpcb 3d-viewer common polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES}) target_link_libraries(cvpcb 3d-viewer common polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
install(TARGETS cvpcb install(TARGETS cvpcb
RUNTIME DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
BUNDLE DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
...@@ -126,8 +126,7 @@ add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SR ...@@ -126,8 +126,7 @@ add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SR
target_link_libraries(eeschema common bitmaps ${wxWidgets_LIBRARIES}) target_link_libraries(eeschema common bitmaps ${wxWidgets_LIBRARIES})
install(TARGETS eeschema install(TARGETS eeschema
RUNTIME DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
BUNDLE DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
add_subdirectory(plugins) add_subdirectory(plugins)
...@@ -5,5 +5,5 @@ endif(UNIX) ...@@ -5,5 +5,5 @@ endif(UNIX)
add_executable(netlist_form_pads-pcb netlist_form_pads-pcb.cpp) add_executable(netlist_form_pads-pcb netlist_form_pads-pcb.cpp)
install(TARGETS netlist_form_pads-pcb install(TARGETS netlist_form_pads-pcb
RUNTIME DESTINATION ${KICAD_PLUGINS} DESTINATION ${KICAD_PLUGINS}
COMPONENT binary) COMPONENT binary)
...@@ -81,6 +81,5 @@ add_executable(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SR ...@@ -81,6 +81,5 @@ add_executable(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SR
target_link_libraries(gerbview 3d-viewer common polygon bitmaps kbool ${wxWidgets_LIBRARIES}) target_link_libraries(gerbview 3d-viewer common polygon bitmaps kbool ${wxWidgets_LIBRARIES})
install(TARGETS gerbview install(TARGETS gerbview
RUNTIME DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
BUNDLE DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
...@@ -34,8 +34,7 @@ add_executable(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KIC ...@@ -34,8 +34,7 @@ add_executable(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KIC
target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES}) target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
install(TARGETS kicad install(TARGETS kicad
RUNTIME DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
BUNDLE DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
if(KICAD_MINIZIP) if(KICAD_MINIZIP)
......
...@@ -25,5 +25,5 @@ add_executable(minizip ${MINIZIP_SRCS}) ...@@ -25,5 +25,5 @@ add_executable(minizip ${MINIZIP_SRCS})
target_link_libraries(minizip ${ZLIB_LIBRARIES}) target_link_libraries(minizip ${ZLIB_LIBRARIES})
install(TARGETS minizip install(TARGETS minizip
RUNTIME DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
...@@ -171,8 +171,7 @@ add_executable(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} ${PCBNEW_EXTRA_SRCS} ${ ...@@ -171,8 +171,7 @@ add_executable(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} ${PCBNEW_EXTRA_SRCS} ${
target_link_libraries(pcbnew 3d-viewer common polygon bitmaps kbool ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES}) target_link_libraries(pcbnew 3d-viewer common polygon bitmaps kbool ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
install(TARGETS pcbnew install(TARGETS pcbnew
RUNTIME DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
BUNDLE DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment