diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTK2.cmake | 14 | ||||
| -rw-r--r-- | Modules/UseSWIG.cmake | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 25c482e..bc66337 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -689,7 +689,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h) _GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h) if(UNIX) - _GTK2_FIND_LIBRARY (GDK gdk-x11 false true) + if(APPLE) + _GTK2_FIND_LIBRARY (GDK gdk-quartz false true) + endif() + if(NOT GTK2_GDK_FOUND) + _GTK2_FIND_LIBRARY (GDK gdk-x11 false true) + endif() else() _GTK2_FIND_LIBRARY (GDK gdk-win32 false true) endif() @@ -698,7 +703,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h) if(UNIX) - _GTK2_FIND_LIBRARY (GTK gtk-x11 false true) + if(APPLE) + _GTK2_FIND_LIBRARY (GTK gtk-quartz false true) + endif() + if(NOT GTK2_GTK_FOUND) + _GTK2_FIND_LIBRARY (GTK gtk-x11 false true) + endif() else() _GTK2_FIND_LIBRARY (GTK gtk-win32 false true) endif() diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake index 4329053..28d5ff0 100644 --- a/Modules/UseSWIG.cmake +++ b/Modules/UseSWIG.cmake @@ -68,6 +68,10 @@ macro(SWIG_MODULE_INITIALIZE name language) set(SWIG_MODULE_${name}_REAL_NAME "_${name}") elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PERL") set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow") + elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "CSHARP") + # This makes sure that the name used in the generated DllImport + # matches the library name created by CMake + set(SWIG_MODULE_${name}_EXTRA_FLAGS "-dllimport;${name}") endif() endmacro() @@ -131,6 +135,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile) #message("Full path to source file: ${swig_source_file_fullname}") #message("Full path to the output file: ${swig_generated_file_fullname}") get_directory_property(cmake_include_directories INCLUDE_DIRECTORIES) + list(REMOVE_DUPLICATES cmake_include_directories) set(swig_include_dirs) foreach(it ${cmake_include_directories}) set(swig_include_dirs ${swig_include_dirs} "-I${it}") |