diff options
| author | Hoernchen <la@tfc-server.de> | 2013-08-07 17:52:15 +0200 |
|---|---|---|
| committer | Hoernchen <la@tfc-server.de> | 2013-08-07 17:52:15 +0200 |
| commit | f2c767d9f0841a549ab9e80e018adfc07c86d9a6 (patch) | |
| tree | 373e1526510b134e5c9bdcf16b1064f56b73a560 | |
| parent | e4a5556213844917285ab79ae278279b9399deb5 (diff) | |
minor cmake fixes
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | plugins/samplesource/osmosdr/CMakeLists.txt | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d57d8bc..ee9f7f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() ############################################################################## diff --git a/plugins/samplesource/osmosdr/CMakeLists.txt b/plugins/samplesource/osmosdr/CMakeLists.txt index b538c6c..9dc9705 100644 --- a/plugins/samplesource/osmosdr/CMakeLists.txt +++ b/plugins/samplesource/osmosdr/CMakeLists.txt @@ -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}) |