ui: log tab

This commit is contained in:
Andreas Stallinger
2016-11-10 11:09:24 +01:00
parent 338335acf3
commit cf8e8c7655
23 changed files with 514 additions and 168 deletions
+13 -9
View File
@@ -7,7 +7,7 @@ if (UNIX AND APPLE)
set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_debug")
endif()
elseif(UNIX)
set(CLANG_BUILD_PATH "${EXTERNAL_BUILD}/llvm")
set(CLANG_BUILD_PATH "${EXTERNAL_BUILD}/llvm")
else()
set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build")
endif()
@@ -21,16 +21,20 @@ execute_process(
string(REPLACE "-fno-exceptions" "" CLANG_DEFINITIONS "${CLANG_DEFINITIONS}")
string(REPLACE "-fno-rtti" "" CLANG_DEFINITIONS "${CLANG_DEFINITIONS}")
if(CMAKE_COMPILER_IS_GNUCXX)
string(REPLACE "-Wcovered-switch-default" "" CLANG_DEFINITIONS "${CLANG_DEFINITIONS}")
endif()
if(UNIX AND NOT APPLE)
set(CLANG_INCLUDE_DIRS
"${EXTERNAL_SRC}/clang/include"
"${CLANG_BUILD_PATH}/tools/clang/include"
)
set(CLANG_INCLUDE_DIRS
"${EXTERNAL_SRC}/clang/include"
"${CLANG_BUILD_PATH}/tools/clang/include"
)
else()
set(CLANG_INCLUDE_DIRS
"$ENV{CLANG_DIR}/llvm/tools/clang/include"
"${CLANG_BUILD_PATH}/tools/clang/include"
)
set(CLANG_INCLUDE_DIRS
"$ENV{CLANG_DIR}/llvm/tools/clang/include"
"${CLANG_BUILD_PATH}/tools/clang/include"
)
endif()
set(CLANG_LIBRARY_DIRS "${CLANG_BUILD_PATH}/lib")
+2 -2
View File
@@ -15,7 +15,7 @@ endfunction()
set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
execute_process(
COMMAND ${upxPath}/Coati -z /home/vagrant/dev/license.txt
COMMAND ${upxPath}/Coati -z $ENV{HOME}/dev/license.txt
)
execute_process(
@@ -29,7 +29,7 @@ endfunction()
#execute_process(
#COMMAND ${upxPath}/Coati -f -d ${upxPath}/../data/projects/javaparser/javaparser.coatiproject
#)
#SET (NO_UPX 1)
SET (NO_UPX 1)
if (NO_UPX)
execute_process(