X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=b9ffe9df5e857b97d2869710333079c0aef3aed1;hb=94f256857023b24b7a96a1be58bdc8456920b702;hp=98559b43675d5eff9ffad55f417c4d13f6124364;hpb=730df31def1c1cccfcf8b4c1dfd451f40daa7417;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index 98559b4..b9ffe9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,17 @@ PROJECT(freeglut) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +# NOTE: On Windows and Cygwin, the dll's are placed in the +# CMAKE_RUNTIME_OUTPUT_DIRECTORY, while their corresponding import +# libraries end up in CMAKE_ARCHIVE_OUTPUT_DIRECTORY. On other +# platforms, such as Linux, the shared libraries are put in +# CMAKE_ARCHIVE_OUTPUT_DIRECTORY instead. +# Static libraries end up in CMAKE_ARCHIVE_OUTPUT_DIRECTORY on all +# platforms (unless +SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) + + SET(FREEGLUT_HEADERS include/GL/freeglut.h include/GL/freeglut_ext.h @@ -33,15 +44,15 @@ SET(FREEGLUT_SRCS # Android port requires adding a version of these compatible with # OpenGL ES (TODO): IF(NOT ANDROID) - LIST(APPEND FREEGLUT_SRCS - src/fg_font.c - src/fg_geometry.c - src/fg_menu.c - src/fg_teapot.c -) + LIST(APPEND FREEGLUT_SRCS + src/fg_font.c + src/fg_geometry.c + src/fg_menu.c + src/fg_teapot.c + ) ENDIF() -IF(WIN32) # TODO: is this true for 64 bit as well? Chaneg to WINDOWS? +IF(WIN32) LIST(APPEND FREEGLUT_SRCS src/mswin/fg_cursor_mswin.c src/mswin/fg_display_mswin.c @@ -57,7 +68,15 @@ IF(WIN32) # TODO: is this true for 64 bit as well? Chaneg to WINDOWS? src/mswin/fg_state_mswin.c src/mswin/fg_structure_mswin.c src/mswin/fg_window_mswin.c -) + freeglut.rc + ) + IF (NOT CMAKE_CL_64) + # .def file only for 32bit Windows builds + LIST(APPEND FREEGLUT_SRCS + src/freeglutdll.def + ) + ENDIF() + ELSEIF(ANDROID) LIST(APPEND FREEGLUT_SRCS src/egl/fg_internal_egl.h @@ -77,7 +96,7 @@ ELSEIF(ANDROID) src/android/fg_window_android.c src/android/opengles_stubs.c src/android/fg_internal_android.h -) + ) ELSE() LIST(APPEND FREEGLUT_SRCS src/x11/fg_cursor_x11.c @@ -96,17 +115,12 @@ ELSE() src/x11/fg_structure_x11.c src/x11/fg_window_x11.c src/x11/fg_xinput_x11.c -) - - + ) ENDIF() -# Neatly organize all of the output files in the build directory -SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) -SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) - # BUILD_SHARED_LIBS is already a standard CMake variable, but we need to # re-declare it here so it will show up in the GUI. +# by default, we want to build both OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) @@ -178,7 +192,16 @@ ENDIF() # decide on suitable type for internal time keeping, 64-bit if possible CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) -CHECK_TYPE_SIZE("unsigned long long" ULONG_LONG BUILTIN_TYPES_ONLY) +IF (NOT (HAVE_STDINT_H OR HAVE_INTTYPES_H)) + IF (MSVC) + # Some old Microsoft VC don't support unsigned long long, but all we + # care about support unsigned __int64, so test for presence of that + # type + CHECK_TYPE_SIZE("unsigned __int64" U__INT64 BUILTIN_TYPES_ONLY) + ELSEIF() + CHECK_TYPE_SIZE("unsigned long long" ULONG_LONG BUILTIN_TYPES_ONLY) + ENDIF() +ENDIF() # The generated config.h is placed in the project's build directory, just to @@ -188,7 +211,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src) ADD_DEFINITIONS(-DHAVE_CONFIG_H) -# by default, at least on UNIX, we want to build both IF(BUILD_SHARED_LIBS) ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) ENDIF() @@ -200,11 +222,16 @@ ENDIF() IF(WIN32) LIST(APPEND LIBS winmm) IF(BUILD_SHARED_LIBS) - LIST(APPEND FREEGLUT_SRCS src/Common/freeglutdll.def freeglut.rc) - # XXX I assume that if we want both shared and static this one is appropriate - ADD_DEFINITIONS(-DFREEGLUT_EXPORTS) - ELSE() - ADD_DEFINITIONS(-DFREEGLUT_STATIC) + SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) + ENDIF() + IF(BUILD_STATIC_LIBS) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) + # need to set machine:x64 for linker, at least for VC10, and + # doesn't hurt for older compilers: + # http://public.kitware.com/Bug/view.php?id=11240#c22768 + IF (CMAKE_CL_64) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") + ENDIF() ENDIF() ELSE() # on UNIX we need to make sure: @@ -267,6 +294,7 @@ MACRO(ADD_DEMO name) IF(BUILD_STATIC_LIBS) ADD_EXECUTABLE(${name}_static ${ARGN}) TARGET_LINK_LIBRARIES(${name}_static ${DEMO_LIBS} freeglut_static) + SET_TARGET_PROPERTIES(${name}_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) ENDIF() ENDIF() ENDMACRO() @@ -284,3 +312,22 @@ ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c progs/demos/spaceball/vmath.h) ADD_DEMO(subwin progs/demos/subwin/subwin.c) ADD_DEMO(timer progs/demos/timer/timer.c) + +# finally, if any demos are built, copy needed files to output directory +# (currently, thats just the input file for the Fractals demo) +IF(FREEGLUT_BUILD_DEMOS) + # 1) copy fractals.dat from freeglut/progs/demos/Fractals + IF(BUILD_SHARED_LIBS) + SET(Frac_target Fractals) + ELSE() + SET(Frac_target Fractals_static) + ENDIF() + GET_TARGET_PROPERTY(DEMO_OUTPUT_DIRECTORY ${Frac_target} RUNTIME_OUTPUT_DIRECTORY) + ADD_CUSTOM_COMMAND( + TARGET ${Frac_target} + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${PROJECT_SOURCE_DIR}/progs/demos/Fractals/fractals.dat + ${DEMO_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} + ) +ENDIF()