Skip to content

Commit

Permalink
Correcting configuration for CMake and appveyor.
Browse files Browse the repository at this point in the history
  • Loading branch information
lukacu committed Jan 23, 2017
1 parent 081a72c commit 0b58aed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ELSE ()
IF (CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
ENDIF ()
SET(CPACK_SET_DESTDIR 1)
# Only build test executable on Unix systems / used only for development
ENDIF ()

Expand Down Expand Up @@ -132,10 +133,10 @@ INSTALL(FILES
DESTINATION ${CONFIG_INSTALL_DIR})

SET(CPACK_PACKAGE_NAME "TraX")
SET(CPACK_GENERATOR "ZIP")
STRING(REPLACE "." ";" VERSION_LIST ${BUILD_VERSION})
LIST(GET VERSION_LIST 0 CPACK_PACKAGE_VERSION_MAJOR)
LIST(GET VERSION_LIST 1 CPACK_PACKAGE_VERSION_MINOR)
LIST(GET VERSION_LIST 2 CPACK_PACKAGE_VERSION_PATCH)
SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
SET(CPACK_SET_DESTDIR 1)
INCLUDE(CPack)
11 changes: 1 addition & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,6 @@ after_build:
# to run your custom scripts instead of automatic MSBuild
build_script:

test:
assemblies:
- asm1.dll
- asm2.dll

categories:
- UI
- E2E

test: off

#---------------------------------#
Expand All @@ -141,7 +132,7 @@ test: off
artifacts:

# pushing a single file
- path: trax-*.zip
- path: TraX-*.zip

# pushing all *.nupkg files in build directory recursively
# - path: '**\*.nupkg'
Expand Down

0 comments on commit 0b58aed

Please sign in to comment.