diff CMakeLists.txt @ 4:26aec5629f68

Added example programs.
author Eric Wing <ewing . public |-at-| gmail . com>
date Wed, 27 Oct 2010 21:41:31 -0700
parents a929285e1db0
children 8cb13d89451a
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Oct 27 20:43:14 2010 -0700
+++ b/CMakeLists.txt	Wed Oct 27 21:41:31 2010 -0700
@@ -82,8 +82,10 @@
 
 IF(WANTS_BUILD_SHARED_LIBRARY)
 	ADD_LIBRARY(ALMIXER_LIBRARY SHARED ${PUBLIC_HEADERS} ${ALMIXER_SOURCE} ${RESOURCE_FILES})
-	SET_TARGET_PROPERTIES(ALMIXER_LIBRARY PROPERTIES OUTPUT_NAME "ALmixer")
+ELSE(WANTS_BUILD_SHARED_LIBRARY)
+	ADD_LIBRARY(ALMIXER_LIBRARY STATIC ${PUBLIC_HEADERS} ${ALMIXER_SOURCE} ${RESOURCE_FILES})
 ENDIF(WANTS_BUILD_SHARED_LIBRARY)
+SET_TARGET_PROPERTIES(ALMIXER_LIBRARY PROPERTIES OUTPUT_NAME "ALmixer")
 
 # Set Dynamic Library and Framework properties
 IF(WANTS_BUILD_SHARED_LIBRARY AND WANTS_BUILD_FRAMEWORK)
@@ -185,10 +187,7 @@
 ENDIF(WANTS_BUILD_SHARED_LIBRARY AND WANTS_BUILD_FRAMEWORK)
 
 INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
-#TARGET_LINK_LIBRARIES(ALMIXER_LIBRARY "${OPENAL_LIBRARY} ${SDL_LIBRARIES} ${SDL_SOUND_LIBRARIES}")
-MESSAGE("SDL_libraries: ${SDL_LIBRARY}, ${SDL_SOUND_LIBRARIES}.")
-TARGET_LINK_LIBRARIES(ALMIXER_LIBRARY ${OPENAL_LIBRARY} "${SDL_SOUND_LIBRARIES}" ${SDL_LIBRARY}) 
-
+TARGET_LINK_LIBRARIES(ALMIXER_LIBRARY ${OPENAL_LIBRARY} ${SDL_SOUND_LIBRARIES} ${SDL_LIBRARY}) 
 
 
 # Install commands below
@@ -220,6 +219,10 @@
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 
+# The Examples
+ADD_SUBDIRECTORY(EXAMPLES)
+
+
 
 # Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4 
 # and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.