From f72200bd2c8d3bea4b6820d90f92296e03aa4012 Mon Sep 17 00:00:00 2001 From: sjunges Date: Mon, 15 May 2017 23:24:29 +0200 Subject: [PATCH] - removed deprecated option USE_CARL (now a variable). - changed behaviour of POPCNT: we usually rely on march=native which uses popcnt if available, and now can force its usuage in other situations --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64c2c6ac7..024fc9689 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,12 +27,13 @@ option(STORM_USE_LTO "Sets whether link-time optimizations are enabled." ON) MARK_AS_ADVANCED(STORM_USE_LTO) option(STORM_PORTABLE "Sets whether a build needs to be portable." OFF) MARK_AS_ADVANCED(STORM_PORTABLE) -option(STORM_USE_POPCNT "Sets whether the popcnt instruction is going to be used." ON) -MARK_AS_ADVANCED(STORM_USE_POPCNT) +# Force POPCNT is helpful for portable code targetting platforms with SSE4.2 operation support. +option(STORM_FORCE_POPCNT "Sets whether the popcnt instruction is forced to be used (advanced)." OFF) +MARK_AS_ADVANCED(STORM_FORCE_POPCNT) option(USE_BOOST_STATIC_LIBRARIES "Sets whether the Boost libraries should be linked statically." OFF) option(STORM_USE_INTELTBB "Sets whether the Intel TBB libraries should be used." OFF) option(STORM_USE_GUROBI "Sets whether Gurobi should be used." OFF) -option(USE_CARL "Sets whether carl should be included." ON) +set(USE_CARL ON) option(STORM_FORCE_SHIPPED_CARL "Sets whether the shipped version of carl is to be used no matter whether carl is found or not." OFF) MARK_AS_ADVANCED(STORM_FORCE_SHIPPED_CARL) option(USE_SMTRAT "Sets whether SMT-RAT should be included." OFF) @@ -198,7 +199,7 @@ endif() ## Compiler independent settings ## ############################################################# -if (STORM_USE_POPCNT) +if (STORM_FORCE_POPCNT) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt") endif()