diff --git a/CMakeLists.txt b/CMakeLists.txt index 5314f1ee3..b36e05ea4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,7 +462,7 @@ endif() include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include) -if(MSVC OR MINGW) +if(MINGW) set(DEFAULT_STATIC true) else() set(DEFAULT_STATIC false) @@ -485,23 +485,15 @@ endif() set(PIC_FLAG "-fPIC") if(STATIC) - if(MSVC) - set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) - else() - set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) - endif() + set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZMQ_STATIC") endif() option(SANITIZE "Use ASAN memory sanitizer" OFF) if(SANITIZE) - if (MSVC) - message(FATAL_ERROR "Cannot sanitize with MSVC") - else() - message(STATUS "Using ASAN") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") - endif() + message(STATUS "Using ASAN") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") endif() # Set default blockchain storage location: @@ -606,7 +598,7 @@ function(set_default_arch) set(ARCH ${ARCH} CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all") endfunction() -if (NOT (MSVC OR ARCH)) +if (NOT ARCH) set_default_arch() endif() @@ -688,16 +680,6 @@ endif() # Trezor support check include(CheckTrezor) -if(MSVC) - add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /D__SSE4_1__") - # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Dinline=__inline") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:10485760") - if(STATIC) - foreach(VAR CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE) - string(REPLACE "/MD" "/MT" ${VAR} "${${VAR}}") - endforeach() - endif() -else() include(TestCXXAcceptsFlag) message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}") if(ARCH STREQUAL "default") @@ -1041,7 +1023,6 @@ else() endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STATIC_FLAGS} ") endif() -endif() if (${BOOST_IGNORE_SYSTEM_PATHS} STREQUAL "ON") set(Boost_NO_SYSTEM_PATHS TRUE) @@ -1109,7 +1090,7 @@ elseif(DRAGONFLY) set(EXTRA_LIBRARIES execinfo ${COMPAT}) elseif(CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)") set(EXTRA_LIBRARIES socket nsl resolv) -elseif(NOT MSVC AND NOT DEPENDS) +elseif(NOT DEPENDS) find_library(RT rt) find_library(Z z) set(EXTRA_LIBRARIES ${RT} ${Z}) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index f414fb85b..dd65593cc 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -43,11 +43,7 @@ set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" FORCE) add_subdirectory(miniupnp/miniupnpc) set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) -if(MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") -endif() +set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") endif() diff --git a/src/daemonizer/CMakeLists.txt b/src/daemonizer/CMakeLists.txt index 9027d5f11..fbc03b68c 100644 --- a/src/daemonizer/CMakeLists.txt +++ b/src/daemonizer/CMakeLists.txt @@ -26,7 +26,7 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -if(MSVC OR MINGW) +if(MINGW) set(daemonizer_sources windows_service.cpp windows_daemonizer.inl @@ -41,7 +41,7 @@ endif() set(daemonizer_headers ) -if(MSVC OR MINGW) +if(MINGW) set(daemonizer_private_headers daemonizer.h windows_service.h diff --git a/tests/libwallet_api_tests/CMakeLists.txt b/tests/libwallet_api_tests/CMakeLists.txt index a8be47d57..2b69cc85e 100644 --- a/tests/libwallet_api_tests/CMakeLists.txt +++ b/tests/libwallet_api_tests/CMakeLists.txt @@ -60,12 +60,10 @@ set_property(TARGET libwallet_api_tests PROPERTY FOLDER "tests") -if (NOT MSVC) - set_property(TARGET libwallet_api_tests - APPEND_STRING - PROPERTY - COMPILE_FLAGS " -Wno-undef -Wno-sign-compare") -endif () +set_property(TARGET libwallet_api_tests + APPEND_STRING + PROPERTY + COMPILE_FLAGS " -Wno-undef -Wno-sign-compare") add_test( NAME libwallet_api_tests diff --git a/tests/net_load_tests/CMakeLists.txt b/tests/net_load_tests/CMakeLists.txt index 1a6108db3..5f7a2bd7f 100644 --- a/tests/net_load_tests/CMakeLists.txt +++ b/tests/net_load_tests/CMakeLists.txt @@ -72,8 +72,7 @@ target_link_libraries(net_load_tests_srv set_property(TARGET net_load_tests_clt net_load_tests_srv PROPERTY FOLDER "tests") -if(NOT MSVC) - set_property(TARGET net_load_tests_clt net_load_tests_srv APPEND_STRING - PROPERTY - COMPILE_FLAGS " -Wno-undef -Wno-sign-compare") -endif() + +set_property(TARGET net_load_tests_clt net_load_tests_srv APPEND_STRING + PROPERTY + COMPILE_FLAGS " -Wno-undef -Wno-sign-compare") diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index e329b7506..0fe303d1f 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -136,12 +136,10 @@ set_property(TARGET unit_tests PROPERTY FOLDER "tests") -if (NOT MSVC) - set_property(TARGET unit_tests - APPEND_STRING - PROPERTY - COMPILE_FLAGS " -Wno-undef -Wno-sign-compare") -endif () +set_property(TARGET unit_tests + APPEND_STRING + PROPERTY + COMPILE_FLAGS " -Wno-undef -Wno-sign-compare") SET_PROPERTY(SOURCE memwipe.cpp PROPERTY COMPILE_FLAGS -Ofast)