Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disabled generating NSIS Installer by default, fixed cmake messages

Browse source
This commit is contained in:
Pali Rohár 2011-04-01 20:47:26 +02:00
parent 7198f23dbf
commit 6b69bd7548
1 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
CMakeLists.txt
View file

@ -452,7 +452,7 @@ endif()
if(WIN32)
option(ENABLE_STDIO_REDIRECT "Redirect Stratagus console output to files on Windows" OFF)
option(ENABLE_NSIS "Create Stratagus Window NSIS Installer" ON)
option(ENABLE_NSIS "Create Stratagus Window NSIS Installer" OFF)
endif()
#option(ENABLE_TOUCHSCREEN "Use touchscreen input" ON)
@ -463,7 +463,7 @@ option(WITH_MNG "Compile Stratagus with MNG image library" ON)
option(WITH_OGGVORBIS "Compile Stratagus with OGG/Vorbis sound library" ON)
option(WITH_THEORA "Compile Stratagus with Theroa video library" ON)
option(WITH_X "Compile Stratagus with X Window System clipboard pasting support" ON)
option(WITH_X11 "Compile Stratagus with X11 clipboard pasting support" ON)
#option(WITH_OPENGL "Compile Stratagus with OpenGL rendering support" ON)
option(WITH_OPENGLES "Compile Stratagus with OpenGL ES 1.1 rendering support instead OpenGL" OFF)
@ -520,7 +520,7 @@ if(WITH_THEORA AND THEORA_FOUND)
set(stratagus_LIBS ${stratagus_LIBS} ${THEORA_LIBRARY})
endif()
if(WITH_X AND X11_FOUND)
if(WITH_X11 AND X11_FOUND)
add_definitions(-DHAVE_X11)
include_directories(${X11_INCLUDE_DIR})
set(stratagus_LIBS ${stratagus_LIBS} ${X11_X11_LIB})
@ -585,12 +585,12 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
message("==================================")
macro(log_package PACKAGE_NAME PACKAGE)
if(NOT ${PACKAGE}_FOUND)
message("${PACKAGE_NAME}: Not Found")
if(NOT WITH_${PACKAGE})
message("${PACKAGE_NAME}: Disabled (Enable by param -DWITH_${PACKAGE}=ON)")
elseif(WITH_${PACKAGE} AND ${PACKAGE}_FOUND)
message("${PACKAGE_NAME}: Yes")
message("${PACKAGE_NAME}: Found")
else()
message("${PACKAGE_NAME}: Disabled")
message("${PACKAGE_NAME}: Not Found")
endif()
endmacro()
@ -620,7 +620,7 @@ else()
message("Platform: Other")
endif()
if(ENABLE_STDIO_REDIRECT)
if(WIN32 AND ENABLE_STDIO_REDIRECT)
message("Stdio redirect: Yes")
else()
message("Stdio redirect: No")
@ -638,8 +638,10 @@ else()
message("Upx packer: No")
endif()
if(ENABLE_NSIS AND MAKENSIS_FOUND)
if(WIN32 AND ENABLE_NSIS AND MAKENSIS_FOUND)
message("NSIS Installer: Yes")
elseif(NOT WIN32)
message("NSIS Installer: Unsupported on this platform")
else()
message("NSIS Installer: No")
endif()
@ -650,23 +652,15 @@ log_package("Mng" "MNG")
log_package("Ogg/Vorbis" "OGGVORBIS")
log_package("Theora" "THEORA")
log_package("LibOSSO" "LIBOSSO")
log_package("X11" "X11")
#log_package("OpenGL" "OPENGL")
if(NOT X11_FOUND)
message("X11 support: Not Found")
elseif(WITH_X AND X11_FOUND)
message("X11 support: Yes")
else()
message("X11 support: Disabled")
endif()
log_package("OpenGL" "OPENGL")
if(NOT OPENGLES_FOUND OR NOT SDLGLES_FOUND)
message("OpenGL ES 1.1: Not Found")
if(NOT WITH_OPENGLES)
message("OpenGL ES 1.1 (instead OpenGL): Disabled (Enable by param -DWITH_OPENGLES=ON)")
elseif(WITH_OPENGLES AND OPENGLES_FOUND AND SDLGLES_FOUND)
message("OpenGL ES 1.1: YES")
message("OpenGL ES 1.1 (instead OpenGL): Found")
else()
message("OpenGL ES 1.1: Disabled")
message("OpenGL ES 1.1 (instead OpenGL): Not Found")
endif()
message("==================================")
@ -686,7 +680,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
endif()
if(ENABLE_STATIC AND WIN32 AND MINGW)
if(WIN32 AND MINGW AND ENABLE_STATIC)
set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc")
endif()
@ -714,7 +708,7 @@ if(SQLITE_FOUND)
add_executable(metaserver ${metaserver_SRCS} ${metaserver_HDRS})
target_link_libraries(metaserver ${SDL_LIBRARY} ${SQLITE_LIBRARIES})
if(ENABLE_STATIC AND WIN32 AND MINGW)
if(WIN32 AND MINGW AND ENABLE_STATIC)
set_target_properties(metaserver PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc")
endif()
endif()
@ -729,7 +723,7 @@ source_group(png2stratagus FILES ${png2stratagus_SRCS})
add_executable(png2stratagus ${png2stratagus_SRCS})
target_link_libraries(png2stratagus ${PNG_LIBRARY} ${ZLIB_LIBRARIES})
if(ENABLE_STATIC AND WIN32 AND MINGW)
if(WIN32 AND MINGW AND ENABLE_STATIC)
set_target_properties(png2stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc")
endif()