From 318c3619dcc19088cc48dccd8d21f87caeff3bb8 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 27 Sep 2014 00:41:06 +0000 Subject: CMake enhancements, as discussed in STR #3055. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/CMakeLists.txt | 55 +++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) (limited to 'fluid') diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index 57e735200..25424a8bf 100644 --- a/fluid/CMakeLists.txt +++ b/fluid/CMakeLists.txt @@ -1,39 +1,30 @@ set(CPPFILES - CodeEditor.cxx - Fl_Function_Type.cxx - Fl_Group_Type.cxx - Fl_Menu_Type.cxx - Fl_Type.cxx - Fl_Widget_Type.cxx - Fl_Window_Type.cxx - Fluid_Image.cxx - about_panel.cxx - align_widget.cxx - alignment_panel.cxx - code.cxx - factory.cxx - file.cxx - fluid.cxx - function_panel.cxx - template_panel.cxx - undo.cxx - widget_panel.cxx + CodeEditor.cxx + Fl_Function_Type.cxx + Fl_Group_Type.cxx + Fl_Menu_Type.cxx + Fl_Type.cxx + Fl_Widget_Type.cxx + Fl_Window_Type.cxx + Fluid_Image.cxx + about_panel.cxx + align_widget.cxx + alignment_panel.cxx + code.cxx + factory.cxx + file.cxx + fluid.cxx + function_panel.cxx + template_panel.cxx + undo.cxx + widget_panel.cxx ) add_executable(fluid ${CPPFILES}) target_link_libraries(fluid fltk fltk_images fltk_forms) # link in optional libraries -if(FLTK_HAVE_CAIRO) - target_link_libraries(fluid fltk_cairo) -endif(FLTK_HAVE_CAIRO) - -if(FLTK_USE_GL) - target_link_libraries(fluid fltk_gl) - target_link_libraries(fluid ${OPENGL_LIBRARIES}) -endif(FLTK_USE_GL) - if(USE_XFT) target_link_libraries(fluid ${X11_Xft_LIB}) endif(USE_XFT) @@ -43,6 +34,8 @@ if(HAVE_XINERAMA) endif(HAVE_XINERAMA) install(TARGETS fluid - EXPORT fltk-install - DESTINATION ${PREFIX_BIN} -) + EXPORT FLTK-Targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) -- cgit v1.2.3