Introduce new CMake variable to store kiface install location

CMakeLists.txt

@@ -550,8 +550,17 @@ set( KIFACE_PREFIX  "_" )
 #================================================
 if( NOT APPLE )
     # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
-    set( KICAD_BIN bin
-        CACHE PATH "Location of KiCad binaries." )
+    if( WIN32 )
+        set( KICAD_BIN bin
+            CACHE PATH "Location of KiCad binaries." )
+    else()
+        set( KICAD_BIN ${CMAKE_INSTALL_BINDIR}
+            CACHE PATH "Location of KiCad binaries." )
+    endif()
+
+    # For now, the kifaces are just in the normal bin folder
+    set( KICAD_KIFACE ${KICAD_BIN}
+        CACHE PATH "Location of KiCad kifaces." )
 
     # Do not make these variables "PATH" b/c cmake will truncate them and we need the full path
     if( NOT IS_ABSOLUTE ${CMAKE_INSTALL_DATADIR} )
@@ -663,6 +672,7 @@ else()
 endif()
 
 mark_as_advanced( KICAD_BIN
+    KICAD_KIFACE
     KICAD_PLUGINS
     KICAD_USER_PLUGIN
     KICAD_LIB

cvpcb/CMakeLists.txt

@@ -106,12 +106,12 @@ if( APPLE )
         )
 else()
     install( TARGETS cvpcb_kiface
-        DESTINATION ${KICAD_BIN}
+        DESTINATION ${KICAD_KIFACE}
         COMPONENT binary
         )
 endif()
 
 if( KICAD_WIN32_INSTALL_PDBS )
     # Get the PDBs to copy over for MSVC
-    install(FILES $<TARGET_PDB_FILE:cvpcb_kiface> DESTINATION ${KICAD_BIN})
+    install(FILES $<TARGET_PDB_FILE:cvpcb_kiface> DESTINATION ${KICAD_KIFACE})
 endif()

eeschema/CMakeLists.txt

@@ -527,7 +527,7 @@ else()
     install( TARGETS eeschema_kiface
         # actual filename subject to change at milestone C)
         # modular-kicad blueprint.
-        DESTINATION ${KICAD_BIN}
+        DESTINATION ${KICAD_KIFACE}
         COMPONENT binary
         )
 endif()
@@ -536,7 +536,7 @@ endif()
 if( KICAD_WIN32_INSTALL_PDBS )
     # Get the PDBs to copy over for MSVC
     install(FILES $<TARGET_PDB_FILE:eeschema> DESTINATION ${KICAD_BIN})
-    install(FILES $<TARGET_PDB_FILE:eeschema_kiface> DESTINATION ${KICAD_BIN})
+    install(FILES $<TARGET_PDB_FILE:eeschema_kiface> DESTINATION ${KICAD_KIFACE})
 endif()
 
 # auto-generate cmp_library_lexer.h and cmp_library_keywords.cpp for the component

gerbview/CMakeLists.txt

@@ -205,7 +205,7 @@ else()
         COMPONENT binary
         )
     install( TARGETS gerbview_kiface
-        DESTINATION ${KICAD_BIN}
+        DESTINATION ${KICAD_KIFACE}
         COMPONENT binary
         )
 endif()
@@ -214,5 +214,5 @@ endif()
 if( KICAD_WIN32_INSTALL_PDBS )
     # Get the PDBs to copy over for MSVC
     install(FILES $<TARGET_PDB_FILE:gerbview> DESTINATION ${KICAD_BIN})
-    install(FILES $<TARGET_PDB_FILE:gerbview_kiface> DESTINATION ${KICAD_BIN})
+    install(FILES $<TARGET_PDB_FILE:gerbview_kiface> DESTINATION ${KICAD_KIFACE})
 endif()

pagelayout_editor/CMakeLists.txt

@@ -168,7 +168,7 @@ else()
         COMPONENT binary
         )
     install( TARGETS pl_editor_kiface
-        DESTINATION ${KICAD_BIN}
+        DESTINATION ${KICAD_KIFACE}
         COMPONENT binary
         )
 endif()
@@ -176,5 +176,5 @@ endif()
 if( KICAD_WIN32_INSTALL_PDBS )
     # Get the PDBs to copy over for MSVC
     install(FILES $<TARGET_PDB_FILE:pl_editor> DESTINATION ${KICAD_BIN})
-    install(FILES $<TARGET_PDB_FILE:pl_editor_kiface> DESTINATION ${KICAD_BIN})
-endif()
+    install(FILES $<TARGET_PDB_FILE:pl_editor_kiface> DESTINATION ${KICAD_KIFACE})
+endif()

pcb_calculator/CMakeLists.txt

@@ -161,7 +161,7 @@ else()
         COMPONENT binary
         )
     install( TARGETS pcb_calculator_kiface
-        DESTINATION ${KICAD_BIN}
+        DESTINATION ${KICAD_KIFACE}
         COMPONENT binary
         )
 endif()
@@ -169,7 +169,7 @@ endif()
 if( KICAD_WIN32_INSTALL_PDBS )
     # Get the PDBs to copy over for MSVC
     install(FILES $<TARGET_PDB_FILE:pcb_calculator> DESTINATION ${KICAD_BIN})
-    install(FILES $<TARGET_PDB_FILE:pcb_calculator_kiface> DESTINATION ${KICAD_BIN})
+    install(FILES $<TARGET_PDB_FILE:pcb_calculator_kiface> DESTINATION ${KICAD_KIFACE})
 endif()
 
 # auto-generate pcb_calculator_datafile.h and pcb_calculator_datafile_keywords.cpp

pcbnew/CMakeLists.txt

@@ -783,7 +783,7 @@ else()
         COMPONENT binary
         )
     install( TARGETS pcbnew_kiface
-        DESTINATION ${KICAD_BIN}
+        DESTINATION ${KICAD_KIFACE}
         COMPONENT binary
         )
 endif()
@@ -791,7 +791,7 @@ endif()
 if( KICAD_WIN32_INSTALL_PDBS )
     # Get the PDBs to copy over for MSVC
     install(FILES $<TARGET_PDB_FILE:pcbnew> DESTINATION ${KICAD_BIN})
-    install(FILES $<TARGET_PDB_FILE:pcbnew_kiface> DESTINATION ${KICAD_BIN})
+    install(FILES $<TARGET_PDB_FILE:pcbnew_kiface> DESTINATION ${KICAD_KIFACE})
 endif()
 
 if( NOT APPLE )

scripting/CMakeLists.txt

@@ -72,18 +72,18 @@ if( APPLE )
         )
 else()
     install( TARGETS scripting_kiface
-        DESTINATION ${KICAD_BIN}
+        DESTINATION ${KICAD_KIFACE}
         COMPONENT binary
         )
 endif()
 
 if( KICAD_WIN32_INSTALL_PDBS )
     # Get the PDBs to copy over for MSVC
-    install(FILES $<TARGET_PDB_FILE:scripting_kiface> DESTINATION ${KICAD_BIN})
+    install(FILES $<TARGET_PDB_FILE:scripting_kiface> DESTINATION ${KICAD_KIFACE})
 endif()
 
 # python shell installation
 install( DIRECTORY ${PROJECT_SOURCE_DIR}/scripting/kicad_pyshell/
     DESTINATION ${KICAD_DATA}/scripting/kicad_pyshell
     FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
-)
+)