rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added default target fix non-vs, and fixed indent in CMakeLists.txt

This commit is contained in:
Nick Bolton 2011-01-16 20:06:12 +00:00
parent 46a4926122
commit 47e12f465b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -85,7 +85,8 @@ IF(WIN32)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VS_ARGS}") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${VS_ARGS}")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VS_ARGS}") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${VS_ARGS}")
# this line removes "/D NDEBUG" from release, we want them in order to find bugs even on release builds. # this line removes "/D NDEBUG" from release, we want them in order to
# find bugs even on release builds.
SET(CMAKE_CXX_FLAGS_RELEASE "/MD /O2 /Ob2") SET(CMAKE_CXX_FLAGS_RELEASE "/MD /O2 /Ob2")
ENDIF(WIN32) ENDIF(WIN32)

3
build/commands.py
View File

@ -161,6 +161,9 @@ class InternalCommands:
# for non-vs always specify a build type (debug, release, etc) # for non-vs always specify a build type (debug, release, etc)
if not generator.startswith('Visual Studio'): if not generator.startswith('Visual Studio'):
# default is default for non-vs
if target == '':
target = 'debug'
cmake_args = ' -DCMAKE_BUILD_TYPE=' + target.capitalize() cmake_args = ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
# if not visual studio, use parent dir # if not visual studio, use parent dir