diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2014-07-23 13:48:40 -0400 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2014-07-23 13:48:40 -0400 |
| commit | 487542cb8df7d5125af79df0484cc632a694dd30 (patch) | |
| tree | 8a187d3f88d47bbad6e08de2f02c94e948b11a75 | |
| parent | 40d3c2b452d48fe2f8fc9b0630af2a1c83aaaa69 (diff) | |
| download | smartdevicelink-487542cb8df7d5125af79df0484cc632a694dd30.tar.gz | |
cmake
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3181ed510..48e7bd297 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,8 @@ set(ENABLE_LOG_OPTION "$ENV{ENABLE_LOG}") if (OS_TYPE_OPTION) if (${OS_TYPE_OPTION} STREQUAL "QNX") message(STATUS "Jenkins integration: set build process for QNX") + #do not use include after project() command. + #Such usecase results in infinite cycle of reinitialization of compiler and other variables INCLUDE("./qnx_6.5.0_linux_x86.cmake") #tests are not supported yet for QNX build set (BUILD_TESTS OFF) @@ -92,7 +94,7 @@ endif() if (DEBUG_OPTION) if (${DEBUG_OPTION} STREQUAL "DBG_OFF") message(STATUS "Jenkins integration: build release version") - set (CMAKE_BUILD_TYPE Release) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE) endif() endif() @@ -118,7 +120,6 @@ endif() #Jenkins integration section end -# This command must be here after Jenkins integration section project (${PROJECT}) #ADD_DEPENDENCIES(${PROJECT} Policy) @@ -371,4 +372,3 @@ FIND_PACKAGE(Doxygen) MESSAGE(STATUS "sudo apt-get install mscgen") ENDIF(DOXYGEN_FOUND) - |