Sat, 29 Mar 2014 05:38:03 +0200
Merge ../ldforge into gl
Conflicts:
CMakeLists.txt
src/actions.cc
src/glRenderer.cc
src/glRenderer.h
src/ldDocument.cc
src/ldDocument.h
src/ldObject.cc
src/ldObject.h
src/main.cc
###################################################################### # CMake file for LDForge. # The original QMake file was created on Sat Sep 22 17:29:49 2012 ###################################################################### project (ldforge) add_subdirectory (updaterevision) cmake_minimum_required (VERSION 2.6) find_package (Qt4 REQUIRED) find_package (OpenGL REQUIRED) get_target_property (UPDATEREVISION_EXE updaterevision LOCATION) add_custom_target (revision_check ALL COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} DEPENDS updaterevision) include_directories (${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) set (LDForgeSources src/actions.cc src/actionsEdit.cc src/addObjectDialog.cc src/basics.cc src/colors.cc src/colorSelector.cc src/configuration.cc src/configDialog.cc src/crashCatcher.cc src/dialogs.cc src/documentation.cc src/editHistory.cc src/extPrograms.cc src/glRenderer.cc src/glCompiler.cc src/ldConfig.cc src/ldDocument.cc src/ldObject.cc src/main.cc src/mainWindow.cc src/messageLog.cc src/miscallenous.cc src/partDownloader.cc src/primitives.cc src/radioGroup.cc src/version.cc ) set (LDForgeHeaders src/macros.h src/crashCatcher.h src/colors.h src/misc/documentPointer.h src/misc/invokeLater.h src/misc/ringFinder.h src/ldDocument.h src/addObjectDialog.h src/ldConfig.h src/partDownloader.h src/ldObject.h src/primitives.h src/miscallenous.h src/messageLog.h src/dialogs.h src/radioGroup.h src/documentation.h src/main.h src/basics.h src/colorSelector.h src/configDialog.h src/glRenderer.h src/glCompiler.h src/configuration.h src/mainWindow.h src/editHistory.h src/format.h ) set (LDForgeForms ui/about.ui ui/addhistoryline.ui ui/bombbox.ui ui/colorsel.ui ui/config.ui ui/coverer.ui ui/downloadfrom.ui ui/edger2.ui ui/editraw.ui ui/extprogpath.ui ui/flip.ui ui/intersector.ui ui/isecalc.ui ui/ldforge.ui ui/ldrawpath.ui ui/makeprim.ui ui/newpart.ui ui/openprogress.ui ui/overlay.ui ui/rectifier.ui ui/replcoords.ui ui/rotpoint.ui ui/ytruder.ui ) set (LDForgeResources ldforge.qrc) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGLU") include_directories ("${PROJECT_BINARY_DIR}") include_directories ("${PROJECT_BINARY_DIR}/src") include_directories ("${PROJECT_BINARY_DIR}/src/misc") if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG") endif() qt4_wrap_cpp (LDForgeMOC ${LDForgeHeaders}) qt4_wrap_ui (LDForgeFormsHeaders ${LDForgeForms}) qt4_add_resources (LDForgeResourcesRCC ${LDForgeResources}) add_executable (ldforge ${LDForgeSources} ${LDForgeResourcesRCC} ${LDForgeFormsHeaders} ${LDForgeMOC} ) target_link_libraries (ldforge ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ) install (TARGETS ldforge RUNTIME DESTINATION bin)