diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/EthCompilerSettings.cmake | 4 | ||||
| -rw-r--r-- | cmake/FindCLN.cmake | 5 | ||||
| -rw-r--r-- | cmake/FindCVC4.cmake | 11 | ||||
| -rw-r--r-- | cmake/FindGMP.cmake | 7 | ||||
| -rw-r--r-- | cmake/FindZ3.cmake | 9 | ||||
| -rw-r--r-- | cmake/jsoncpp.cmake | 5 |
6 files changed, 32 insertions, 9 deletions
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index b4cc6656..70505fdb 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -25,8 +25,8 @@ eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough) if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")) - # Use ISO C++11 standard language. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + # Use ISO C++14 standard language. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") # Enables all the warnings about constructions that some users consider questionable, # and that are easy to avoid. Also enable some extra warning flags that are not diff --git a/cmake/FindCLN.cmake b/cmake/FindCLN.cmake index f2234bb4..0b574ab9 100644 --- a/cmake/FindCLN.cmake +++ b/cmake/FindCLN.cmake @@ -1,3 +1,8 @@ find_library(CLN_LIBRARY NAMES cln) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CLN DEFAULT_MSG CLN_LIBRARY) + +if(CLN_FOUND AND NOT TARGET CLN::CLN) + add_library(CLN::CLN UNKNOWN IMPORTED) + set_property(TARGET CLN::CLN PROPERTY IMPORTED_LOCATION ${CLN_LIBRARY}) +endif() diff --git a/cmake/FindCVC4.cmake b/cmake/FindCVC4.cmake index 2649d7c7..887b907b 100644 --- a/cmake/FindCVC4.cmake +++ b/cmake/FindCVC4.cmake @@ -14,12 +14,19 @@ if (USE_CVC4) set(CVC4_LIBRARIES ${CVC4_LIBRARY}) if (CLN_FOUND) - set(CVC4_LIBRARIES ${CVC4_LIBRARIES} ${CLN_LIBRARY}) + set(CVC4_LIBRARIES ${CVC4_LIBRARIES} CLN::CLN) endif () if (GMP_FOUND) - set(CVC4_LIBRARIES ${CVC4_LIBRARIES} ${GMP_LIBRARY}) + set(CVC4_LIBRARIES ${CVC4_LIBRARIES} GMP::GMP) endif () + + if (NOT TARGET CVC4::CVC4) + add_library(CVC4::CVC4 UNKNOWN IMPORTED) + set_property(TARGET CVC4::CVC4 PROPERTY IMPORTED_LOCATION ${CVC4_LIBRARY}) + set_property(TARGET CVC4::CVC4 PROPERTY INTERFACE_LINK_LIBRARIES ${CVC4_LIBRARIES}) + set_property(TARGET CVC4::CVC4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CVC4_INCLUDE_DIR}) + endif() endif() else() set(CVC4_FOUND FALSE) diff --git a/cmake/FindGMP.cmake b/cmake/FindGMP.cmake index 8abe354c..c3a02654 100644 --- a/cmake/FindGMP.cmake +++ b/cmake/FindGMP.cmake @@ -1,3 +1,8 @@ -find_library(GMP_LIBRARY NAMES gmp ) +find_library(GMP_LIBRARY NAMES gmp) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GMP DEFAULT_MSG GMP_LIBRARY) + +if(GMP_FOUND AND NOT TARGET GMP::GMP) + add_library(GMP::GMP UNKNOWN IMPORTED) + set_property(TARGET GMP::GMP PROPERTY IMPORTED_LOCATION ${GMP_LIBRARY}) +endif() diff --git a/cmake/FindZ3.cmake b/cmake/FindZ3.cmake index c017cac2..ad34cbc3 100644 --- a/cmake/FindZ3.cmake +++ b/cmake/FindZ3.cmake @@ -1,9 +1,14 @@ if (USE_Z3) find_path(Z3_INCLUDE_DIR NAMES z3++.h PATH_SUFFIXES z3) - find_library(Z3_LIBRARY NAMES z3 ) + find_library(Z3_LIBRARY NAMES z3) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Z3 DEFAULT_MSG Z3_LIBRARY Z3_INCLUDE_DIR) + + if (NOT TARGET Z3::Z3) + add_library(Z3::Z3 UNKNOWN IMPORTED) + set_property(TARGET Z3::Z3 PROPERTY IMPORTED_LOCATION ${Z3_LIBRARY}) + set_property(TARGET Z3::Z3 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Z3_INCLUDE_DIR}) + endif() else() set(Z3_FOUND FALSE) endif() -# TODO: Create IMPORTED library for Z3. diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake index ea3218ef..4db7b9c3 100644 --- a/cmake/jsoncpp.cmake +++ b/cmake/jsoncpp.cmake @@ -15,9 +15,9 @@ set(JSONCPP_INCLUDE_DIR "${prefix}/include") # versions used in the CI runs. if(EMSCRIPTEN) # Do not include all flags in CMAKE_CXX_FLAGS for emscripten, - # but only use -std=c++11. Using all flags causes build failures + # but only use -std=c++14. Using all flags causes build failures # at the moment. - set(JSONCPP_CXX_FLAGS -std=c++11) + set(JSONCPP_CXX_FLAGS -std=c++14) else() set(JSONCPP_CXX_FLAGS ${CMAKE_CXX_FLAGS}) endif() @@ -51,5 +51,6 @@ ExternalProject_Add(jsoncpp-project add_library(jsoncpp STATIC IMPORTED) file(MAKE_DIRECTORY ${JSONCPP_INCLUDE_DIR}) # Must exist. set_property(TARGET jsoncpp PROPERTY IMPORTED_LOCATION ${JSONCPP_LIBRARY}) +set_property(TARGET jsoncpp PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${JSONCPP_INCLUDE_DIR}) set_property(TARGET jsoncpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JSONCPP_INCLUDE_DIR}) add_dependencies(jsoncpp jsoncpp-project) |