cmake: add toplevel scrip, fix include issue

This commit is contained in:
Guilherme Brondani Torri 2016-02-02 20:28:34 +01:00
parent e0b990e7e2
commit fdbbe9dd7e
2 changed files with 12 additions and 13 deletions

View File

@ -1,4 +1,4 @@
PROJECT(qucs-suite CXX C)
PROJECT(qucs-suite CXX)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
cmake_policy(VERSION 2.8)
@ -38,17 +38,6 @@ INCLUDE( ${QT_USE_FILE} )
ADD_DEFINITIONS(${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/qucs
#${CMAKE_SOURCE_DIR}/bitmaps ->no sources here
${CMAKE_SOURCE_DIR}/components
${CMAKE_SOURCE_DIR}/diagrams
${CMAKE_SOURCE_DIR}/dialogs
#${CMAKE_SOURCE_DIR}/octave ->no sources here
${CMAKE_SOURCE_DIR}/paintings
)
ADD_SUBDIRECTORY( qucs )
ADD_SUBDIRECTORY( qucs-activefilter )
ADD_SUBDIRECTORY( qucs-attenuator )

View File

@ -9,7 +9,7 @@
#
# By default, the prefix is "/usr/local"
PROJECT(qucs CXX C)
PROJECT(qucs CXX)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
cmake_policy(VERSION 2.6)
@ -115,6 +115,16 @@ ENDIF(WIN32)
ADD_DEFINITIONS(${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(
${qucs_SOURCE_DIR}
#${qucs_SOURCE_DIR}/bitmaps ->no sources here
${qucs_SOURCE_DIR}/components
${qucs_SOURCE_DIR}/diagrams
${qucs_SOURCE_DIR}/dialogs
#${qucs_SOURCE_DIR}/octave ->no sources here
${qucs_SOURCE_DIR}/paintings
)
#ADD_SUBDIRECTORY( bitmaps ) -> added as resources
ADD_SUBDIRECTORY( components )
ADD_SUBDIRECTORY( diagrams )