Merge from master

This commit is contained in:
KimLS
2014-07-14 15:50:40 -07:00
25 changed files with 705 additions and 323 deletions
+1 -1
View File
@@ -39,4 +39,4 @@ IF(UNIX)
ADD_DEFINITIONS(-fPIC)
ENDIF(UNIX)
SET(EXECUTABLE_OUTPUT_PATH ../bin)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)