Changeset 518 for trunk/thune/gl/CMakeLists.txt

Timestamp:

04/06/08 06:15:01 (8 months ago)

Author:

krobillard

Message:

Thune-gl is now built separately with CMake.
Added UG_DT_COUNT & ug_datatypes to thune-gl header.

Files:

• trunk/thune/gl/CMakeLists.txt (modified) (7 diffs)

trunk/thune/gl/CMakeLists.txt

@@ -1 +1 @@
 project(ThuneGL C)
-
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake_modules/")
 
 # set(CMAKE_BUILD_TYPE Debug)
@@ -7 +5 @@
 
 
-# These package checks are only needed when ../CMakeLists.txt is not used.
-#find_package( FreeType REQUIRED )
-#find_package( OpenGL REQUIRED )
-#find_package( OpenAL REQUIRED )
-#find_package( PNG REQUIRED )
-#find_package( GLV REQUIRED )
+# Why isn't this the default?
+# Having to repeat the conditional expression is retarded.
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake_modules/")
+
+
+find_package( Thune REQUIRED )
+find_package( FreeType REQUIRED )
+find_package( OpenGL REQUIRED )
+find_package( OpenAL REQUIRED )
+find_package( PNG REQUIRED )
+find_package( GLV REQUIRED )
 
 
@@ -19 +24 @@
     add_definitions(-std=c99)
 #    set(GLV_FILE glv/mac/glv.c)
-endif (APPLE)
+endif ()
 
 if (UNIX AND NOT APPLE)
@@ -28 +33 @@
 #    set(GLV_FILE glv/x11/glv.c)
     set(JOYSTICK_FILE joystick.c)
-endif (UNIX AND NOT APPLE)
+endif ()
 
 if (WIN32)
     include_directories(../win32)
 #    set(GLV_FILE glv/win32/glv.c)
-endif (WIN32)
+endif ()
 
 
@@ -70 +75 @@
 set_target_properties(thuneGL-lib PROPERTIES OUTPUT_NAME "thune-gl")
 
+if (APPLE)
+    target_link_libraries(thuneGL-lib bz2 m)
+endif ()
+
+if (UNIX AND NOT APPLE)
+    target_link_libraries(thuneGL-lib
+        vorbis vorbisfile alut
+        X11 Xxf86vm
+        bz2 m pthread
+    )
+endif ()
+
+if (WIN32)
+    target_link_libraries(thuneGL-lib ws2_32)
+endif ()
+
 link_directories(../)
 target_link_libraries(thuneGL-lib
-    thune-lib
+    ${THUNE_LIBRARY}
     ${PNG_LIBRARY}
     ${FREETYPE_LIBRARY}
@@ -82 +103 @@
 
 
-add_executable(thune-gl
-    ../console.c
-)
-
+add_executable(thune-gl ../console.c)
 target_link_libraries(thune-gl thuneGL-lib)
-
-
-if (APPLE)
-    target_link_libraries(thuneGL-lib bz2 m)
-endif (APPLE)
-
-if (UNIX AND NOT APPLE)
-    target_link_libraries(thuneGL-lib
-        vorbis vorbisfile alut
-        X11 Xxf86vm
-        bz2 m pthread
-    )
-endif (UNIX AND NOT APPLE)
-
-if (WIN32)
-    target_link_libraries(thuneGL-lib ws2_32)
-endif (WIN32)
 
 
@@ -110 +111 @@
 install(TARGETS thuneGL-lib  DESTINATION /usr/local/lib)
 #install(FILES   urlan.h     DESTINATION /usr/local/include)
-endif (UNIX)
+endif ()