summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kutsan <akutsan@luxoft.com>2017-03-03 11:32:09 +0200
committerAlex Kutsan <akutsan@luxoft.com>2017-03-03 11:32:09 +0200
commita64d17bdf8988b1c88a9d5b32a625a9812c3135a (patch)
treecae957401023a84f4678996e888cfa4027ab41ef
parentbebac77c41cb6fce9891e6fc50f304ba222a526b (diff)
downloadsdl_core-a64d17bdf8988b1c88a9d5b32a625a9812c3135a.tar.gz
Set Debug as default build
In case if CMAKE_BUILD_TYPE didn't set, set CMAKE_BUILD_TYPE=Debug Note: Cotire incorrectly create united file in case if CMAKE_BUILD_TYPE is empty
-rw-r--r--CMakeLists.txt8
-rw-r--r--src/appMain/CMakeLists.txt4
2 files changed, 2 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07dd4e8bea..a813b98a1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,6 @@ if(EXTENDED_POLICY STREQUAL "")
endif()
set(OS_TYPE_OPTION "$ENV{OS_TYPE}")
-set(DEBUG_OPTION "$ENV{DEBUG}")
set(HMI_TYPE_OPTION "$ENV{HMI_TYPE}")
set(TARGET_OPTION "$ENV{TARGET}")
set(MEDIA_MODE_OPTION "$ENV{MEDIA_MODE}")
@@ -110,11 +109,8 @@ if (MEDIA_MODE_OPTION)
endif()
endif()
-if (DEBUG_OPTION)
- if (${DEBUG_OPTION} STREQUAL "DBG_OFF")
- message(STATUS "Jenkins integration: build release version")
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
- endif()
+if( NOT CMAKE_BUILD_TYPE )
+ set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build. Options are: None, Debug, Release, RelWithDebInfo, MinSizeRel." FORCE)
endif()
if (HMI_ADAPTER_OPTION)
diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt
index 1382a07d2f..66b52d166e 100644
--- a/src/appMain/CMakeLists.txt
+++ b/src/appMain/CMakeLists.txt
@@ -137,10 +137,6 @@ if(ENABLE_LOG)
list(APPEND LIBRARIES expat -L${EXPAT_LIBS_DIRECTORY})
endif()
-if( NOT CMAKE_BUILD_TYPE )
- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build. Options are: None, Debug, Release, RelWithDebInfo, MinSizeRel." FORCE)
-endif()
-
add_executable(${PROJECT} ${SOURCES})
target_link_libraries(${PROJECT} ${LIBRARIES})