From 7d1488507d110e567f57610894e9ce5d0eaebf2b Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 23 Feb 2018 19:41:52 +0000 Subject: CMake: Fix fltk-config for Windows and Unix/Linux. This update ought to work with fltk-config [--use-images] [--use-gl] --compile on both Windows and Unix/Linux when built with CMake. It was tested under Windows and Linux using fltk-config directly from the build tree, but it should work as well after installation. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12686 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CMake/export.cmake | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'CMake/export.cmake') diff --git a/CMake/export.cmake b/CMake/export.cmake index a58a05553..fecd1bd22 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake @@ -71,21 +71,17 @@ set(srcdir ".") set(LIBNAME "${libdir}/libfltk.a") -if (WIN32) - set (LDFLAGS "-mwindows") - set (LIBS "-lole32 -luuid -lcomctl32") -endif () - configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/fltk-config.in" "${CMAKE_CURRENT_BINARY_DIR}/fltk-config" @ONLY ) -if(UNIX) - execute_process(COMMAND chmod 755 fltk-config - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - ) -endif(UNIX) + +if (UNIX) + execute_process(COMMAND chmod 755 fltk-config + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + ) +endif (UNIX) # prepare some variables for config.h -- cgit v1.2.3