summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2014-09-27 00:41:06 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2014-09-27 00:41:06 +0000
commit318c3619dcc19088cc48dccd8d21f87caeff3bb8 (patch)
tree9533562994364df196b3e162285f8ab42626c3d3 /test
parent8ef6520fe3dcae4372b816a49b11024736a0217d (diff)
CMake enhancements, as discussed in STR #3055.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt42
1 files changed, 1 insertions, 41 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 616e95777..072fb852f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,46 +11,6 @@ elseif(HAVE_ALSA_ASOUNDLIB_H)
endif(WIN32)
#######################################################################
-macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
- set(srcs)
- set(flsrcs)
- foreach(src ${SOURCES})
- if("${src}" MATCHES ".fl$")
- list(APPEND flsrcs ${src})
- else()
- list(APPEND srcs ${src})
- endif("${src}" MATCHES ".fl$")
- endforeach(src)
-
- if(flsrcs)
- fltk_wrap_ui(${NAME} ${flsrcs})
- endif(flsrcs)
-
- add_executable(${NAME} WIN32 ${srcs} ${${NAME}_FLTK_UI_SRCS})
- if(flsrcs)
- add_dependencies(${NAME} ${FLTK_FLUID_EXECUTABLE})
- endif(flsrcs)
- target_link_libraries(${NAME} ${LIBRARIES})
-
- # link in optional libraries
- if(FLTK_HAVE_CAIRO)
- target_link_libraries(${NAME} fltk_cairo)
- endif(FLTK_HAVE_CAIRO)
-
- if(USE_XFT)
- target_link_libraries(${NAME} ${X11_Xft_LIB})
- endif(USE_XFT)
-
- if(HAVE_XINERAMA)
- target_link_libraries(${NAME} ${X11_Xinerama_LIB})
- endif(HAVE_XINERAMA)
-
- install(TARGETS ${NAME}
- DESTINATION ${PREFIX_DOC}/examples
- )
-endmacro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
-
-#######################################################################
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
@@ -137,5 +97,5 @@ endif(OPENGL_FOUND)
# Cairo demo
if(FLTK_HAVE_CAIRO)
- CREATE_EXAMPLE(cairo_test cairo_test.cxx fltk)
+ CREATE_EXAMPLE(cairo_test cairo_test.cxx "fltk;fltk_cairo")
endif(FLTK_HAVE_CAIRO)