minor cmake fixes
This commit is contained in:
parent
e4a5556213
commit
f2c767d9f0
|
@ -234,13 +234,14 @@ include_directories(
|
|||
${OPENGL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse2" )
|
||||
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse2" )
|
||||
|
||||
if(MSVC)
|
||||
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox" )
|
||||
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE2" )
|
||||
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE2" )
|
||||
set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
|
||||
add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
|
||||
else()
|
||||
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse2" )
|
||||
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse2" )
|
||||
endif()
|
||||
|
||||
##############################################################################
|
||||
|
|
|
@ -31,6 +31,10 @@ add_definitions(${QT_DEFINITIONS})
|
|||
add_definitions(-DQT_PLUGIN)
|
||||
add_definitions(-DQT_SHARED)
|
||||
|
||||
if(MSVC)
|
||||
add_definitions(-DNOMINMAX)
|
||||
endif()
|
||||
|
||||
#qt4_wrap_cpp(osmosdr_HEADERS_MOC ${osmosdr_HEADERS})
|
||||
qt5_wrap_ui(osmosdr_FORMS_HEADERS ${osmosdr_FORMS})
|
||||
|
||||
|
|
Loading…
Reference in New Issue