Menu
▾
▴
SF.net SVN: alleg:[10512] allegro/branches/4.9/CMakeLists.txt
|
From: <mm...@us...> - 2008-08-23 21:30:15
|
Revision: 10512
http://alleg.svn.sourceforge.net/alleg/?rev=10512&view=rev
Author: mmimica
Date: 2008-08-23 21:30:25 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
Restored revision 10507.
Revision Links:
--------------
http://alleg.svn.sourceforge.net/alleg/?rev=10507&view=rev
Modified Paths:
--------------
allegro/branches/4.9/CMakeLists.txt
Modified: allegro/branches/4.9/CMakeLists.txt
===================================================================
--- allegro/branches/4.9/CMakeLists.txt 2008-08-23 21:15:04 UTC (rev 10511)
+++ allegro/branches/4.9/CMakeLists.txt 2008-08-23 21:30:25 UTC (rev 10512)
@@ -14,7 +14,7 @@
#
#-----------------------------------------------------------------------------#
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.6)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
@@ -37,6 +37,7 @@
include
# For out-of-source builds.
${CMAKE_BINARY_DIR}/include
+ addons/iio
)
# Put libraries into `lib' by default. This path must be absolute.
@@ -60,33 +61,16 @@
option(SHARED "Build shared libraries" on)
option(STATIC "Build static libraries" on)
-option(WANT_MODULES "Use dynamically loaded modules (Unix)" on)
option(WANT_MAGIC_MAIN "Enable magic main" off)
#
# Platforms and drivers.
#
-option(WANT_LINUX_CONSOLE "Linux console support" on)
-option(WANT_FBCON "Enable framebuffer graphics driver (Linux)" on)
-option(WANT_SVGALIB "Enable SVGAlib graphics driver (Linux)" on)
-option(WANT_VGA "Enable VGA graphics driver (Linux)" on)
-
option(WANT_X11 "X11 support" on)
-option(WANT_DGA2 "Enable DGA2 graphics driver (X11)" on)
-option(WANT_ALSADIGI "Enable ALSA digital audio driver (Unix)" on)
-option(WANT_ALSAMIDI "Enable ALSA MIDI driver (Unix)" on)
-option(WANT_ARTS "Enable aRts audio driver (Unix)" on)
-option(WANT_ESD "Enable ESD audio driver (Unix)" on)
-option(WANT_JACK "Enable JACK audio driver (Unix)" on)
-option(WANT_OSSDIGI "Enable OSS digital audio driver (Unix)" on)
-option(WANT_OSSMIDI "Enable OSS MIDI driver (Unix)" on)
-option(WANT_SGIAL "Enable SGI AL audio driver (Unix)" on)
-
-option(WANT_A5_ALSA "Enable A5 ALSA digital audio driver (Unix)" on)
-
option(WANT_D3D "Enable Direct3D graphics driver (Windows)" on)
+option(WANT_D3DEX "Enable Direct3D 9Ex extensions (Vista)" off)
option(WANT_OPENGL "Enable OpenGL graphics driver (Windows, X11))" on)
#
@@ -97,17 +81,19 @@
# WANT_AUDIO is off until it checks for OpenAL on the system.
option(WANT_AUDIO "Enable audio engine" off)
option(WANT_ACODEC "Enable audio codecs (requires audio)" on)
+# WANT_KCM_AUDIO is off until it checks for OpenAL on the system.
+option(WANT_KCM_AUDIO "Enable kcm_audio engine" off)
# WANT_ICODEC is off until it checks for Magick++
option(WANT_ICODEC "Enable image loading/saving for most filetypes (requires libMagick)" off)
+option(WANT_IIO "Enable IIO image load/save addon" on)
+option(WANT_A5_ALSA "Enable A5 ALSA digital audio driver (Unix)" on)
+
#
# For developers.
#
option(STRICT_WARN "Halt at warnings" off)
-option(WANT_OLD_EXAMPLES "Build examples from < 4.9" off)
-option(WANT_OLD_TESTS "Build tests from < 4.9" off)
-option(WANT_OLD_TOOLS "Build tools from < 4.9" off)
#-----------------------------------------------------------------------------#
#
@@ -121,7 +107,7 @@
include(CheckLibraryExists)
include(CheckSymbolExists)
include(CheckTypeSize)
-include(UsePkgConfig)
+include(FindPkgConfig)
if(MSVC_IDE)
set(COMPILER_MSVC 1)
@@ -131,10 +117,6 @@
set(COMPILER_GCC 1)
endif(CMAKE_COMPILER_IS_GNUCC)
-if(MINGW_CROSS)
- set(WIN32 1)
-endif(MINGW_CROSS)
-
if(MINGW)
# For alplatf.h
set(ALLEGRO_MINGW32 1)
@@ -143,21 +125,14 @@
set(CMAKE_INSTALL_PREFIX ${MINGDIR})
endif(MINGW)
+if(UNIX)
+ set(ALLEGRO_UNIX 1)
+endif(UNIX)
+
if(COMPILER_MSVC)
set(ALLEGRO_MSVC 1)
endif(COMPILER_MSVC)
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- set(MACOSX 1)
- set(ALLEGRO_MACOSX 1)
- set(WANT_X11 off)
-else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- # Note: UNIX includes MacOS X, but ALLEGRO_UNIX doesn't.
- if(UNIX)
- set(ALLEGRO_UNIX 1)
- endif(UNIX)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
if(BORLAND)
set(ALLEGRO_BCC32 1)
endif(BORLAND)
@@ -172,16 +147,9 @@
check_include_files(dirent.h ALLEGRO_HAVE_DIRENT_H)
check_include_files(inttypes.h ALLEGRO_HAVE_INTTYPES_H)
-check_include_files(linux/awe_voice.h ALLEGRO_HAVE_LINUX_AWE_VOICE_H)
-check_include_files(linux/input.h ALLEGRO_HAVE_LINUX_INPUT_H)
-check_include_files(linux/joystick.h ALLEGRO_HAVE_LINUX_JOYSTICK_H)
-check_include_files(linux/soundcard.h ALLEGRO_HAVE_LINUX_SOUNDCARD_H)
-check_include_files(machine/soundcard.h ALLEGRO_HAVE_MACHINE_SOUNDCARD_H)
-check_include_files(soundcard.h ALLEGRO_HAVE_SOUNDCARD_H)
check_include_files(stdbool.h ALLEGRO_HAVE_STDBOOL_H)
check_include_files(stdint.h ALLEGRO_HAVE_STDINT_H)
check_include_files(sys/io.h ALLEGRO_HAVE_SYS_IO_H)
-check_include_files(sys/soundcard.h ALLEGRO_HAVE_SYS_SOUNDCARD_H)
check_include_files(sys/stat.h ALLEGRO_HAVE_SYS_STAT_H)
check_include_files(sys/time.h ALLEGRO_HAVE_SYS_TIME_H)
check_include_files(sys/utsname.h ALLEGRO_HAVE_SYS_UTSNAME_H)
@@ -227,12 +195,6 @@
# We no longer support hand-written assembly routines.
set(ALLEGRO_NO_ASM 1)
-if(WANT_MODULES)
- # Should ask CMake whether it can build modules on this platform.
- set(ALLEGRO_WITH_MODULES 1)
- set(SUPPORT_MODULES 1)
-endif(WANT_MODULES)
-
if(WANT_MAGIC_MAIN)
set(ALLEGRO_WITH_MAGIC_MAIN 1)
endif(WANT_MAGIC_MAIN)
@@ -267,11 +229,8 @@
include(FindOpenGL)
if(OPENGL_FOUND)
set(SUPPORT_OPENGL 1)
+ set(ALLEGRO_CFG_OPENGL 1)
endif(OPENGL_FOUND)
-
- if(SUPPORT_OPENGL)
- set(ALLEGRO_CFG_OPENGL 1)
- endif(SUPPORT_OPENGL)
endif(WANT_OPENGL)
# Accumulate extra libraries needed due to drivers.
@@ -289,19 +248,11 @@
set(ALLEGRO_HAVE_LIBPTHREAD 1)
endif(CMAKE_USE_PTHREADS_INIT)
- if(SUPPORT_MODULES)
- set(ALLEGRO_MODULES_PATH_TAIL lib/allegro)
- # This is a #define variable.
- set(ALLEGRO_MODULES_PATH
- \"${CMAKE_INSTALL_PREFIX}/${ALLEGRO_MODULES_PATH_TAIL}\"
- )
- endif(SUPPORT_MODULES)
-
#
# Sound drivers
#
- if(WANT_ALSADIGI OR WANT_A5_ALSA)
+ if(WANT_A5_ALSA)
check_c_source_compiles("
#include <sys/asoundlib.h>
int main(void) {
@@ -313,164 +264,13 @@
}"
CAN_ALSADIGI
)
- if(CAN_ALSADIGI AND WANT_ALSADIGI)
- set(SUPPORT_ALSADIGI 1)
- set(ALLEGRO_WITH_ALSADIGI 1)
- set(ALLEGRO_ALSA_VERSION 9)
- list(APPEND DRIVER_LIBS_STATIC asound)
- endif(CAN_ALSADIGI AND WANT_ALSADIGI)
if (CAN_ALSADIGI AND WANT_A5_ALSA)
set(SUPPORT_A5_ALSA 1)
endif(CAN_ALSADIGI AND WANT_A5_ALSA)
- endif(WANT_ALSADIGI OR WANT_A5_ALSA)
-
- if(WANT_ALSAMIDI)
- check_c_source_compiles("
- #include <sys/asoundlib.h>
- int main(void) {
- #if(SND_LIB_MAJOR > 0) || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 9)
- return 0;
- #else
- return 1;
- #endif
- }"
- CAN_ALSAMIDI
- )
- if(CAN_ALSAMIDI)
- set(SUPPORT_ALSAMIDI 1)
- set(ALLEGRO_WITH_ALSAMIDI 1)
- set(ALLEGRO_ALSA_VERSION 9)
- list(APPEND DRIVER_LIBS_STATIC asound)
- endif(CAN_ALSAMIDI)
- endif(WANT_ALSAMIDI)
-
- if(WANT_ARTS)
- # XXX artsc doesn't use pkg-config
- pkgconfig(artsc
- ARTS_INCLUDEDIR ARTS_LIBDIR
- ARTS_LINKFLAGS ARTS_CFLAGS
- )
- if(ARTS_INCLUDEDIR)
- set(SUPPORT_ARTS 1)
- set(ALLEGRO_WITH_ARTSDIGI 1)
- list(APPEND DRIVER_LIBS_STATIC ${ARTS_LINKFLAGS})
- endif(ARTS_INCLUDEDIR)
- endif(WANT_ARTS)
-
- if(WANT_ESD)
- # XXX esd doesn't use pkg-config
- pkgconfig(esd
- ESD_INCLUDEDIR ESD_LIBDIR
- ESD_LINKFLAGS ESD_CFLAGS
- )
- if(ESD_INCLUDEDIR)
- set(SUPPORT_ESD 1)
- set(ALLEGRO_WITH_ESDDIGI 1)
- list(APPEND DRIVER_LIBS_STATIC ${ESD_LINKFLAGS})
- endif(ESD_INCLUDEDIR)
- endif(WANT_ESD)
-
- if(WANT_JACK)
- pkgconfig(jack
- JACK_INCLUDEDIR JACK_LIBDIR
- JACK_LINKFLAGS JACK_CFLAGS
- )
- if(JACK_INCLUDEDIR)
- set(SUPPORT_JACK 1)
- set(ALLEGRO_WITH_JACKDIGI 1)
- list(APPEND DRIVER_LIBS_STATIC ${JACK_LINKFLAGS})
- endif(JACK_INCLUDEDIR)
- endif(WANT_JACK)
-
- if(ALLEGRO_HAVE_SOUNDCARD_H OR ALLEGRO_HAVE_SYS_SOUNDCARD_H OR
- ALLEGRO_HAVE_MACHINE_SOUNDCARD_H OR ALLEGRO_HAVE_LINUX_SOUNDCARD_H)
-
- if(WANT_OSSDIGI)
- set(SUPPORT_OSSDIGI 1)
- set(ALLEGRO_WITH_OSSDIGI 1)
- endif(WANT_OSSDIGI)
-
- if(WANT_OSSMIDI)
- set(SUPPORT_OSSMIDI 1)
- set(ALLEGRO_WITH_OSSMIDI 1)
- endif(WANT_OSSMIDI)
-
- # XXX we assume that if libossaudio exists then we need to use it.
- check_library_exists(ossaudio _oss_ioctl "" ALLEGRO_HAVE_LIBOSSAUDIO)
- if(ALLEGRO_HAVE_LIBOSSAUDIO)
- list(APPEND DRIVER_LIBS_STATIC ossaudio)
- list(APPEND DRIVER_LIBS_SHARED ossaudio)
- endif(ALLEGRO_HAVE_LIBOSSAUDIO)
-
- endif(ALLEGRO_HAVE_SOUNDCARD_H OR ALLEGRO_HAVE_SYS_SOUNDCARD_H OR
- ALLEGRO_HAVE_MACHINE_SOUNDCARD_H OR ALLEGRO_HAVE_LINUX_SOUNDCARD_H)
-
- if(WANT_SGIAL)
- check_library_exists(audio alOpenPort "" CAN_SGIAL)
- if(CAN_SGIAL)
- set(SUPPORT_SGIAL 1)
- set(ALLEGRO_WITH_SGIALDIGI 1)
- list(append DRIVER_LIBS_STATIC audio)
- endif(CAN_SGIAL)
- endif(WANT_SGIAL)
+ endif(WANT_A5_ALSA)
endif(UNIX)
#
-# Linux-specific
-#
-
-if(WANT_LINUX_CONSOLE)
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- set(SUPPORT_LINUX_CONSOLE 1)
- set(ALLEGRO_LINUX 1)
- endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-endif(WANT_LINUX_CONSOLE)
-
-if(SUPPORT_LINUX_CONSOLE)
-
- if(WANT_FBCON)
- check_c_source_compiles("
- #include <linux/fb.h>
- int main(void) {
- int x = FB_SYNC_ON_GREEN;
- return 0;
- }"
- CAN_FBCON
- )
- if(CAN_FBCON)
- set(SUPPORT_FBCON 1)
- set(ALLEGRO_LINUX_FBCON 1)
- endif(CAN_FBCON)
- endif(WANT_FBCON)
-
- if(WANT_SVGALIB)
- check_library_exists(vga vga_init "" CAN_SVGALIB)
- if(CAN_SVGALIB)
- set(SUPPORT_SVGALIB 1)
- set(ALLEGRO_LINUX_SVGALIB 1)
- list(APPEND DRIVER_LIBS_STATIC vga)
- endif(CAN_SVGALIB)
-
- set(CMAKE_REQUIRED_LIBRARIES vga)
- check_c_source_compiles("
- #include <vga.h>
- int main(void) {
- int x = vga_version;
- return x;
- }"
- ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION
- )
- set(CMAKE_REQUIRED_LIBRARIES)
- endif(WANT_SVGALIB)
-
- if(WANT_VGA)
- set(SUPPORT_VGA 1)
- set(ALLEGRO_LINUX_VGA 1)
- endif(WANT_VGA)
-
-endif(SUPPORT_LINUX_CONSOLE)
-
-#
# X Window System
#
@@ -502,17 +302,6 @@
list(APPEND X11_LIBRARIES "Xxf86vm")
endif(CAN_XF86VIDMODE)
- if(WANT_DGA2)
- check_library_exists(Xxf86dga XDGAQueryExtension "" CAN_XF86DGA)
- if(CAN_XF86DGA)
- set(SUPPORT_DGA2 1)
- set(ALLEGRO_XWINDOWS_WITH_XF86DGA2 1)
- if(NOT SUPPORT_MODULES)
- list(APPEND X11_LIBRARIES "Xxf86dga")
- endif(NOT SUPPORT_MODULES)
- endif(CAN_XF86DGA)
- endif(WANT_DGA2)
-
check_library_exists(X11 XOpenIM "" CAN_XIM)
if(CAN_XIM)
set(ALLEGRO_XWINDOWS_WITH_XIM 1)
@@ -542,6 +331,9 @@
if(SUPPORT_D3D)
set(ALLEGRO_CFG_D3D 1)
+ if(GRADE_DEBUG)
+ set(D3D_DEBUG_INFO 1)
+ endif(GRADE_DEBUG)
endif(SUPPORT_D3D)
endif(WIN32)
@@ -598,18 +390,11 @@
# e.g. -lm on Unix.
set(PLATFORM_LIBS)
-if(ALLEGRO_UNIX)
+if(UNIX)
list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_UNIX_FILES})
list(APPEND PLATFORM_LIBS m pthread)
- if(NOT SUPPORT_MODULES)
- list(APPEND PLATFORM_LIBS "${DRIVER_LIBS_STATIC}")
- endif(NOT SUPPORT_MODULES)
-endif(ALLEGRO_UNIX)
+endif(UNIX)
-if(SUPPORT_LINUX_CONSOLE)
- list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_LINUX_FILES})
-endif(SUPPORT_LINUX_CONSOLE)
-
if(SUPPORT_X11)
list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_X_FILES})
list(APPEND PLATFORM_LIBS ${X11_LIBRARIES})
@@ -625,7 +410,7 @@
list(APPEND LIBRARY_SOURCES lib/msvc/allegro.def)
endif(COMPILER_MSVC)
list(APPEND PLATFORM_LIBS
- kernel32 user32 gdi32 comdlg32 ole32 dinput ddraw dxguid winmm dsound
+ kernel32 user32 gdi32 comdlg32 ole32 dinput8 ddraw dxguid winmm dsound
)
if(SUPPORT_D3D)
list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_D3D_FILES})
@@ -767,86 +552,7 @@
)
endforeach(genfile)
-#-----------------------------------------------------------------------------#
-#
-# Modules (Unix)
-#
-#-----------------------------------------------------------------------------#
-if(SUPPORT_MODULES)
-
- macro(add_module target files)
- add_library(${target} MODULE ${files})
- set_target_properties(${target}
- PROPERTIES
- PREFIX ""
- COMPILE_FLAGS "-DALLEGRO_MODULE ${WFLAGS}"
- )
- target_link_libraries(${target} ${ARGN})
-
- install(TARGETS ${target}
- DESTINATION ${ALLEGRO_MODULES_PATH_TAIL}/${ALLEGRO_VERSION}
- PERMISSIONS
- OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
- )
- endmacro(add_module)
-
- install(FILES modules.lst
- DESTINATION ${ALLEGRO_MODULES_PATH_TAIL}/${ALLEGRO_VERSION}
- )
-
- if(SUPPORT_FBCON)
- add_module(alleg-fbcon "${ALLEGRO_MODULE_FBCON_FILES}")
- endif(SUPPORT_FBCON)
-
- if(SUPPORT_SVGALIB)
- add_module(alleg-svgalib "${ALLEGRO_MODULE_SVGALIB_FILES}"
- vga)
- endif(SUPPORT_SVGALIB)
-
- if(SUPPORT_VGA)
- add_module(alleg-vga "${ALLEGRO_MODULE_VGA_FILES}")
- endif(SUPPORT_VGA)
-
- if(SUPPORT_DGA2)
- add_module(alleg-dga2 "${ALLEGRO_MODULE_DGA2_FILES}"
- -L${X11_LIBRARY_DIR} Xxf86dga)
- endif(SUPPORT_DGA2)
-
- if(SUPPORT_ALSADIGI)
- add_module(alleg-alsadigi "${ALLEGRO_MODULE_ALSADIGI_FILES}"
- asound)
- endif(SUPPORT_ALSADIGI)
-
- if(SUPPORT_ALSAMIDI)
- add_module(alleg-alsamidi "${ALLEGRO_MODULE_ALSAMIDI_FILES}"
- asound)
- endif(SUPPORT_ALSAMIDI)
-
- if(SUPPORT_ARTS)
- add_module(alleg-arts "${ALLEGRO_MODULE_ARTS_FILES}"
- ${ARTS_LINKFLAGS})
- endif(SUPPORT_ARTS)
-
- if(SUPPORT_ESD)
- add_module(alleg-esd "${ALLEGRO_MODULE_ESD_FILES}"
- ${ESD_LINKFLAGS})
- endif(SUPPORT_ESD)
-
- if(SUPPORT_JACK)
- add_module(alleg-jackdigi ${ALLEGRO_MODULE_JACK_FILES}
- ${JACK_LINKFLAGS})
- endif(SUPPORT_JACK)
-
- if(SUPPORT_SGIAL)
- add_module(alleg-sgialdigi ${ALLEGRO_MODULE_SGIAL_FILES}
- audio)
- endif(SUPPORT_SGIAL)
-
-endif(SUPPORT_MODULES)
-
#-----------------------------------------------------------------------------#
#
# Programs
@@ -946,6 +652,8 @@
add_allegro_executable(${nm} ${ARGN} ${nm}.cpp)
endmacro(example_cxx nm libs)
+
+
#-----------------------------------------------------------------------------#
#
# Add-ons
@@ -961,9 +669,7 @@
#-----------------------------------------------------------------------------#
if(NOT MSVC80) # XXX disabled because it breaks MSVC's intellisense for some reason
- if(USE_CXX AND WANT_FONT)
- add_subdirectory(demo)
- endif(USE_CXX AND WANT_FONT)
+ add_subdirectory(demo)
endif(NOT MSVC80)
#-----------------------------------------------------------------------------#
@@ -974,14 +680,6 @@
add_subdirectory(examples)
-if(WANT_OLD_TESTS)
- add_subdirectory(tests)
-endif(WANT_OLD_TESTS)
-
-if(WANT_OLD_TOOLS)
- add_subdirectory(tools)
-endif(WANT_OLD_TOOLS)
-
#-----------------------------------------------------------------------------#
#
# allegro-config script
@@ -1004,9 +702,6 @@
endif(SHARED)
set(LDFLAGS)
- if(SUPPORT_MODULES)
- set(LDFLAGS "-Wl,--export-dynamic ${LDFLAGS}")
- endif(SUPPORT_MODULES)
set(LIBS)
foreach(lib ${PLATFORM_LIBS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|