Minor changes in cmake file
This commit is contained in:
1 parent
d9fbfa28cc
commit
d23cb87bf0
2 files changed
+11
-1
No files matched your search
+7
-1
@@ -33,11 +33,17 @@ FILE( GLOB SOURCES_FILES ${SRC_DIR}/app/*.cpp ${SRC_DIR}/lib/*.cpp )
|
|||||||
FILE( GLOB FORMS_FILES ${UI_DIR}/*.ui )
|
FILE( GLOB FORMS_FILES ${UI_DIR}/*.ui )
|
||||||
FILE( GLOB RESOURCES_FILES ${RSC_DIR}/*.qrc )
|
FILE( GLOB RESOURCES_FILES ${RSC_DIR}/*.qrc )
|
||||||
|
|
||||||
|
# must go before the project command
|
||||||
|
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
|
||||||
|
if(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8")
|
||||||
|
set_property( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
|
||||||
|
endif()
|
||||||
|
|
||||||
######################################################################################
|
######################################################################################
|
||||||
# Variables
|
# Variables
|
||||||
######################################################################################
|
######################################################################################
|
||||||
# ADD_OPTION(CMAKE_BUILD_TYPE "Build type" "Release" )
|
OPTION(QT_DIR "QT install dir on Windows" "" )
|
||||||
|
ADD_OPTION(USE_QT4 "Build with QT4" OFF )
|
||||||
ADD_OPTION(USE_WERROR "Warnings as errors" OFF )
|
ADD_OPTION(USE_WERROR "Warnings as errors" OFF )
|
||||||
ADD_OPTION(USE_QT4 "Build with QT4" OFF )
|
ADD_OPTION(USE_QT4 "Build with QT4" OFF )
|
||||||
ADD_OPTION(USE_OPENCV "Add OpenCV support" OFF )
|
ADD_OPTION(USE_OPENCV "Add OpenCV support" OFF )
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
# Qt library cmake file
|
# Qt library cmake file
|
||||||
######################################################################################
|
######################################################################################
|
||||||
|
|
||||||
|
IF( WIN32 )
|
||||||
|
SET (CMAKE_PREFIX_PATH ${QT_DIR} )
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
IF( USE_QT4 )
|
IF( USE_QT4 )
|
||||||
FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui )
|
FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui )
|
||||||
IF( NOT QT4_FOUND)
|
IF( NOT QT4_FOUND)
|
||||||
|
|||||||
Reference in new issue
Block a user