fly/terragear
1
0
Fork 0
Code Activity

More tweaks to windows build

Browse source
This commit is contained in:
Frederic Bouvier 2011-11-08 20:41:38 +01:00
parent 7fb875b44b
commit 8a19bd8de6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -72,6 +72,9 @@ find_package(Threads REQUIRED)
find_package(SimGear 2.5.0 REQUIRED) find_package(SimGear 2.5.0 REQUIRED)
find_package(GPC REQUIRED) find_package(GPC REQUIRED)
find_package(TIFF) # needed for SRTM find_package(TIFF) # needed for SRTM
if (CMAKE_CL_64)
find_package(JPEG) # needed for SRTM
endif (CMAKE_CL_64)
find_package(NewMat11) find_package(NewMat11)
if(ENABLE_GDAL) if(ENABLE_GDAL)
@ -98,7 +101,7 @@ if(WIN32)
# SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") # SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
# endforeach(warning) # endforeach(warning)
set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS") set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS -DNO_OPENSCENEGRAPH_INTERFACE -DNO_TIMER")
if (${MSVC_VERSION} EQUAL 1600) if (${MSVC_VERSION} EQUAL 1600)
set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
endif (${MSVC_VERSION} EQUAL 1600) endif (${MSVC_VERSION} EQUAL 1600)