diff options
| author | Manolo Gouy <Manolo> | 2010-12-17 10:43:41 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-12-17 10:43:41 +0000 |
| commit | f3c7efc8d2feb9a67b6fdff09f4f428125eb5b79 (patch) | |
| tree | 63543707427edef3bfc49af7bee60ede908527fe /src/CMakeLists.txt | |
| parent | ff4cafeb303cd8e9d24b62c45661f6da5067d556 (diff) | |
The 3 objective-c++ files used for the Mac OS X support are no longer included
by other files but added to the list of source files to be compiled
for Mac OS X only. Support files for autoconf/configure/make, CMake and Xcode
are also modified accordingly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3d4d569d1..8b35ac57a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -194,13 +194,18 @@ set(CFILES ) if(APPLE) - set_source_files_properties( - Fl.cxx Fl_Native_File_Chooser.cxx Fl_Printer.cxx - PROPERTIES COMPILE_FLAGS "-x objective-c++") + set(MMFILES + Fl_cocoa.mm + Fl_Quartz_Printer.mm + Fl_Native_File_Chooser_MAC.mm + ) +else() + set(MMFILES + ) endif(APPLE) ####################################################################### -add_library(fltk STATIC ${CPPFILES} ${CFILES} fl_call_main.c) +add_library(fltk STATIC ${CPPFILES} ${MMFILES} ${CFILES} fl_call_main.c) set_target_properties(fltk PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(MSVC) if(OPTION_LARGE_FILE) @@ -307,7 +312,7 @@ endif(OPENGL_FOUND) if(OPTION_BUILD_SHARED_LIBS) ####################################################################### -add_library(fltk_SHARED SHARED ${CPPFILES} ${CFILES}) +add_library(fltk_SHARED SHARED ${CPPFILES} ${MMFILES} ${CFILES}) set_target_properties(fltk_SHARED PROPERTIES CLEAN_DIRECT_OUTPUT 1 VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} |