From 82958de2d7bc41bff27fda12d54640e792761bbc Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 22 Jul 2019 00:39:56 +0100 Subject: [PATCH] Tidy up cmake files --- CMakeLists.txt | 13 ++----------- cmake/unix.cmake | 4 ++++ cmake/win32.cmake | 4 ++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb28005eb..e686e6556 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,8 @@ else() endif(MSVC_VERSION) include(cmake/solaris.cmake) +include(cmake/unix.cmake) +include(cmake/win32.cmake) if(WIN32) set(CMAKE_CXX_STANDARD 17) @@ -224,23 +226,12 @@ if(JEMALLOC) set(MALLOC_LIB jemalloc) endif(JEMALLOC) - - if(ANDROID) list(APPEND LIBS log) add_definitions(-DANDROID) set(ANDROID_PLATFORM_SRC android/ifaddrs.c) endif(ANDROID) -if(UNIX) - include(cmake/unix.cmake) -elseif(WIN32) - include(cmake/win32.cmake) -else() - message(FATAL_ERROR "What operating system _are_ you building on/for?") -endif() - - set(LIBTUNTAP_SRC_BASE ${TT_ROOT}/tuntap.cpp ${TT_ROOT}/tuntap_log.cpp diff --git a/cmake/unix.cmake b/cmake/unix.cmake index 03d6e94d9..5dceb78e8 100644 --- a/cmake/unix.cmake +++ b/cmake/unix.cmake @@ -1,3 +1,7 @@ +if(NOT UNIX) + return() +endif() + add_definitions(-DUNIX) add_definitions(-DPOSIX) diff --git a/cmake/win32.cmake b/cmake/win32.cmake index dbb3e8c5e..760209fa6 100644 --- a/cmake/win32.cmake +++ b/cmake/win32.cmake @@ -1,3 +1,7 @@ +if(NOT WIN32) + return() +endif() + enable_language(RC) set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lshlwapi")