haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake enhancements.

This commit is contained in:
plyatov 2007-11-07 21:35:18 +00:00
parent ff567328ed
commit 6e9097b402
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -43,16 +43,10 @@ IF(wxWidgets_FOUND)
# We define the include paths here, our minimal source dir is one, # We define the include paths here, our minimal source dir is one,
# and also the include dirs defined by wxWidgets # and also the include dirs defined by wxWidgets
INCLUDE_DIRECTORIES( 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_BINARY_DIR}
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/common
#${CMAKE_SOURCE_DIR}/share
${CMAKE_SOURCE_DIR}/kicad/bitmaps ${CMAKE_SOURCE_DIR}/kicad/bitmaps
${CMAKE_SOURCE_DIR}/common/bitmaps ${CMAKE_SOURCE_DIR}/common/bitmaps
${wxWidgets_INCLUDE_DIRS} ${wxWidgets_INCLUDE_DIRS}
@ -65,4 +59,4 @@ ENDIF(wxWidgets_FOUND)
add_subdirectory (common) add_subdirectory (common)
add_subdirectory (kicad) add_subdirectory (kicad)
#SUBDIRS(common kicad)

5
kicad/CMakeLists.txt
View File

@ -25,7 +25,4 @@ ADD_EXECUTABLE(kicad WIN32 ${SRCS})
# We add to our target 'kicad' the wxWidgets libraries. These are # We add to our target 'kicad' the wxWidgets libraries. These are
# set for us by the find script. If you need other libraries, you # set for us by the find script. If you need other libraries, you
# can add them here as well. # can add them here as well.
TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES}) TARGET_LINK_LIBRARIES(kicad ${wxWidgets_LIBRARIES} common)
LINK_DIRECTORIES(${KICAD_EDA_BINARY_DIR}/common
)