Remove CTest and add a top-level CMakeLists.txt
This commit is contained in:
parent
29a6df8163
commit
0a574d5f25
@ -14,9 +14,9 @@ addons:
|
||||
- cmake
|
||||
|
||||
before_script:
|
||||
- cmake source/compiler -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
-DCMAKE_C_FLAGS="-m32 -Werror -Wno-address-of-packed-member"
|
||||
-DCPACK_GENERATOR="TGZ;ZIP"
|
||||
- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
-DCMAKE_C_FLAGS="-m32 -Werror -Wno-address-of-packed-member"
|
||||
-DCPACK_GENERATOR="TGZ;ZIP"
|
||||
|
||||
script:
|
||||
- make
|
||||
|
8
CMakeLists.txt
Normal file
8
CMakeLists.txt
Normal file
@ -0,0 +1,8 @@
|
||||
project(pawn C)
|
||||
cmake_minimum_required(VERSION 2.8)
|
||||
|
||||
# For the compiler we only utilize headers from source/amx, i.e. we don't
|
||||
# actually build any of the AMX modules.
|
||||
# add_subdirectory(source/amx)
|
||||
|
||||
add_subdirectory(source/compiler)
|
@ -5,7 +5,7 @@ configuration:
|
||||
- RelWithDebInfo
|
||||
|
||||
before_build:
|
||||
- cmake -G "Visual Studio 14 2015" source/compiler -DCPACK_GENERATOR=ZIP -DCMAKE_GENERATOR_TOOLSET=v100
|
||||
- cmake . -G "Visual Studio 14 2015" -DCPACK_GENERATOR=ZIP -DCMAKE_GENERATOR_TOOLSET=v100
|
||||
|
||||
build_script:
|
||||
- cmake --build . --config %CONFIGURATION%
|
||||
@ -14,9 +14,6 @@ build_script:
|
||||
test_script:
|
||||
- cmake --build . --config %CONFIGURATION% --target pawncc_tests
|
||||
|
||||
on_failure:
|
||||
- type Testing\Temporary\LastTest.log<Paste>
|
||||
|
||||
artifacts:
|
||||
- path: pawnc-*-windows.zip
|
||||
name: Binary package
|
||||
|
@ -68,6 +68,7 @@ if(WIN32)
|
||||
set_target_properties(amxDGram PROPERTIES LINK_FLAGS
|
||||
"/export:amx_DGramInit /export:amx_DGramCleanup")
|
||||
endif()
|
||||
target_link_libraries(amxDGram ws2_32)
|
||||
endif()
|
||||
|
||||
# amxFile
|
||||
|
@ -160,12 +160,8 @@ if(MSVC)
|
||||
DESTINATION bin)
|
||||
endif()
|
||||
|
||||
# Generate tests (only if enabled, i.e. BUILD_TESTING=ON)
|
||||
include(CTest)
|
||||
if(BUILD_TESTING)
|
||||
enable_testing()
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
# Generate targets for running compiler tests
|
||||
add_subdirectory(tests)
|
||||
|
||||
# Generate a binary package with CPack
|
||||
set(CPACK_PACKAGE_NAME pawnc)
|
||||
|
Loading…
x
Reference in New Issue
Block a user