Skip to content
Snippets Groups Projects
Commit e26dfc1f authored by Guilherme Amadio's avatar Guilherme Amadio
Browse files

cmake: remove obsolete SYSLIBS

Can cause unnecessary extra linking to system libraries. We should
add linking libraries directly to each target that needs it.
parent 636886c3
No related branches found
No related tags found
No related merge requests found
......@@ -13,8 +13,6 @@ CXXFLAGS=$5
SOFLAGS=$6
LDFLAGS=$7
SOEXT=$8
SYSLIBS=$9
shift
LIBDIR=$9
shift
ROOTLIBS=$9
......@@ -123,7 +121,7 @@ else
echo "#define MAKESHAREDLIB \"$CUSTOMSHARED\"" >> ${COMPILEDATA}.tmp
fi
if [ "$CUSTOMEXE" = "" ]; then
echo "#define MAKEEXE \"cd \$BuildDir ; $BXX -c $OPT $CXXFLAGS \$IncludePath \$SourceFiles; $BXX \$ObjectFiles $LDFLAGS -o \$ExeName \$LinkedLibs $SYSLIBS\"" >> ${COMPILEDATA}.tmp
echo "#define MAKEEXE \"cd \$BuildDir ; $BXX -c $OPT $CXXFLAGS \$IncludePath \$SourceFiles; $BXX \$ObjectFiles $LDFLAGS -o \$ExeName \$LinkedLibs\"" >> ${COMPILEDATA}.tmp
else
echo "#define MAKEEXE \"$CUSTOMEXE\"" >> ${COMPILEDATA}.tmp
fi
......
......@@ -680,7 +680,7 @@ else()
execute_process(COMMAND ${CMAKE_SOURCE_DIR}/build/unix/compiledata.sh
${CMAKE_BINARY_DIR}/include/compiledata.h "${CMAKE_CXX_COMPILER}"
"${CMAKE_CXX_FLAGS_RELEASE}" "${CMAKE_CXX_FLAGS_DEBUG}" "${CMAKE_CXX_FLAGS}"
"${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS}" "${CMAKE_EXE_FLAGS}" "so" "${SYSLIBS}"
"${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS}" "${CMAKE_EXE_FLAGS}" "so"
"${libdir}" "-lCore" "-lRint" "${incdir}" "" "" "${ROOT_ARCHITECTURE}" "" "${explicitlink}" )
endif()
......
......@@ -85,7 +85,6 @@ else()
endif()
endif()
set(SYSLIBS "-lm -ldl ${CMAKE_THREAD_LIBS_INIT} -rdynamic")
# JIT must be able to resolve symbols from all ROOT binaries.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
......
set(ROOT_ARCHITECTURE macosx)
set(ROOT_PLATFORM macosx)
set(SYSLIBS "-lm ${EXTRA_LDFLAGS} ${FINK_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} -ldl")
#---This is needed to help CMake to locate the X11 headers in the correct place and not under /usr/include
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
#---------------------------------------------------------------------------------------------------------
......
set(ROOT_PLATFORM win32)
#---Global variables for Win32 platform-------------------------------------------------
set(SYSLIBS advapi32.lib)
#----Check the compiler that is used-----------------------------------------------------
if(CMAKE_COMPILER_IS_GNUCXX)
......
......@@ -373,8 +373,8 @@ endif
CXXFLAGS += $(ROOTCFLAGS)
LDFLAGS += $(ROOTLDFLAGS)
LIBS = $(ROOTLIBS) $(SYSLIBS)
GLIBS = $(ROOTGLIBS) $(SYSLIBS)
LIBS = $(ROOTLIBS)
GLIBS = $(ROOTGLIBS)
ifneq ($(ALTCC),)
CC = $(ALTCC)
......
......@@ -51,7 +51,6 @@ else()
${PROOFD_SOURCES}
LIBRARIES
${XROOTD_LIBRARIES}
${SYSLIBS}
BUILTINS
XROOTD
)
......@@ -73,7 +72,5 @@ else()
proofexecv.cxx
${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
LIBRARIES
${SYSLIBS}
)
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment