Fix:Build/cmake:Fix compiling of modules with wrong flags

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3911 ffa7fe5e-494d-0410-b361-a75ebd5db220

8 files changed, 10 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fff5b4612..a9299bab4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@ if (NOT HAVE_WORDEXP)
 endif()
 if (NOT Glib_FOUND)
    set_with_reason(support/ezxml "Glib not found" TRUE)
+   add_definitions(-DEZXML_NOMMAP)
 endif()
 
 if(FREETYPE_FOUND)
diff --git a/navit/fib-1.1/CMakeLists.txt b/navit/fib-1.1/CMakeLists.txt
index 01ea1167a..1c86263c4 100644
--- a/navit/fib-1.1/CMakeLists.txt
+++ b/navit/fib-1.1/CMakeLists.txt
@@ -1,5 +1,2 @@
-add_library(fib fib.c)
-if (USE_PLUGINS)
-   SET_TARGET_PROPERTIES( fib PROPERTIES COMPILE_FLAGS -fPIC)
-endif()
+supportlib_add_library(fib fib.c)
 
diff --git a/navit/gui/qml/CMakeLists.txt b/navit/gui/qml/CMakeLists.txt
index 8dbf6f68a..cc4b52d80 100644
--- a/navit/gui/qml/CMakeLists.txt
+++ b/navit/gui/qml/CMakeLists.txt
@@ -12,5 +12,5 @@ QT4_GENERATE_MOC(navitProxy.h ${CMAKE_CURRENT_BINARY_DIR}/navitProxy.moc)
 QT4_GENERATE_MOC(guiProxy.h ${CMAKE_CURRENT_BINARY_DIR}/guiProxy.moc)
 QT4_GENERATE_MOC(routeProxy.h ${CMAKE_CURRENT_BINARY_DIR}/routeProxy.moc)
 QT4_GENERATE_MOC(gui_qml.cpp ${CMAKE_CURRENT_BINARY_DIR}/gui_qml.moc)
-add_library(gui_qml ${MODULE_BUILD_TYPE} gui_qml.cpp ${CMAKE_CURRENT_BINARY_DIR}/proxy.moc ${CMAKE_CURRENT_BINARY_DIR}/ngqpoint.moc ${CMAKE_CURRENT_BINARY_DIR}/searchProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/bookmarksProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/vehicleProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/navitProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/guiProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/routeProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/gui_qml.moc) 
+module_add_library(gui_qml gui_qml.cpp ${CMAKE_CURRENT_BINARY_DIR}/proxy.moc ${CMAKE_CURRENT_BINARY_DIR}/ngqpoint.moc ${CMAKE_CURRENT_BINARY_DIR}/searchProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/bookmarksProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/vehicleProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/navitProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/guiProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/routeProxy.moc ${CMAKE_CURRENT_BINARY_DIR}/gui_qml.moc) 
 
diff --git a/navit/support/ezxml/CMakeLists.txt b/navit/support/ezxml/CMakeLists.txt
index 77cb571fd..d93ad0686 100644
--- a/navit/support/ezxml/CMakeLists.txt
+++ b/navit/support/ezxml/CMakeLists.txt
@@ -1,2 +1 @@
-add_definitions( -DMODULE=support_ezxml -DEZXML_NOMMAP )
-add_library(support_ezxml ezxml.c ezxml_init.c ) 
+supportlib_add_library(support_ezxml ezxml.c ezxml_init.c ) 
diff --git a/navit/support/glib/CMakeLists.txt b/navit/support/glib/CMakeLists.txt
index 658cac60c..88a02a74f 100644
--- a/navit/support/glib/CMakeLists.txt
+++ b/navit/support/glib/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_definitions( -DMODULE=support_glib )
-add_library(support_glib STATIC fake.c galiasdef.c gatomic.c gerror.c ghash.c 
-glib_init.c glist.c gmem.c gmessages.c gprimes.c gprintf.c gslice.c 
-gstrfuncs.c gstring.c gutf8.c gutils.c) 
+supportlib_add_library(support_glib fake.c galiasdef.c gatomic.c gerror.c ghash.c 
+      glib_init.c glist.c gmem.c gmessages.c gprimes.c gprintf.c gslice.c 
+      gstrfuncs.c gstring.c gutf8.c gutils.c) 
diff --git a/navit/support/libpng/CMakeLists.txt b/navit/support/libpng/CMakeLists.txt
index cb8ea6f01..3aa3362be 100644
--- a/navit/support/libpng/CMakeLists.txt
+++ b/navit/support/libpng/CMakeLists.txt
@@ -1,3 +1,2 @@
-add_definitions( -DMODULE=support_libpng )
-add_library(support_libpng png.c pngerror.c pngget.c pngmem.c pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c libpng_init.c) 
+supportlib_add_library(support_libpng png.c pngerror.c pngget.c pngmem.c pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c libpng_init.c)
 
diff --git a/navit/support/win32/CMakeLists.txt b/navit/support/win32/CMakeLists.txt
index e3e8535f4..244084762 100644
--- a/navit/support/win32/CMakeLists.txt
+++ b/navit/support/win32/CMakeLists.txt
@@ -1,3 +1,2 @@
-add_definitions( -DMODULE=support_win32 )
-add_library(support_win32 mmap.c win32_init.c ConvertUTF.c serial_io.c addwinsock.c) 
+supportlib_add_library(support_win32 mmap.c win32_init.c ConvertUTF.c serial_io.c addwinsock.c) 
 
diff --git a/navit/support/zlib/CMakeLists.txt b/navit/support/zlib/CMakeLists.txt
index 80bcffd6e..66d30198c 100644
--- a/navit/support/zlib/CMakeLists.txt
+++ b/navit/support/zlib/CMakeLists.txt
@@ -1,2 +1 @@
-add_definitions( -DMODULE=support_zlib )
-add_library(support_zlib adler32.c crc32.c infback.c inffast.c inflate.c inftrees.c zutil.c zlib_init.c) 
+supportlib_add_library(support_zlib adler32.c crc32.c infback.c inffast.c inflate.c inftrees.c zutil.c zlib_init.c)