CMake enhancements.
This commit is contained in:
parent
ff567328ed
commit
6e9097b402
|
@ -43,16 +43,10 @@ IF(wxWidgets_FOUND)
|
|||
# We define the include paths here, our minimal source dir is one,
|
||||
# and also the include dirs defined by wxWidgets
|
||||
INCLUDE_DIRECTORIES(
|
||||
#${KICAD_EDA_SOURCE_DIR}/include
|
||||
#${KICAD_EDA_SOURCE_DIR}/common
|
||||
#${KICAD_EDA_SOURCE_DIR}/share
|
||||
#${KICAD_EDA_SOURCE_DIR}/kicad/bitmaps
|
||||
#${KICAD_EDA_SOURCE_DIR}/common/bitmaps
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
${CMAKE_SOURCE_DIR}/common
|
||||
#${CMAKE_SOURCE_DIR}/share
|
||||
${CMAKE_SOURCE_DIR}/kicad/bitmaps
|
||||
${CMAKE_SOURCE_DIR}/common/bitmaps
|
||||
${wxWidgets_INCLUDE_DIRS}
|
||||
|
@ -65,4 +59,4 @@ ENDIF(wxWidgets_FOUND)
|
|||
|
||||
add_subdirectory (common)
|
||||
add_subdirectory (kicad)
|
||||
#SUBDIRS(common kicad)
|
||||
|
||||
|
|
|
@ -25,7 +25,4 @@ ADD_EXECUTABLE(kicad WIN32 ${SRCS})
|
|||
# We add to our target 'kicad' the wxWidgets libraries. These are
|
||||
# set for us by the find script. If you need other libraries, you
|
||||
# can add them here as well.
|
||||
TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES})
|
||||
|
||||
LINK_DIRECTORIES(${KICAD_EDA_BINARY_DIR}/common
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES} common)
|
||||
|
|
Loading…
Reference in New Issue