Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
cmake: mark some variables as advanced to hide them
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Fri, 4 Jan 2019 10:12:47 +0000 (11:12 +0100)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Fri, 4 Jan 2019 10:12:47 +0000 (11:12 +0100)
CMakeLists.txt
tools/cmake/MakeLib.cmake
tools/cmake/Modules/FindGraphviz.cmake

index c03d4e1..ce93b4a 100644 (file)
@@ -121,11 +121,6 @@ endif()
 execute_process(COMMAND ${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION ERROR_VARIABLE LINKER_VERSION)
 string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
 
 execute_process(COMMAND ${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION ERROR_VARIABLE LINKER_VERSION)
 string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
 
-### Set the library providing dlopen
-if("${CMAKE_SYSTEM_NAME}" MATCHES "kFreeBSD|Linux")
-  find_library(DL_LIBRARY dl)
-endif()
-
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)
 include(FindPerl)
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)
 include(FindPerl)
@@ -865,6 +860,8 @@ if(enable_python)
     message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).")
   endif()
 endif()
     message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).")
   endif()
 endif()
+mark_as_advanced(PYBIND11_PYTHON_VERSION)
+mark_as_advanced(pybind11_DIR)
 
 ### Make tests
 if(enable_memcheck_xml)
 
 ### Make tests
 if(enable_memcheck_xml)
index f937e5a..7a81ade 100644 (file)
@@ -40,6 +40,12 @@ endif()
 
 # Compute the dependencies of SimGrid
 #####################################
 
 # Compute the dependencies of SimGrid
 #####################################
+# search for dlopen
+if("${CMAKE_SYSTEM_NAME}" MATCHES "kFreeBSD|Linux")
+  find_library(DL_LIBRARY dl)
+endif()
+mark_as_advanced(DL_LIBRARY)
+
 if (HAVE_BOOST_CONTEXTS)
   set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
 endif()
 if (HAVE_BOOST_CONTEXTS)
   set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
 endif()
@@ -145,6 +151,7 @@ FIND_LIBRARY(GCCLIBATOMIC_LIBRARY NAMES atomic atomic.so.1 libatomic.so.1
 if(CMAKE_COMPILER_IS_GNUCC AND GCCLIBATOMIC_LIBRARY)
     set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,--as-needed -latomic -Wl,--no-as-needed")
 endif()
 if(CMAKE_COMPILER_IS_GNUCC AND GCCLIBATOMIC_LIBRARY)
     set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,--as-needed -latomic -Wl,--no-as-needed")
 endif()
+mark_as_advanced(GCCLIBATOMIC_LIBRARY)
 
 if(enable_model-checking AND (NOT LINKER_VERSION VERSION_LESS "2.30"))
     set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,-znoseparate-code")
 
 if(enable_model-checking AND (NOT LINKER_VERSION VERSION_LESS "2.30"))
     set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,-znoseparate-code")
index 25aa03f..57f6771 100644 (file)
@@ -31,6 +31,9 @@ else()
 endif()
 
 mark_as_advanced(HAVE_GRAPHVIZ)
 endif()
 
 mark_as_advanced(HAVE_GRAPHVIZ)
+mark_as_advanced(HAVE_CGRAPH_H)
+mark_as_advanced(HAVE_CGRAPH_LIB)
+mark_as_advanced(HAVE_CDT_LIB)
 unset(HAVE_CGRAPH_H)
 unset(HAVE_CGRAPH_LIB)
 unset(HAVE_CDT_LIB)
 unset(HAVE_CGRAPH_H)
 unset(HAVE_CGRAPH_LIB)
 unset(HAVE_CDT_LIB)