Skip to content
Snippets Groups Projects
Commit ae40343c authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

misc: remove cmake unicode/implicit conversion warnings

- fix forcing unicode compilation with msc
- remove implicit string to bool conversion
- ignore vs/cmake generated files

Change-Id: Ief81760ae1be2aa253374e4116ec96e3709ef910
parent 4717a20b
Branches
Tags
No related merge requests found
...@@ -5,3 +5,4 @@ build-qml/ ...@@ -5,3 +5,4 @@ build-qml/
msvc/ msvc/
translations/*.qm translations/*.qm
CMakeLists.txt.user
...@@ -245,13 +245,13 @@ ENDIF() ...@@ -245,13 +245,13 @@ ENDIF()
IF(NOT (${ENABLE_VIDEO} MATCHES false)) IF(NOT (${ENABLE_VIDEO} MATCHES false))
MESSAGE(STATUS "VIDEO enabled") MESSAGE(STATUS "VIDEO enabled")
SET(ENABLE_VIDEO 1 CACHE BOOLEAN "Enable video") SET(ENABLE_VIDEO 1 CACHE BOOL "Enable video")
add_definitions( -DENABLE_VIDEO=true ) add_definitions( -DENABLE_VIDEO=true )
ENDIF(NOT (${ENABLE_VIDEO} MATCHES false)) ENDIF(NOT (${ENABLE_VIDEO} MATCHES false))
IF(NOT (${ENABLE_PLUGIN} MATCHES false)) IF(NOT (${ENABLE_PLUGIN} MATCHES false))
MESSAGE(STATUS "PLUGIN enabled") MESSAGE(STATUS "PLUGIN enabled")
SET(ENABLE_PLUGIN 1 CACHE BOOLEAN "Enable plugin") SET(ENABLE_PLUGIN 1 CACHE BOOL "Enable plugin")
add_definitions( -DENABLE_PLUGIN=true ) add_definitions( -DENABLE_PLUGIN=true )
ENDIF(NOT (${ENABLE_PLUGIN} MATCHES false)) ENDIF(NOT (${ENABLE_PLUGIN} MATCHES false))
...@@ -783,6 +783,8 @@ IF((${ENABLE_TEST} MATCHES true)) ...@@ -783,6 +783,8 @@ IF((${ENABLE_TEST} MATCHES true))
ENDIF() ENDIF()
ENDIF() ENDIF()
IF (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /U_MBCS /DUNICODE") add_definitions(-DUNICODE -D_UNICODE)
ENDIF() remove_definitions(-D_MBCS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif()
...@@ -31,13 +31,13 @@ SET(libqtwrapper_LIB_SRCS ...@@ -31,13 +31,13 @@ SET(libqtwrapper_LIB_SRCS
IF(NOT (${ENABLE_VIDEO} MATCHES "false")) IF(NOT (${ENABLE_VIDEO} MATCHES "false"))
MESSAGE("VIDEO enabled") MESSAGE("VIDEO enabled")
ADD_DEFINITIONS(-DENABLE_VIDEO=true) ADD_DEFINITIONS(-DENABLE_VIDEO=true)
SET(ENABLE_VIDEO 1 CACHE BOOLEAN "Enable video") SET(ENABLE_VIDEO 1 CACHE BOOL "Enable video")
ENDIF(NOT (${ENABLE_VIDEO} MATCHES "false")) ENDIF(NOT (${ENABLE_VIDEO} MATCHES "false"))
IF(NOT (${ENABLE_PLUGIN} MATCHES "false")) IF(NOT (${ENABLE_PLUGIN} MATCHES "false"))
MESSAGE("PLUGIN enabled") MESSAGE("PLUGIN enabled")
ADD_DEFINITIONS(-DENABLE_PLUGIN=true) ADD_DEFINITIONS(-DENABLE_PLUGIN=true)
SET(ENABLE_PLUGIN 1 CACHE BOOLEAN "Enable plugin") SET(ENABLE_PLUGIN 1 CACHE BOOL "Enable plugin")
ENDIF(NOT (${ENABLE_PLUGIN} MATCHES "false")) ENDIF(NOT (${ENABLE_PLUGIN} MATCHES "false"))
IF(ENABLE_PLUGIN) IF(ENABLE_PLUGIN)
...@@ -68,6 +68,8 @@ if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")) ...@@ -68,6 +68,8 @@ if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
ADD_DEFINITIONS("-std=c++0x") ADD_DEFINITIONS("-std=c++0x")
endif() endif()
IF (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /U_MBCS /DUNICODE") add_definitions(-DUNICODE -D_UNICODE)
ENDIF() remove_definitions(-D_MBCS)
\ No newline at end of file set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif()
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment