Merge topic 'support_conda_env'

50879ce412 Conda: Add CONDA_PREFIX as an acceptable system prefix path
cd9c3c000f Tests: Update QtAutogen codeeditor test only include headers needed
d806bd2e8c Tests: Update test suite to run in an Anaconda environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4773

Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst

@@ -34,6 +34,9 @@ Darwin:
 OpenBSD:
   * ``ENV{LOCALBASE}``
 
+Unix:
+  * ``ENV{CONDA_PREFIX}`` when using a conda compiler
+
 Windows:
   * ``ENV{ProgramW6432}``
   * ``ENV{ProgramFiles}``

Modules/Platform/UnixPaths.cmake

@@ -95,6 +95,10 @@ unset(_cmake_sysroot_compile)
 # synchronized
 if(CMAKE_COMPILER_SYSROOT)
   list(PREPEND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_COMPILER_SYSROOT}")
+
+  if(DEFINED ENV{CONDA_PREFIX} AND EXISTS "$ENV{CONDA_PREFIX}")
+    list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{CONDA_PREFIX}")
+  endif()
 endif()
 
 # Enable use of lib32 and lib64 search path variants by default.

Tests/QtAutogen/Complex/codeeditor.cpp

@@ -40,7 +40,10 @@
 
 #include "codeeditor.h"
 
-#include <QtGui>
+#include <QPainter>
+#include <QSize>
+#include <QTextBlock>
+#include <QWidget>
 
 CodeEditor::CodeEditor(QWidget* parent)
   : QPlainTextEdit(parent)

Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake

@@ -26,4 +26,12 @@ function(run_GEH)
   endforeach()
 endfunction()
 
+# remove these flags from the enviornment if they have been set
+# so the tests run the correct env
+set(env_cxx_flags $ENV{CXXFLAGS})
+if(env_cxx_flags)
+  string(REPLACE "-fvisibility=hidden" "" env_cxx_flags "${env_cxx_flags}")
+  string(REPLACE "-fvisibility-inlines-hidden" "" env_cxx_flags "${env_cxx_flags}")
+  set(ENV{CXXFLAGS} "${env_cxx_flags}")
+endif()
 run_GEH()

Tests/RunCMake/install/RunCMakeTest.cmake

@@ -174,6 +174,13 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
   run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1)
   run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2)
 elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+  if(DEFINED ENV{LDFLAGS})
+    # Some setups prebake disable-new-dtags into LDFLAGS
+    set(new_ldflags $ENV{LDFLAGS}})
+    string(REPLACE "-Wl,--disable-new-dtags" "" new_ldflags "${new_ldflags}")
+    set(ENV{LDFLAGS} "${new_ldflags}")
+  endif()
+
   if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL")
     run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux)
   endif()