diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | modules/FindKDE4.cmake | 43 | ||||
| -rw-r--r-- | modules/FindOpenEXR.cmake | 20 | ||||
| -rw-r--r-- | modules/FindQt4.cmake | 26 |
4 files changed, 50 insertions, 49 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 8ccb8c3b..892940d5 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,10 +1,6 @@ -set(CMAKE_INSTALL_PREFIX ${CMAKE_ROOT} ) +# install the cmake files -FILE(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake") +file(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake") -INSTALL_FILES(/Modules FILES -kde3init_dummy.cpp.in -kde4init_dummy.cpp.in -${cmakeFiles} -) +install_files(/share/apps/cmake/modules FILES kde3init_dummy.cpp.in kde4init_dummy.cpp.in ${cmakeFiles} ) diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 9cc6b397..1b8afbe6 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -55,7 +55,7 @@ set(KDE4_SERVICETYPES_DIR /share/servicetypes) set(KDE4_SOUND_DIR /share/sounds) set(KDE4_TEMPLATES_DIR /share/templates) set(KDE4_WALLPAPER_DIR /share/wallpapers) -set(KDE4_KCONF_UPDATE_DIR /share/apps/kconf_update/ ) +set(KDE4_KCONF_UPDATE_DIR /share/apps/kconf_update/ ) set(XDG_APPS_DIR /share/applications/kde) set(XDG_DIRECTORY_DIR /share/desktop-directories) @@ -188,8 +188,6 @@ endif(UNIX AND NOT APPLE) if (WIN32) - - if(CYGWIN) message(FATAL_ERROR "Support for Cygwin NOT yet implemented, please edit FindKDE4.cmake to enable it") endif(CYGWIN) @@ -216,23 +214,23 @@ endif (WIN32) # only on linux, but NOT e.g. on FreeBSD: -if(CMAKE_SYSTEM_NAME MATCHES Linux) - set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) - set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") - set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") - set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -fno-exceptions -fno-check-new -fno-common") -endif(CMAKE_SYSTEM_NAME MATCHES Linux) +if (CMAKE_SYSTEM_NAME MATCHES Linux) + set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -fno-exceptions -fno-check-new -fno-common") +endif (CMAKE_SYSTEM_NAME MATCHES Linux) # works on FreeBSD, NOT tested on NetBSD and OpenBSD -if(CMAKE_SYSTEM_NAME MATCHES BSD) - set ( _KDE4_PLATFORM_DEFINITIONS -D_GNU_SOURCE ) - set ( CMAKE_SHARED_LINKER_FLAGS "-avoid-version -lc") - set ( CMAKE_MODULE_LINKER_FLAGS "-avoid-version -lc") - set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common") -endif(CMAKE_SYSTEM_NAME MATCHES BSD) +if (CMAKE_SYSTEM_NAME MATCHES BSD) + set ( _KDE4_PLATFORM_DEFINITIONS -D_GNU_SOURCE ) + set ( CMAKE_SHARED_LINKER_FLAGS "-avoid-version -lc") + set ( CMAKE_MODULE_LINKER_FLAGS "-avoid-version -lc") + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common") +endif (CMAKE_SYSTEM_NAME MATCHES BSD) # This will need to be modified later to support either Qt/X11 or Qt/Mac builds @@ -258,6 +256,17 @@ if(APPLE) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Os") endif(APPLE) + +# compiler specific stuff, maybe this should be done differently, Alex + +if (MSVC) + set (KDE4_ENABLE_EXCEPTIONS -EHsc) +endif(MSVC) + +if (CMAKE_COMPILER_IS_GNUCXX) + set (KDE4_ENABLE_EXCEPTIONS -fexceptions) +endif (CMAKE_COMPILER_IS_GNUCXX) + ########### end of platform specific stuff ########################## diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 5539fa59..91ca3621 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -8,14 +8,12 @@ PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflag #PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h -${_OpenEXRIncDir} -${_OpenEXRIncDir}/OpenEXR/ -/usr/include -/usr/local/include + ${_OpenEXRIncDir} + ${_OpenEXRIncDir}/OpenEXR/ + /usr/include + /usr/local/include ) -message(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") - FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS ${_OPENEXRLinkDir} @@ -46,14 +44,12 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf /usr/local/lib ) -message(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") +set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) -set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} - ${OPENEXR_IMATH__LIBRARY}...) -if(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - set(OPENEXR_FOUND TRUE) +if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + set( OPENEXR_FOUND TRUE) set( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) -endif(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) +endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 4259b648..fb9dbf35 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -637,16 +637,16 @@ if(QT4_QMAKE_FOUND) # get include dirs QT4_GET_MOC_INC_DIRS(moc_includes) - foreach(it ${ARGN}) + FOREACH(it ${ARGN}) GET_FILENAME_COMPONENT(it ${it} ABSOLUTE) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_MOC_EXECUTABLE} ARGS ${moc_includes} -o ${outfile} ${it} MAIN_DEPENDENCY ${it}) - set(${outfiles} ${${outfiles}} ${outfile}) + SET(${outfiles} ${${outfiles}} ${outfile}) endforeach(it) ENDMACRO(QT4_WRAP_CPP) @@ -656,16 +656,16 @@ if(QT4_QMAKE_FOUND) MACRO(QT4_WRAP_UI outfiles ) - foreach(it ${ARGN}) + FOREACH(it ${ARGN}) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) + SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_UIC_EXECUTABLE} ARGS -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile}) - set(${outfiles} ${${outfiles}} ${outfile}) - endforeach(it) + SET(${outfiles} ${${outfiles}} ${outfile}) + ENDFOREACH(it) ENDMACRO(QT4_WRAP_UI) @@ -674,16 +674,16 @@ if(QT4_QMAKE_FOUND) MACRO(QT4_ADD_RESOURCES outfiles ) - foreach(it ${ARGN}) + FOREACH(it ${ARGN}) GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) - set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) + SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_RCC_EXECUTABLE} ARGS -name ${outfilename} -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile} ) - set(${outfiles} ${${outfiles}} ${outfile}) - endforeach(it) + SET(${outfiles} ${${outfiles}} ${outfile}) + ENDFOREACH(it) ENDMACRO(QT4_ADD_RESOURCES) |