From beba7470f49547a1d30742f43690c0289a4b9430 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Wed, 27 Mar 2019 00:46:34 -0400 Subject: [PATCH] Started cleaning out the CMakeLists.txt. meson automatically includes -fomit-frame-pointer for the address sanitizer, so no extra work needed. --- CMakeLists.txt | 136 ------------------------------------------------- meson.build | 7 +++ 2 files changed, 7 insertions(+), 136 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7193fbb..b87c8a3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,142 +1,6 @@ # 3 june 2016 -# see https://cmake.org/gitweb?p=cmake.git;a=commit;h=95cdf132489c79e88a10fdf7a7566fa002c7680b (thanks ngladitz in irc.freenode.net/#cmake) -cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) -# TODOs -# - silence entering/leaving messages? -# - uname -s for more refined OS control -# - Haiku for haiku -# - debian DESTDIR? https://github.com/andlabs/libui/pull/10 -# - libui-combined* needs to be deleted so that custom command can run every time -# - add notelemetry.obj to *ALL TARGETS* on VS2015 and up - https://www.infoq.com/news/2016/06/visual-cpp-telemetry -# - switch to 3.1.0 features - -# the docs say we need to set this up prior to project() -# the docs don't say this, but the CACHE part is important; see https://stackoverflow.com/questions/34208360/cmake-seems-to-ignore-cmake-osx-deployment-target -# TODO figure out what other variables must be set with CACHE -# TODO figure out if FORCE is needed here -# TODO figure out whether STRING "" is best or if something else is better; also what FORCE does because I forget and later I say it's needed -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "" FORCE) - -# we want to disable incremental linking -# see also: -# - https://github.com/bulletphysics/bullet3/blob/master/CMakeLists.txt#L43 -# - https://cmake.org/pipermail/cmake/2010-February/035174.html -# this must also go before project() -set(MSVC_INCREMENTAL_DEFAULT ON) - -# default to debug builds -# do this before project() just to be safe -# either DEBUG or Debug will work; we use DEBUG as that's what cmake does internally (https://cmake.org/pipermail/cmake/2013-June/055177.html) -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE DEBUG CACHE STRING "" FORCE) -endif() - -project(libui) -option(BUILD_SHARED_LIBS "Whether to build libui as a shared library or a static library" ON) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/out") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/out") -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/out") -set(CMAKE_PDB_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/out") - -if(APPLE) - set(_OSNAME darwin) - set(_HASVERSION TRUE) - set(_VERSION "A") - - # always use our rpath - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - # the / is required by some older versions of OS X - set(CMAKE_INSTALL_RPATH "@executable_path/") - set(CMAKE_MACOSX_RPATH TRUE) -elseif(WIN32) - set(_OSNAME windows) - - # and don't include the default libraries with ANY of the builds - # note the CACHE FORCE stuff is required here - set(CMAKE_C_STANDARD_LIBRARIES CACHE STRING "" FORCE) - set(CMAKE_CXX_STANDARD_LIBRARIES CACHE STRING "" FORCE) -else() - set(_OSNAME unix) - set(_HASVERSION TRUE) - set(_VERSION "0") - - # always use our rpath - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH "\$ORIGIN") -endif() - -# common flags -if(MSVC) - # TODO subsystem version - - # TODO /Wall does too much - # TODO -Wno-switch equivalent - # TODO /sdl turns C4996 into an ERROR - # don't use /analyze; that requires us to write annotations everywhere - # TODO undecided flags from qo? - # the RTC flags are only supplied in debug builds because they are only supposed to be used by debug builds (see "This is because run-time error checks are not valid in a release (optimized) build." in https://docs.microsoft.com/cpp/build/reference/rtc-run-time-error-checks) - # /RTCc is not supplied because it's discouraged as of VS2015; see https://www.reddit.com/r/cpp/comments/46mhne/rtcc_rejects_conformant_code_with_visual_c_2015/d06auq5 - # /EHsc is to shut the compiler up in some cases - # TODO make /EHsc C++-only - set(_COMMON_CFLAGS - /W4 /wd4100 - /bigobj /nologo - $<$:/RTC1 /RTCs /RTCu> - /EHsc - ) - - # note the /MANIFEST:NO (which must be / and uppercase); thanks FraGag (https://github.com/andlabs/libui/issues/93#issuecomment-223183436) - # TODO warnings on undefined symbols - set(_COMMON_LDFLAGS - /LARGEADDRESSAWARE - /NOLOGO - /INCREMENTAL:NO - /MANIFEST:NO - ) - - # TODO autogenerate a .def file? - - # more incremental linking fixes - # TODO actually get rid of incremental linking here -else() - set(_COMMON_CFLAGS - -Wall -Wextra -pedantic - -Wno-unused-parameter - -Wno-switch - -fvisibility=hidden - ) - # don't use C_VERSION or CXX_VERSION because they use GNU standards - # TODO we can actually do this; set both C_EXTENSIONS and CXX_EXTENSIONS to OFF - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11") - - set(_COMMON_LDFLAGS - -fvisibility=hidden - ) - - # don't require shipping the MinGW-w64 DLLs - if(WIN32) - list(APPEND _COMMON_LDFLAGS - -static - -static-libgcc - -static-libstdc++ - ) - endif() - - # TODO document this - if(ADDRESS_SANITIZER) - set(_COMMON_CFLAGS ${_COMMON_CFLAGS} - -fsanitize=address - -fno-omit-frame-pointer - ) - set(_COMMON_LDFLAGS ${_COMMON_LDFLAGS} - -fsanitize=address - -fno-omit-frame-pointer - ) - endif() -endif() # problem: # - target_link_libraries() only supports - for flags diff --git a/meson.build b/meson.build index 282e91bd..a2316428 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,11 @@ # TODO figure out what (meson/ninja) dist do # TODO figure out why test and examples aren't included in ninja all # TODO figure out how to make an overarching "examples" target +# TODOs from cmake; not sure if they're relevant here: +# - uname -s for more refined OS control +# - Haiku for haiku +# - debian DESTDIR? https://github.com/andlabs/libui/pull/10 +# - disable incremental linking? I forget if meson already doesn't do this or not; we did it manually in cmake # we have to specify C++ here even if we're not using C++ immediately because otherwise none of the C++ built-in options are available (sigh; TODO) project('libui', ['c', 'cpp'], @@ -93,6 +98,8 @@ if libui_MSVC '/INCREMENTAL:NO', '/MANIFEST:NO', ] + + # TODO autogenerate a .def file? else libui_project_compile_args += [ '-Wno-unused-parameter',