From 7b0f2601a652adb7566bfac6ec0eab7a9d95c7a2 Mon Sep 17 00:00:00 2001 From: Sebastian Faubel Date: Wed, 6 Jul 2016 17:42:00 +0200 Subject: Fixing build for Linux. Replaced tabs with whitespaces. (bzr r15002.1.7) --- CMakeScripts/ConfigEnv.cmake | 82 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'CMakeScripts/ConfigEnv.cmake') diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake index 91404f874..ebd005cb3 100644 --- a/CMakeScripts/ConfigEnv.cmake +++ b/CMakeScripts/ConfigEnv.cmake @@ -2,53 +2,53 @@ # Set platform defaults (originally copied from darktable) # ----------------------------------------------------------------------------- if(WIN32) - message("-- Windows build detected, setting default features") + message("-- Windows build detected, setting default features") - include(mingwenv.cmake) - - list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) - list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) - - set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") - set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") - set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe") - set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe") - set(CMAKE_CXX_STANDARD 11) - - # Setup Windows resource files compiler. - set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe") - set(CMAKE_RC_COMPILER_INIT windres) - enable_language(RC) - set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") - - # These options are required for having i18n support on Windows. - option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON) - option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON) - - # Does not compile on Windows with these options. - option(BR_PTHREADS "Use binreloc thread support" OFF) - option(ENABLE_BINRELOC "Use AutoPackage" OFF) + include(mingwenv.cmake) + + list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH}) + list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH}) + + set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe") + set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe") + set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe") + set(CMAKE_CXX_STANDARD 11) + + # Setup Windows resource files compiler. + set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe") + set(CMAKE_RC_COMPILER_INIT windres) + enable_language(RC) + set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + + # These options are required for having i18n support on Windows. + option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON) + option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON) + + # Does not compile on Windows with these options. + option(BR_PTHREADS "Use binreloc thread support" OFF) + option(ENABLE_BINRELOC "Use AutoPackage" OFF) endif() if(APPLE) - message("-- Mac OS X build detected, setting default features") - - # prefer macports and/or user-installed libraries over system ones - #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) - set(CMAKE_FIND_FRAMEWORK "LAST") + message("-- Mac OS X build detected, setting default features") + + # prefer macports and/or user-installed libraries over system ones + #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local) + set(CMAKE_FIND_FRAMEWORK "LAST") - # test and display relevant env variables - if(DEFINED ENV{CMAKE_PREFIX_PATH}) - message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") - endif() - - if(DEFINED ENV{GTKMM_BASEPATH}) - message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") - endif() + # test and display relevant env variables + if(DEFINED ENV{CMAKE_PREFIX_PATH}) + message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}") + endif() + + if(DEFINED ENV{GTKMM_BASEPATH}) + message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") + endif() - # detect current GTK+ backend - pkg_check_variable(gtk+-2.0 target) - message("GTK2 backend: ${GTK+_2.0_TARGET}") + # detect current GTK+ backend + pkg_check_variable(gtk+-2.0 target) + message("GTK2 backend: ${GTK+_2.0_TARGET}") endif() include(CMakeScripts/ConfigPaths.cmake) \ No newline at end of file -- cgit v1.2.3