Avoid setting this define globally when it's only used in two
files.
option(WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)" OFF)
add_feature_info(WITH_OXYGEN_ICONS WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)")
option(WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)" OFF)
add_feature_info(WITH_OXYGEN_ICONS WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)")
-if (WITH_BUNDLED_ICONS)
- add_definitions(-DWITH_BUNDLED_ICONS)
-endif()
-if (WITH_OXYGEN_ICONS)
- add_definitions(-DWITH_OXYGEN_ICONS)
-endif()
-
# For this, the feature info is added after we know if QtWebkit is installed
option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
# For this, the feature info is added after we know if QtWebkit is installed
option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
endif()
add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
endif()
+if (NOT WIN32)
+ check_function_exists(umask HAVE_UMASK)
+endif()
+
if (EMBED_DATA)
message(STATUS "Embedding data files into the binary")
else()
message(STATUS "Installing data files separately")
endif()
if (EMBED_DATA)
message(STATUS "Embedding data files into the binary")
else()
message(STATUS "Installing data files separately")
endif()
-if (NOT WIN32)
- check_function_exists(umask HAVE_UMASK)
- if(HAVE_UMASK)
- add_definitions(-DHAVE_UMASK)
- endif()
-endif()
-
-
# Windows-specific stuff
#####################################################################
# Windows-specific stuff
#####################################################################
target_sources(${TARGET} PRIVATE sslserver.cpp)
endif()
target_sources(${TARGET} PRIVATE sslserver.cpp)
endif()
+if (HAVE_UMASK)
+ set_source_files_properties(oidentdconfiggenerator.cpp PROPERTIES COMPILE_DEFINITIONS HAVE_UMASK)
+endif()
+
if (LDAP_FOUND)
target_sources(${TARGET} PRIVATE ldapauthenticator.cpp)
target_link_libraries(${TARGET} PRIVATE ${LDAP_LIBRARIES})
if (LDAP_FOUND)
target_sources(${TARGET} PRIVATE ldapauthenticator.cpp)
target_link_libraries(${TARGET} PRIVATE ${LDAP_LIBRARIES})
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#ifdef HAVE_UMASK
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif /* HAVE_UMASK */
+
#include <QString>
#include "corenetwork.h"
#include <QString>
#include "corenetwork.h"
#include <QMutex>
#include <QByteArray>
#include <QMutex>
#include <QByteArray>
-#ifdef HAVE_UMASK
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif /* HAVE_UMASK */
-
#include "quassel.h"
#include "coreidentity.h"
#include "quassel.h"
#include "coreidentity.h"
set_source_files_properties(main.cpp PROPERTIES COMPILE_DEFINITIONS EMBED_DATA)
endif()
set_source_files_properties(main.cpp PROPERTIES COMPILE_DEFINITIONS EMBED_DATA)
endif()
+if (HAVE_UMASK)
+ set_source_files_properties(main.cpp PROPERTIES COMPILE_DEFINITIONS HAVE_UMASK)
+endif()
+
+if (WITH_BUNDLED_ICONS)
+ set_property(SOURCE main.cpp APPEND PROPERTY COMPILE_DEFINITIONS WITH_BUNDLED_ICONS)
+endif()
+
# Build the executables
if (WANT_CORE)
add_executable(quasselcore main.cpp)
# Build the executables
if (WANT_CORE)
add_executable(quasselcore main.cpp)
target_sources(${TARGET} PRIVATE osxnotificationbackend.mm)
target_link_libraries(${TARGET} PRIVATE "/System/Library/Frameworks/Foundation.framework")
endif()
target_sources(${TARGET} PRIVATE osxnotificationbackend.mm)
target_link_libraries(${TARGET} PRIVATE "/System/Library/Frameworks/Foundation.framework")
endif()
+
+if (WITH_OXYGEN_ICONS)
+ set_property(SOURCE qtui.cpp APPEND PROPERTY COMPILE_DEFINITIONS WITH_OXYGEN_ICONS)
+endif()