Changeset 19996

Timestamp:

09/24/20 18:01:11 (4 years ago)

Author:

tbretz

Message:

Added a warning to make users aware of an anaconda problem; improved some output; link openSSL::SSL explicitly to rootifysql and root2sql

File:

• trunk/FACT++/CMakeLists.txt (modified) (3 diffs)

trunk/FACT++/CMakeLists.txt

@@ -54 +54 @@
 ENDIF()
 
+# ===== Check for Anaconda =====
+# Anacoda installation sometimes believe that they are the master of everything
+# and change the users environment such that the build system or the executable
+# loads, for example, anconda's libz rather than the system library. This might
+# work but usually creates serious troubles either during linking or during
+# execution.
+
+STRING(REPLACE ":" ";" PATHENV "$ENV{PATH}")
+FOREACH (DIR ${PATHENV})
+   IF(LDIR MATCHES .*anaconda.*)
+        MESSAGE(WARNING "\n  WARNING: Anaconda is altering your PATH environent: " ${DIR} "\n  CMake, make or execution might fail, as non-system\n  libraries might be mistaken for system libraries!\n  Please make sure that there is no interference!")
+        BREAK()
+   ENDIF()
+ENDFOREACH()
+
+
 # ======== For config.h.in =========
 SET(PACKAGE_MAINTAINER "Thomas Bretz")
@@ -222 +238 @@
 
 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND Boost_VERSION LESS 106000 AND NOT NO_BOOST_HACK)
-    MESSAGE(STATUS "  BOOST_REGEX_NO_EXTERNAL_TEMPLATES")
+    MESSAGE(STATUS "Setting BOOST_REGEX_NO_EXTERNAL_TEMPLATES")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_REGEX_NO_EXTERNAL_TEMPLATES=1")
 ENDIF()
@@ -693 +709 @@
 
    ADD_EXECUTABLE(rootifysql src/rootifysql.cc)
-   TARGET_LINK_LIBRARIES(rootifysql ${HELP++LIBS} ${ROOT_LIBRARIES})
+   TARGET_LINK_LIBRARIES(rootifysql ${HELP++LIBS} OpenSSL::SSL ${ROOT_LIBRARIES})
    MANPAGE(rootifysql "FACT++ - rootifysql - Write result of a SQL query into a root-file")
    ADD_EXECUTABLE(root2sql src/root2sql.cc)
-   TARGET_LINK_LIBRARIES(root2sql ${HELP++LIBS} ${ROOT_LIBRARIES})
+   TARGET_LINK_LIBRARIES(root2sql ${HELP++LIBS} OpenSSL::SSL ${MYSQLPP_LIBRARY} ${ROOT_LIBRARIES})
    MANPAGE(root2sql "FACT++ - root2sql - Fill contents of a root-tree into a MySQL database")