From f64500c355a0d80280bb23a4d45ace00122d8578 Mon Sep 17 00:00:00 2001 From: Zeex Date: Sun, 2 Sep 2018 09:45:57 +0600 Subject: [PATCH] Remove top-level CMakeListst.txt It was a bad idea... --- .travis.yml | 7 ++++--- CMakeLists.txt | 11 ----------- appveyor.yml | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 CMakeLists.txt diff --git a/.travis.yml b/.travis.yml index 7e81701..5851319 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,10 @@ addons: before_script: - mkdir build && cd build - - cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DCMAKE_C_FLAGS="-m32 -Werror -Wno-address-of-packed-member" - -DCPACK_GENERATOR="TGZ;ZIP" + - cmake ../source/compiler + -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DCMAKE_C_FLAGS="-m32 -Werror -Wno-address-of-packed-member" + -DCPACK_GENERATOR="TGZ;ZIP" script: - make diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 1a2c664..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(pawn C) -cmake_minimum_required(VERSION 2.8) - -set(OUTPUT_DIR ${CMAKE_BINARY_DIR}/products) -add_subdirectory(source/compiler ${OUTPUT_DIR}) - -# For the compiler we only utilize headers from source/amx, i.e. we don't -# actually build any of the AMX modules. -if(BUILD_AMX) - add_subdirectory(source/amx ${OUTPUT_DIR}) -endif() diff --git a/appveyor.yml b/appveyor.yml index 85529fa..70a6428 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ configuration: before_build: - mkdir build && cd build - - cmake .. -G "Visual Studio 14 2015" -DCPACK_GENERATOR=ZIP -DCMAKE_GENERATOR_TOOLSET=v100 + - cmake ../source/compiler -G "Visual Studio 14 2015" -DCPACK_GENERATOR=ZIP -DCMAKE_GENERATOR_TOOLSET=v100 build_script: - cmake --build . --config %CONFIGURATION%