git-svn-id: svn://db.shs.com.ru/pip@969 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

CMakeLists.txt

@@ -22,7 +22,6 @@ option(STD_IOSTREAM "Building with std iostream operators support" OFF)
 option(INTROSPECTION "Build with introspection" OFF)
 option(LIB "System install" ON)
 option(STATIC_LIB OFF)
-option(DEBUG "Build with -g3" OFF)
 option(TESTS "Build tests and perform their before install step" OFF)
 set(PIP_UTILS 1)
 if(LIBPROJECT)
@@ -263,12 +262,12 @@ CHECK_FUNCTION_EXISTS(timer_delete PIP_TIMER_RT_2)
 
 
 # Check if build debug version
-if(DEBUG)
+if (CMAKE_BUILD_TYPE MATCHES Debug)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall")
 	add_definitions(-DPIP_DEBUG)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	message(STATUS "Building PIP debug version")
 else()
-	set(CMAKE_BUILD_TYPE "Release")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
 	message(STATUS "Building PIP release version")
 endif()
 
@@ -384,14 +383,10 @@ if(WIN32)
 	add_definitions(-DPSAPI_VERSION=1)
 	add_library(pip ${PIP_LIB_TYPE} ${CPP_LIB_MAIN} ${HDRS} ${PHDRS})
 	if(${C_COMPILER} STREQUAL "cl.exe")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Ot /W0")
-	else()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
-		#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+		set(CMAKE_CXX_FLAGS "/O2 /Ob2 /Ot /W0")
 	endif()
 else()
-	set(${CMAKE_CXX_FLAGS} "${CMAKE_CXX_FLAGS} -O3 -fPIC")
-	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+	set(${CMAKE_CXX_FLAGS} "${CMAKE_CXX_FLAGS} -fPIC")
 	if(DEFINED ENV{QNX_HOST} OR PIP_FREERTOS)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32")
 	else()