Link with liblcd a second time, silence some warning about cmake behaviour
This commit is contained in:
parent
020c4d8190
commit
d7990ec434
|
@ -1,5 +1,10 @@
|
||||||
project (qsimulat0r)
|
project (qsimulat0r)
|
||||||
cmake_minimum_required(VERSION 2.4.0)
|
cmake_minimum_required(VERSION 2.4.0)
|
||||||
|
|
||||||
|
if(POLICY CMP0015)
|
||||||
|
cmake_policy(SET CMP0015 OLD)
|
||||||
|
endif(POLICY CMP0015)
|
||||||
|
|
||||||
find_package(Qt4 REQUIRED)
|
find_package(Qt4 REQUIRED)
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../firmware ${CMAKE_CURRENT_SOURCE_DIR}/../firmware/core)
|
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../firmware ${CMAKE_CURRENT_SOURCE_DIR}/../firmware/core)
|
||||||
|
@ -55,6 +60,9 @@ libfunk.a
|
||||||
libusbcdc.a
|
libusbcdc.a
|
||||||
libbasic.a
|
libbasic.a
|
||||||
libcore.a
|
libcore.a
|
||||||
|
|
||||||
|
liblcd.a
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue