diff options
| author | Anton Novoselov <[email protected]> | 2017-08-01 12:53:38 +0300 |
|---|---|---|
| committer | Anton Novoselov <[email protected]> | 2017-08-01 12:53:38 +0300 |
| commit | 236f03c0b9a4982328ed1201978f7f69d192d9b2 (patch) | |
| tree | e486f2fa39dba203563895541e92c60ed3e25759 /tools/compiler/cmake/Windows | |
| parent | Added screens to welcome page (diff) | |
| download | blast-236f03c0b9a4982328ed1201978f7f69d192d9b2.tar.xz blast-236f03c0b9a4982328ed1201978f7f69d192d9b2.zip | |
Blast 1.1 release (windows / linux)
see docs/release_notes.txt for details
Diffstat (limited to 'tools/compiler/cmake/Windows')
| -rw-r--r-- | tools/compiler/cmake/Windows/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | tools/compiler/cmake/Windows/DataConverter.cmake | 22 |
2 files changed, 2 insertions, 31 deletions
diff --git a/tools/compiler/cmake/Windows/CMakeLists.txt b/tools/compiler/cmake/Windows/CMakeLists.txt index 541a209..00c8bbf 100644 --- a/tools/compiler/cmake/Windows/CMakeLists.txt +++ b/tools/compiler/cmake/Windows/CMakeLists.txt @@ -45,14 +45,7 @@ SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}") # Should this be here or in the common part? #ADD_SUBDIRECTORY(${BLAST_ROOT_DIR}/sdk "${CMAKE_CURRENT_BINARY_DIR}/blast_bin") - # Include all of the projects +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/LegacyConverter.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/AuthoringTool.cmake) INCLUDE(${PROJECT_CMAKE_FILES_DIR}/ApexImporter.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/DataConverter.cmake) - -# Exclude AuthoringTool because VC12 can't handle Capn Proto. -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0) - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/AuthoringTool.cmake) -else() - SET(SERIALIZATION_INCLUDED 0) -endif() diff --git a/tools/compiler/cmake/Windows/DataConverter.cmake b/tools/compiler/cmake/Windows/DataConverter.cmake deleted file mode 100644 index a0c5316..0000000 --- a/tools/compiler/cmake/Windows/DataConverter.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# -# Build DataConverter Windows -# - -SET(DATACONVERTER_PLATFORM_COMMON_FILES -) - -SET(DATACONVERTER_PLATFORM_INCLUDES -) - -SET(DATACONVERTER_COMPILE_DEFS - # Common to all configurations - ${BLASTTOOLS_SLN_COMPILE_DEFS};_CONSOLE - - $<$<CONFIG:debug>:${BLASTTOOLS_SLN_DEBUG_COMPILE_DEFS}> - $<$<CONFIG:checked>:${BLASTTOOLS_SLN_CHECKED_COMPILE_DEFS}> - $<$<CONFIG:profile>:${BLASTTOOLS_SLN_PROFILE_COMPILE_DEFS}> - $<$<CONFIG:release>:${BLASTTOOLS_SLN_RELEASE_COMPILE_DEFS}> -) - -#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES}) -#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP" ) |