Specified C++17 standard for the CMake projects.

[platform/core/uifw/dali-adaptor.git] / build / tizen / CMakeLists.txt

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 19d7750..be96e15 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -1,7 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
-SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_C_STANDARD 99)
 PROJECT(${name} CXX)
 SET(PKG_NAME ${name})
@@ -106,12 +105,14 @@ ENDIF()
 
 # Set up compiler flags and warnings
 IF( UNIX )
+  ADD_COMPILE_OPTIONS( -std=c++17 )                     # c++17 support
   ADD_COMPILE_OPTIONS( -Wall ${DALI_CFLAGS} )# -Wextra -Wno-unused-parameter )# -Wfloat-equal )
 ELSEIF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
   ADD_COMPILE_OPTIONS( /FIdali-windows-dependencies.h ) #
   ADD_COMPILE_OPTIONS( /FIextern-definitions.h )        # Adds missing definitions.
   ADD_COMPILE_OPTIONS( /FIpreprocessor-definitions.h )  #
   ADD_COMPILE_OPTIONS( /vmg )                           # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks.
+  ADD_COMPILE_OPTIONS( /std:c++17 )                     # c++17 support
   ADD_COMPILE_OPTIONS( /wd4251 )                        # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'"
 ENDIF()
 
@@ -178,9 +179,9 @@ ENDIF()
 
 TARGET_LINK_LIBRARIES( ${name}
                        ${DALI_LDFLAGS}
-  ${REQUIRED_LIBS}
-  ${OPTIONAL_LIBS}
-  ${COVERAGE}
+                       ${REQUIRED_LIBS}
+                       ${OPTIONAL_LIBS}
+                       ${COVERAGE}
 )
 
 SET_TARGET_PROPERTIES( ${name}
@@ -220,7 +221,7 @@ IF( INSTALL_CMAKE_MODULES )
 
   # Install the pdb file.
   IF( ENABLE_DEBUG )
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.pdb DESTINATION ${BIN_DIR} )
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} )
   ENDIF()
 ELSE()
   # Install the library so file and symlinks
@@ -394,6 +395,7 @@ MESSAGE( STATUS "Profile:                          ${ENABLE_PROFILE}")
 MESSAGE( STATUS "Data Dir (Read/Write):            ${dataReadWriteDir}")
 MESSAGE( STATUS "Data Dir (Read Only):             ${dataReadOnlyDir}")
 MESSAGE( STATUS "EldBus:                           ${eldbus_available_ENABLED}")
+MESSAGE( STATUS "WebP:                             ${webp_available_ENABLED}")
 MESSAGE( STATUS "Shader Binary Cache:              ${ENABLE_SHADERBINCACHE}")
 MESSAGE( STATUS "Network logging enabled:          ${ENABLE_NETWORKLOGGING}")
 MESSAGE( STATUS "Font config file:                 ${fontConfigurationFile}")