Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
518492e3
Commit
518492e3
authored
Mar 06, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplification CMakeLists
parent
b1665fe5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
66 deletions
+32
-66
Apps/Examples/CMakeLists.txt
Apps/Examples/CMakeLists.txt
+2
-5
Apps/SandBox/CMakeLists.txt
Apps/SandBox/CMakeLists.txt
+1
-3
Apps/Tuto/CMakeLists.txt
Apps/Tuto/CMakeLists.txt
+1
-7
CMakeLists.txt
CMakeLists.txt
+6
-42
apps_cmake.txt
apps_cmake.txt
+11
-8
cmake_modules/Qt_4x.cmake
cmake_modules/Qt_4x.cmake
+5
-0
cmake_modules/Qt_5x.cmake
cmake_modules/Qt_5x.cmake
+6
-1
No files found.
Apps/Examples/CMakeLists.txt
View file @
518492e3
...
...
@@ -12,11 +12,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
qt_wrap_cpp
(
frame_manip_moc frame_manip.h
)
add_executable
(
frame_manip frame_manip.cpp
${
frame_manip_moc
}
)
target_link_libraries
(
frame_manip
${
CGoGN_LIBS
}
${
CGoGN_EXT_LIBS
}
)
qt_use_modules
(
frame_manip Gui OpenGL Xml Svg
)
#IF(${CGoGN_DESIRED_QT_VERSION} STREQUAL "5")
# qt_use_modules(frame_manip Widgets)
#ENDIF()
#need to define that we use Qt (only once per cmake directory!)
qt_use_cgogn_modules
(
frame_manip
)
qt_wrap_cpp
(
texturesExample_moc texturesExample.h
)
add_executable
(
texturesExample texturesExample.cpp
${
texturesExample_moc
}
)
...
...
Apps/SandBox/CMakeLists.txt
View file @
518492e3
...
...
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.8)
project
(
SandBox
)
add_executable
(
multi_att multi_att.cpp
)
target_link_libraries
(
multi_att
${
CGoGN_LIBS
}
${
CGoGN_EXT_LIBS
}
)
...
...
@@ -17,7 +15,7 @@ IF (CGoGN_WITH_QT)
qt_wrap_cpp
(
tilings_moc tilings.h
)
add_executable
(
tilings tilings.cpp
${
tilings_moc
}
)
target_link_libraries
(
tilings
${
CGoGN_LIBS
}
${
CGoGN_EXT_LIBS
}
)
qt_use_
modules
(
tilings Gui OpenGL Xml Svg
)
qt_use_
cgogn_modules
(
tilings
)
qt_wrap_ui
(
test_traversor2_ui test_traversor2.ui
)
qt_wrap_cpp
(
test_traversor2_moc test_traversor2.h
)
...
...
Apps/Tuto/CMakeLists.txt
View file @
518492e3
...
...
@@ -2,12 +2,6 @@ cmake_minimum_required(VERSION 2.8)
project
(
Tutos
)
if
(
APPLE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated -Wno-overloaded-virtual"
)
endif
()
#define exec to compile
IF
(
CGoGN_WITH_QT
)
...
...
@@ -17,7 +11,7 @@ IF (CGoGN_WITH_QT)
add_executable
(
tuto1 tuto1.cpp
${
tuto1_moc
}
)
target_link_libraries
(
tuto1
${
CGoGN_LIBS
}
${
CGoGN_EXT_LIBS
}
)
qt_use_
modules
(
tuto1 Gui OpenGL Xml Svg
)
qt_use_
cgogn_modules
(
tuto1
)
qt_wrap_ui
(
tuto2_ui tuto2.ui
)
qt_wrap_cpp
(
tuto2_moc tuto2.h
)
...
...
CMakeLists.txt
View file @
518492e3
...
...
@@ -18,7 +18,7 @@ INCLUDE(${CGoGN_ROOT_DIR}/cmake_modules/functions.cmake)
SET
(
CGoGN_WITH_ASSIMP OFF CACHE BOOL
"build CGoGN with Assimp"
)
SET
(
CGoGN_WITH_ZINRI OFF CACHE BOOL
"build CGoGN with Zinri lib"
)
SET
(
CGoGN_WITH_QT ON CACHE BOOL
"build CGoGN with Qt lib"
)
SET
(
CGoGN_DESIRED_QT_VERSION
"4"
CACHE STRING
"4: QT4/
5 not yet implemented
"
)
SET
(
CGoGN_DESIRED_QT_VERSION
"4"
CACHE STRING
"4: QT4/
5
"
)
SET
(
CGoGN_WITH_GLEWMX OFF CACHE BOOL
"use multi-contex GLEW (for VRJuggler)"
)
SET
(
CGoGN_USE_OGL_CORE_PROFILE OFF CACHE BOOL
"use OpenGL 3.3 core profile (do not work on mac)"
)
...
...
@@ -32,7 +32,7 @@ SET ( CGoGN_ONELIB OFF CACHE BOOL "build CGoGN in one lib" )
IF
(
WIN32
)
SET
(
CMAKE_CONFIGURATION_TYPES Release Debug
)
SET
(
CMAKE_CONFIGURATION_TYPES
"
${
CMAKE_CONFIGURATION_TYPES
}
"
CACHE STRING
"Only Release or Debug"
FORCE
)
SET
(
CGoGN_WITH_QTCREATOR OFF CACHE BOOL
"use QtCreator to compile"
)
SET
(
CGoGN_WITH_QTCREATOR OFF CACHE BOOL
"use QtCreator to compile
(Experimental
"
)
ENDIF
()
SET
(
BUILD_SHARED_LIBS ON CACHE BOOL
"if used all library are build as shared type (.so/.dylib/.dll)"
)
...
...
@@ -71,20 +71,12 @@ IF (CGoGN_WITH_QT)
ELSE
()
FIND_PACKAGE
(
DevIL REQUIRED
)
ENDIF
()
IF
(
NOT WIN32
)
FIND_PACKAGE
(
SuiteSparse REQUIRED
)
ELSE
()
IF
(
WIN32
)
set
(
SUITESPARSE_SUITESPARSECONFIG_INCLUDE_DIR
${
CGoGN_ROOT_DIR
}
/windows_dependencies/include
)
set
(
SUITESPARSE_USE_LAPACK_BLAS ON
)
find_package
(
SuiteSparse QUIET NO_MODULE
)
if
(
NOT SUITESPARSE_FOUND
)
set
(
SUITESPARSE_VERBOSE ON
)
find_package
(
SuiteSparse REQUIRED
)
# 2nd: Use FindSuiteSparse.cmake module
endif
()
ENDIF
()
MESSAGE
(
STATUS
${
SUITESPARSE_LIBRARIES
}
)
MESSAGE
(
STATUS
${
SUITESPARSE_INCLUDE_DIRS
}
)
FIND_PACKAGE
(
SuiteSparse REQUIRED
)
#
# ThirdParty
...
...
@@ -247,7 +239,6 @@ include_directories(
${
CGoGN_SRC_DIR
}
/include
${
CGoGN_EXT_INCLUDES
}
)
#
# save some infos for schnapps and apps
#
...
...
@@ -292,34 +283,7 @@ add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps)
#
# Add custom clean targets for cleaning without cleaning dependencies
#
if
(
WIN32
)
# add_custom_target(clean_cgogn
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
# add_custom_command(TARGET clean_cgogn PRE_BUILD
# COMMAND del /q CCoGN
# COMMAND cmake ..
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
# COMMENT "cleaning CGoGN libs")
#
# add_custom_target(clean_apps
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
# add_custom_command(TARGET clean_apps PRE_BUILD
# COMMAND del /q Apps
# COMMAND cmake ..
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
# COMMENT "cleaning Apps")
#
# add_custom_target(clean_cgogn_apps
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
# add_custom_command(TARGET clean_cgogn_apps PRE_BUILD
# COMMAND del /q CGoGN
# COMMAND del /q Apps
# COMMAND cmake ..
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
# COMMENT "cleaning Apps")
ELSE
()
if
(
NOT WIN32
)
add_custom_target
(
clean_cgogn
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET clean_cgogn PRE_BUILD
...
...
apps_cmake.txt
View file @
518492e3
...
...
@@ -9,18 +9,14 @@
# cmake_minimum_required(VERSION 2.8)
# project(Pipo)
#
# set(QT_USE_QTCORE TRUE) # for Qt
# set(QT_USE_QTOPENGL TRUE) # for Qt & OpenGL (!!)
# set(QT_USE_QTXML TRUE) # for QGLViewer
# find_package(Qt REQUIRED)
# include(${QT_USE_FILE})
# LoadQtPackage()
#
# set(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/../../CGoGN CACHE STRING "CGoGN root dir")
# include(${CGoGN_ROOT_DIR}/apps_cmake.txt)
#
# include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
#
QT4_WRAP_UI
( pipo_ui pipo.ui )
#
QT4_WRAP_CPP
( pipo_moc pipo.h )
#
qt_wrap_ui
( pipo_ui pipo.ui )
#
qt_wrap_cpp
( pipo_moc pipo.h )
# add_executable( pipo pipo.cpp ${pipo_ui} ${pipo_moc} )
# target_link_libraries( pipo ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
#
...
...
@@ -80,7 +76,14 @@ ELSE()
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE} )
ENDIF()
# Qt version from CGoGN
file(READ ${CGoGN_SRC_DIR}/include/cgogn_qt.h CGoGN_DESIRED_QT_VERSION)
ADD_DEFINITIONS("-DCGOGN_QT_DESIRED_VERSION=${CGoGN_DESIRED_QT_VERSION}")
IF(CGoGN_DESIRED_QT_VERSION STREQUAL 5)
include(${CGoGN_ROOT_DIR}/cmake_modules/Qt_5x.cmake)
ELSE()
include(${CGoGN_ROOT_DIR}/cmake_modules/Qt_4x.cmake)
ENDIF()
# CGoGN compiled in one or several libs
file(STRINGS ${CGoGN_SRC_DIR}/include/cgogn_onelib.h ONELIB_STR)
...
...
cmake_modules/Qt_4x.cmake
View file @
518492e3
...
...
@@ -45,6 +45,11 @@ macro(qt_use_modules _target _link_type)
endif
()
endmacro
()
# macro that include module need by cgogn
macro
(
qt_use_cgogn_modules _target
)
qt_use_modules
(
${
_target
}
Gui OpenGL Xml Svg
)
endmacro
()
# aliases to make it work across Qt4/Qt5
macro
(
qt_add_resources
)
qt4_add_resources
(
${
ARGN
}
)
...
...
cmake_modules/Qt_5x.cmake
View file @
518492e3
...
...
@@ -4,11 +4,16 @@ find_package(Qt5Core REQUIRED)
#Qt5Widgets required for qt5_wrap_ui
find_package
(
Qt5Widgets REQUIRED
)
# aliases
# aliases
(module Widgets included by default)
macro
(
qt_use_modules
)
qt5_use_modules
(
${
ARGN
}
Widgets
)
endmacro
()
# macro that include module need by cgogn
macro
(
qt_use_cgogn_modules
)
qt5_use_modules
(
${
ARGN
}
Gui OpenGL Xml Svg Widgets
)
endmacro
()
macro
(
qt_wrap_cpp
)
qt5_wrap_cpp
(
${
ARGN
}
)
endmacro
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment