aboutsummaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorBryan Galdrikian <[email protected]>2018-05-31 11:36:08 -0700
committerBryan Galdrikian <[email protected]>2018-05-31 11:36:08 -0700
commit7115f60b91b5717d90f643fd692010905c7004db (patch)
treeeffd68c6978751c517d54c2f2bb5bb6e7dc93e18 /compiler
parentUpdating BlastTool zip (diff)
downloadblast-1.1.3_rc1.tar.xz
blast-1.1.3_rc1.zip
Blast 1.1.3. See docs/release_notes.txt.v1.1.3_rc1
Diffstat (limited to 'compiler')
-rwxr-xr-x[-rw-r--r--]compiler/cmake/linux/CMakeLists.txt36
-rwxr-xr-x[-rw-r--r--]compiler/cmake/windows/CMakeLists.txt98
2 files changed, 67 insertions, 67 deletions
diff --git a/compiler/cmake/linux/CMakeLists.txt b/compiler/cmake/linux/CMakeLists.txt
index fcf0cde..4cbbfde 100644..100755
--- a/compiler/cmake/linux/CMakeLists.txt
+++ b/compiler/cmake/linux/CMakeLists.txt
@@ -1,18 +1,18 @@
-#Platform specific compile flags and project includes
-
-SET(CMAKE_CXX_FLAGS "-Werror")
-
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_CXX_FLAGS_CHECKED "-O2 -g")
-SET(CMAKE_CXX_FLAGS_PROFILE "-O2 -g")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
-
-SET(BLASTALL_SLN_COMPILE_DEFS "")
-
-SET(BLASTALL_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;)
-SET(BLASTALL_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;)
-SET(BLASTALL_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;)
-SET(BLASTALL_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
-
-
-
+#Platform specific compile flags and project includes
+
+SET(CMAKE_CXX_FLAGS "-Werror")
+
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
+SET(CMAKE_CXX_FLAGS_CHECKED "-O2 -g")
+SET(CMAKE_CXX_FLAGS_PROFILE "-O2 -g")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+
+SET(BLASTALL_SLN_COMPILE_DEFS "")
+
+SET(BLASTALL_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;)
+SET(BLASTALL_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;)
+SET(BLASTALL_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;)
+SET(BLASTALL_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
+
+
+
diff --git a/compiler/cmake/windows/CMakeLists.txt b/compiler/cmake/windows/CMakeLists.txt
index fb95ab6..7820e04 100644..100755
--- a/compiler/cmake/windows/CMakeLists.txt
+++ b/compiler/cmake/windows/CMakeLists.txt
@@ -1,49 +1,49 @@
-#Platform specific compile flags and project includes
-
-#NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more.
-SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /EHsc /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W3 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi")
-
-# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies
-# we pull in or we're potentially having mismatch issues.
-IF(STATIC_WINCRT)
- SET(WINCRT_NDEBUG "/MT")
- SET(WINCRT_DEBUG "/MTd")
-ELSE()
- SET(WINCRT_NDEBUG "/MD")
- SET(WINCRT_DEBUG "/MDd")
-ENDIF()
-
-SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}")
-SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}")
-SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}")
-SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}")
-
-# Build PDBs for all configurations
-SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
-
-IF(CMAKE_CL_64)
- ADD_DEFINITIONS(-DWIN64)
-ENDIF(CMAKE_CL_64)
-
-
-SET(BLASTALL_SLN_COMPILE_DEFS WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;)
-
-SET(BLASTALL_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;)
-SET(BLASTALL_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;)
-SET(BLASTALL_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;)
-SET(BLASTALL_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
-
-IF(CMAKE_CL_64)
- SET(LIBPATH_SUFFIX "x64")
-ELSE(CMAKE_CL_64)
- SET(LIBPATH_SUFFIX "x86")
-ENDIF(CMAKE_CL_64)
-
-SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}")
-
-
-ADD_SUBDIRECTORY(${BLAST_ROOT_DIR}/samples "${CMAKE_CURRENT_BINARY_DIR}/samples_bin")
-ADD_SUBDIRECTORY(${BLAST_ROOT_DIR}/tools "${CMAKE_CURRENT_BINARY_DIR}/tools_bin")
+#Platform specific compile flags and project includes
+
+#NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more.
+SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /EHsc /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W3 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi")
+
+# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies
+# we pull in or we're potentially having mismatch issues.
+IF(STATIC_WINCRT)
+ SET(WINCRT_NDEBUG "/MT")
+ SET(WINCRT_DEBUG "/MTd")
+ELSE()
+ SET(WINCRT_NDEBUG "/MD")
+ SET(WINCRT_DEBUG "/MDd")
+ENDIF()
+
+SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}")
+SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}")
+SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}")
+SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}")
+
+# Build PDBs for all configurations
+SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
+
+IF(CMAKE_CL_64)
+ ADD_DEFINITIONS(-DWIN64)
+ENDIF(CMAKE_CL_64)
+
+
+SET(BLASTALL_SLN_COMPILE_DEFS WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;)
+
+SET(BLASTALL_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;)
+SET(BLASTALL_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;)
+SET(BLASTALL_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;)
+SET(BLASTALL_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
+
+IF(CMAKE_CL_64)
+ SET(LIBPATH_SUFFIX "x64")
+ELSE(CMAKE_CL_64)
+ SET(LIBPATH_SUFFIX "x86")
+ENDIF(CMAKE_CL_64)
+
+SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}")
+
+
+ADD_SUBDIRECTORY(${BLAST_ROOT_DIR}/samples "${CMAKE_CURRENT_BINARY_DIR}/samples_bin")
+ADD_SUBDIRECTORY(${BLAST_ROOT_DIR}/tools "${CMAKE_CURRENT_BINARY_DIR}/tools_bin")