1
0
Fork 0

fixed windows

This commit is contained in:
Frank Celler 2016-02-29 08:43:51 +00:00
parent abccddeec9
commit 9a2c4aa28f
1 changed files with 34 additions and 17 deletions

View File

@ -293,23 +293,31 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TL)
set(DEBUG FALSE) set(DEBUG FALSE)
if (CMAKE_BUILD_TYPE_TL MATCHES debug) if (WINDOWS)
set(DEBUG TRUE) if (CMAKE_BUILD_TYPE_TL MATCHES debug)
set(WIN_RELEASE_TYPE Debug) set(DEBUG TRUE)
set(WIN_GYP_RELEASE_TYPE Debug) set(WIN_RELEASE_TYPE Debug)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g") set(WIN_GYP_RELEASE_TYPE Debug)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g") elseif (CMAKE_BUILD_TYPE_TL MATCHES relwithdebinfo)
elseif (CMAKE_BUILD_TYPE_TL MATCHES relwithdebinfo) set(WIN_RELEASE_TYPE RelWithDebInfo)
set(WIN_RELEASE_TYPE RelWithDebInfo) set(WIN_GYP_RELEASE_TYPE release)
set(WIN_GYP_RELEASE_TYPE release) elseif (CMAKE_BUILD_TYPE_TL MATCHES release)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g") set(WIN_RELEASE_TYPE Release)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -g") set(WIN_GYP_RELEASE_TYPE release)
elseif (CMAKE_BUILD_TYPE_TL MATCHES release) endif ()
set(WIN_RELEASE_TYPE Release) else ()
set(WIN_GYP_RELEASE_TYPE release) if (CMAKE_BUILD_TYPE_TL MATCHES debug)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") set(DEBUG TRUE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g")
endif () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
elseif (CMAKE_BUILD_TYPE_TL MATCHES relwithdebinfo)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -g")
elseif (CMAKE_BUILD_TYPE_TL MATCHES release)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
endif ()
endif ()
################################################################################ ################################################################################
## TARGET ARCHITECTURE ## TARGET ARCHITECTURE
@ -443,6 +451,15 @@ if (WINDOWS)
add_definitions("-D_CRT_SECURE_NO_WARNINGS=1") add_definitions("-D_CRT_SECURE_NO_WARNINGS=1")
endif () endif ()
################################################################################
## REGEX
################################################################################
if (WINDOWS)
include_directories(${REGEX_INCLUDE_DIR})
add_definitions("-D_CRT_SECURE_NO_WARNINGS=1")
endif ()
################################################################################ ################################################################################
## BOOST ## BOOST
################################################################################ ################################################################################