Changeset 518 for trunk/thune/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/CMakeLists.txt (modified) (3 diffs)

trunk/thune/CMakeLists.txt

@@ -16 +16 @@
 
 
+# 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/")
 
@@ -22 +26 @@
         add_definitions(-std=c99 -pedantic -D_GNU_SOURCE)
     set(OS_FILE unix/os.c)
-endif (UNIX)
+endif ()
 
 if (WIN32)
         include_directories(. win32)
     set(OS_FILE win32/os.c)
-endif (WIN32)
+endif ()
 
 
@@ -54 +58 @@
 set_target_properties(thune-lib PROPERTIES OUTPUT_NAME "thune")
 
+if (APPLE)
+    target_link_libraries(thune-lib m bz2)
+endif ()
+if (UNIX AND NOT APPLE)
+    target_link_libraries(thune-lib m bz2 pthread)
+endif ()
+if (WIN32)
+    target_link_libraries(thune-lib ws2_32)
+endif ()
 
-add_executable(thune
-        console.c
-)
 
-if (APPLE)
-    target_link_libraries(thune thune-lib m bz2)
-endif (APPLE)
+add_executable(thune-bin console.c)
+set_target_properties(thune-bin PROPERTIES OUTPUT_NAME "thune")
 
-if (UNIX AND NOT APPLE)
-    target_link_libraries(thune thune-lib m bz2 pthread)
-endif (UNIX AND NOT APPLE)
+# NOTE: This links the binary with the libraries thune-lib links against.
+# This creates unneeded linker dependencies, but the CMake FAQ says that
+# there is no way to change this behavior.
+# Here is a blog entry which talks about this problem:
+#   http://blogs.sun.com/rie/entry/tt_dependencies_tt_define_what
 
-if (WIN32)
-    target_link_libraries(thune thune-lib ws2_32)
-endif (WIN32)
+target_link_libraries(thune-bin thune-lib)
 
 
 if (UNIX)
-install(TARGETS thune     DESTINATION /usr/local/bin)
+install(TARGETS thune-bin DESTINATION /usr/local/bin)
 install(TARGETS thune-lib DESTINATION /usr/local/lib)
 install(FILES   urlan.h   DESTINATION /usr/local/include)
-endif (UNIX)
-
-
-find_package( FreeType )
-find_package( OpenGL )
-find_package( OpenAL )
-find_package( PNG )
-find_package( GLV )
-
-# Holy shit CMake authors, having to repeat the conditional expression
-# is retarded!
-
-if (FREETYPE_FOUND AND OPENGL_FOUND AND OPENAL_FOUND AND PNG_FOUND AND GLV_FOUND)
-        add_subdirectory( gl . )
-else (FREETYPE_FOUND AND OPENGL_FOUND AND OPENAL_FOUND AND PNG_FOUND AND GLV_FOUND)
-        message(STATUS "Skipping Thune-GL. Missing these dependencies:")
-        if (NOT FREETYPE_FOUND)
-                message(STATUS "  FreeType not found")
-        endif (NOT FREETYPE_FOUND)
-        if (NOT OPENGL_FOUND)
-                message(STATUS "  OpenGL not found")
-        endif (NOT OPENGL_FOUND)
-        if (NOT OPENAL_FOUND)
-                message(STATUS "  OpenAL not found")
-        endif (NOT OPENAL_FOUND)
-        if (NOT PNG_FOUND)
-                message(STATUS "  PNG not found")
-        endif (NOT PNG_FOUND)
-        if (NOT GLV_FOUND)
-                message(STATUS "  GLV not found")
-        endif (NOT GLV_FOUND)
-endif (FREETYPE_FOUND AND OPENGL_FOUND AND OPENAL_FOUND AND PNG_FOUND AND GLV_FOUND)
+endif ()
 
 # eof