Commit ac663377 authored by Mathieu Faverge's avatar Mathieu Faverge

Update CMakeList.txt but I still have a compilation problem, if someone can have a look

parent e5002f48
......@@ -50,7 +50,6 @@ SET(VITE_HDRS
common/Session.hpp
common/trace.h
common/Memory.hpp
general/qtcolorpicker/src/qtcolorpicker.h
# Data structure headers
trace/values/Color.hpp
trace/values/Date.hpp
......@@ -144,7 +143,6 @@ SET(VITE_SRCS
common/Info.cpp
common/Session.cpp
common/Memory.cpp
general/qtcolorpicker/src/qtcolorpicker.cpp
# Data structure code files
trace/values/Color.cpp
trace/values/Date.cpp
......@@ -211,6 +209,26 @@ SET(VITE_RCCS
interface/vite.qrc
)
#############################################
# QtColorPicker
#############################################
SET(QTCOLORPICKERDIR
${PROJECT_SOURCE_DIR}/externals/qtcolorpicker/src
)
SET(VITE_HDRS
${VITE_HDRS}
${QTCOLORPICKERDIR}/qtcolorpicker.hpp
)
SET(VITE_SRCS
${VITE_SRCS}
${QTCOLORPICKERDIR}/qtcolorpicker.cpp
)
#############################################
# VBO
#############################################
IF(VITE_ENABLE_VBO)
ADD_DEFINITIONS(-DWITH_VBO)
......@@ -227,8 +245,9 @@ IF(VITE_ENABLE_VBO)
)
ENDIF(VITE_ENABLE_VBO)
#############################################
# OTF Parser
#############################################
IF(VITE_ENABLE_OTF)
ADD_DEFINITIONS(-DWITH_OTF)
......@@ -250,6 +269,9 @@ IF(VITE_ENABLE_OTF)
ENDIF(VITE_ENABLE_OTF)
#############################################
# TAU Parser
#############################################
IF(VITE_ENABLE_TAU)
ADD_DEFINITIONS(-DWITH_TAU)
......@@ -271,6 +293,9 @@ ENDIF(VITE_ENABLE_TAU)
#ADD_DEFINITIONS(-DMEMORY_USAGE)
#ADD_DEFINITIONS(-DMEMORY_TRACE)
#############################################
# QT4
#############################################
QT4_AUTOMOC(${VITE_SRCS})
FOREACH(_hdrs_file ${VITE_HDRS})
GET_FILENAME_COMPONENT(_abs_file ${_hdrs_file} ABSOLUTE)
......@@ -287,9 +312,12 @@ QT4_ADD_RESOURCES(VITE_RCC_SRCS ${VITE_RCCS})
ADD_DEFINITIONS(-DQT_NO_DEBUG)
#############################################
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${QTCOLORPICKERDIR}
)
ADD_EXECUTABLE(vite ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment