diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/appMain/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/components/application_manager/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/components/test_main.cc | 2 | ||||
| -rw-r--r-- | tools/cmake/helpers/sources.cmake | 3 |
5 files changed, 6 insertions, 13 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}) diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt index 84354d3f5b..afe3d9e951 100644 --- a/src/components/application_manager/test/CMakeLists.txt +++ b/src/components/application_manager/test/CMakeLists.txt @@ -173,7 +173,7 @@ file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/resumption) file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/resumption) -create_test("resumption/data_resumption_test" "${ResumptionData_SOURCES}" "${testLibraries}") +create_test("data_resumption_test" "${ResumptionData_SOURCES}" "${testLibraries}") add_subdirectory(state_controller) add_subdirectory(app_launch) diff --git a/src/components/test_main.cc b/src/components/test_main.cc index 66013d78c4..72c90acb5c 100644 --- a/src/components/test_main.cc +++ b/src/components/test_main.cc @@ -1,8 +1,8 @@ #include "gmock/gmock.h"
#include "utils/logger.h"
#include "utils/custom_string.h"
-namespace custom_str = utils::custom_string;
int main(int argc, char** argv) {
+ namespace custom_str = utils::custom_string;
testing::InitGoogleMock(&argc, argv);
::testing::DefaultValue<custom_str::CustomString>::Set(
custom_str::CustomString(""));
diff --git a/tools/cmake/helpers/sources.cmake b/tools/cmake/helpers/sources.cmake index 0315b905d9..657197eaac 100644 --- a/tools/cmake/helpers/sources.cmake +++ b/tools/cmake/helpers/sources.cmake @@ -143,10 +143,11 @@ function(create_test NAME SOURCES LIBS) endfunction() function(create_cotired_test NAME SOURCES LIBS) + list(APPEND SOURCES + ${CMAKE_SOURCE_DIR}/src/components/test_main.cc) add_executable( ${NAME} EXCLUDE_FROM_ALL - ${CMAKE_SOURCE_DIR}/src/components/test_main.cc ${SOURCES} ) # TODO: Fix problems with Cotire on Windows and Qt APPLINK-28060 |