CMakeLists.txt (root_v6.26.08.source) | : | CMakeLists.txt (root_v6.26.10.source) | ||
---|---|---|---|---|
skipping to change at line 17 | skipping to change at line 17 | |||
############################################################################ | ############################################################################ | |||
# CMakeLists.txt file for building ROOT montecarlo/pythia6 package | # CMakeLists.txt file for building ROOT montecarlo/pythia6 package | |||
# @author Pere Mato, CERN | # @author Pere Mato, CERN | |||
############################################################################ | ############################################################################ | |||
if(pythia6_nolink) | if(pythia6_nolink) | |||
set(PYTHIA6_LIBRARIES) | set(PYTHIA6_LIBRARIES) | |||
if(CMAKE_SYSTEM_NAME STREQUAL Linux) | if(CMAKE_SYSTEM_NAME STREQUAL Linux) | |||
string(REGEX REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CM AKE_SHARED_LINKER_FLAGS}") | string(REGEX REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CM AKE_SHARED_LINKER_FLAGS}") | |||
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) | elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) | |||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynam ic_lookup") | set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flat_namespace -undefined suppress") | |||
endif() | endif() | |||
else() | else() | |||
if(MSVC) | if(MSVC) | |||
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO ") | SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO ") | |||
link_directories($ENV{LIB}) | link_directories($ENV{LIB}) | |||
endif() | endif() | |||
endif() | endif() | |||
ROOT_STANDARD_LIBRARY_PACKAGE(EGPythia6 | ROOT_STANDARD_LIBRARY_PACKAGE(EGPythia6 | |||
HEADERS | HEADERS | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |