Minor fixes for MSVC
This commit is contained in:
@@ -19,9 +19,9 @@ ENDIF()
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
../
|
||||
../../
|
||||
../../../
|
||||
../../../../
|
||||
../../
|
||||
../../../
|
||||
../../../../
|
||||
)
|
||||
|
||||
|
||||
@@ -42,33 +42,41 @@ FILE(GLOB SOURCES
|
||||
./*/*/*.cpp
|
||||
./*/*/*/*.cpp
|
||||
../../Indoor/lib/tinyxml/tinyxml2.cpp
|
||||
../../Indoor/lib/Recast/*.cpp
|
||||
../../Indoor/lib/Recast/*.cpp
|
||||
)
|
||||
|
||||
|
||||
# system specific compiler flags
|
||||
ADD_DEFINITIONS(
|
||||
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
|
||||
add_definitions(
|
||||
-D_USE_MATH_DEFINES
|
||||
-DUNICODE
|
||||
-D_UNICODE
|
||||
)
|
||||
else()
|
||||
# system specific compiler flags
|
||||
ADD_DEFINITIONS(
|
||||
|
||||
#-std=gnu++14
|
||||
#-std=gnu++14
|
||||
|
||||
-Wall
|
||||
-Werror=return-type
|
||||
-Wextra
|
||||
-Wpedantic
|
||||
-Wall
|
||||
-Werror=return-type
|
||||
-Wextra
|
||||
-Wpedantic
|
||||
|
||||
-fstack-protector-all
|
||||
-fstack-protector-all
|
||||
|
||||
-g3
|
||||
#-O2
|
||||
-march=native
|
||||
-g3
|
||||
#-O2
|
||||
-march=native
|
||||
)
|
||||
endif()
|
||||
|
||||
-DWITH_TESTS
|
||||
add_definitions(
|
||||
# -DWITH_TESTS
|
||||
-DWITH_ASSERTIONS
|
||||
#-DWITH_DEBUG_LOG
|
||||
#-DWITH_DEBUG_PLOT
|
||||
#-D_GLIBCXX_DEBUG
|
||||
|
||||
|
||||
# -DWITH_DEBUG_LOG
|
||||
# -DWITH_DEBUG_PLOT
|
||||
# -D_GLIBCXX_DEBUG
|
||||
)
|
||||
|
||||
# allow OMP
|
||||
@@ -89,8 +97,8 @@ ADD_EXECUTABLE(
|
||||
# needed external libraries
|
||||
TARGET_LINK_LIBRARIES(
|
||||
${PROJECT_NAME}
|
||||
gtest
|
||||
pthread
|
||||
# gtest
|
||||
# pthread
|
||||
)
|
||||
|
||||
SET(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})
|
||||
|
||||
Reference in New Issue
Block a user