Author: mp3butcher
Date: Thu Jan 22 00:39:11 2015
New Revision: 571
URL: http://svn.gna.org/viewcvs/cal3d?rev=571&view=rev
Log:
add CallyDemo in CMake Configuration
Fix NSIS CPack Configuration in order to make CallyDemo a shortcut
Added:
trunk/cal3d/examples/cally/src/CMakeLists.txt
Modified:
trunk/cal3d/CMakeLists.txt
trunk/cal3d/examples/CMakeLists.txt
Modified: trunk/cal3d/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/CMakeLists.txt?rev=571&r1=570&r2=571&view=diff
==============================================================================
--- trunk/cal3d/CMakeLists.txt (original)
+++ trunk/cal3d/CMakeLists.txt Thu Jan 22 00:39:11 2015
@@ -194,19 +194,19 @@
IF(WIN32 AND NOT UNIX)
- # installer icon SET(CPACK_NSIS_MUI_UNIICON
"D:\\\\SRC\\\\GL3VolumeOctree\\\\ShortCutIcon.ico")
- #uninstaller icon SET(CPACK_NSIS_MUI_ICON
"D:\\\\SRC\\\\GL3VolumeOctree\\\\ShortCutIcon.ico")
+ # installer icon SET(CPACK_NSIS_MUI_UNIICON
"D:\\\\SRC\\\\GL3VolumeOctree\\\\plugins\\\\src\\\\res\\\\type_bone.ico")
+ #uninstaller icon SET(CPACK_NSIS_MUI_ICON
"D:\\\\SRC\\\\GL3VolumeOctree\\\\plugins\\\\src\\\\res\\\\type_bone.ico")
# NSIPRINT MessageBox MB_OK 'addnigshortcut'
- SET(CPACK_PACKAGE_ICON "${CMAKE_HOME_DIRECTORY}\\\\InstallIcon.bmp")
+ SET(CPACK_PACKAGE_ICON
"${CMAKE_HOME_DIRECTORY}\\\\plugins\\\\src\\\\res\\\\cal3d.bmp")
#custom rules patch bugs in cpack/nsis (custom start icon+ add/remove
desktop icon)
STRING(REGEX REPLACE "/" "\\\\\\\\" HOME_PROJ ${CMAKE_HOME_DIRECTORY})
- SET(CPACK_NSIS_INSTALLED_ICON_NAME "${HOME_PROJ}\\\\ShortCutIcon.ico")
-
-set(CPACK_NSIS_CREATE_ICONS "CreateShortCut
'\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${PROJECT_NAME}.lnk'
'\$INSTDIR\\\\bin\\\\${PROJECT_NAME}.exe' parameters
'${HOME_PROJ}\\\\ShortCutIcon.ico'
+ SET(CPACK_NSIS_INSTALLED_ICON_NAME
"${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico")
+
+set(CPACK_NSIS_CREATE_ICONS "CreateShortCut
'\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CallyDemo.lnk'
'\$INSTDIR\\\\CallyDemo.exe' ''
'${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico'
StrCmp '\$INSTALL_DESKTOP' '0' Conditionaldesktopicon
- CreateShortCut '\$desktop\\\\${PROJECT_NAME}.lnk'
'\$INSTDIR\\\\bin\\\\${PROJECT_NAME}.exe' parameters
'${HOME_PROJ}\\\\ShortCutIcon.ico'
+ CreateShortCut '\$desktop\\\\CallyDemo.lnk' '\$INSTDIR\\\\CallyDemo.exe'
'' '${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico'
Conditionaldesktopicon:
")
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete
'\$SMPROGRAMS\\\\$START_MENU\\\\${PROJECT_NAME}.lnk'
@@ -216,9 +216,8 @@
")
SET(CPACK_PACKAGE_NAME "Cal3d Library")
- #
- #SET(CPACK_PACKAGE_EXECUTABLES "bin\\\\Cal3D" "Cal3D")
- # SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\Cal3D.exe")
+ SET(CPACK_PACKAGE_EXECUTABLES "CallyDemo" "Cal3D CallyDemo")
+ SET(CPACK_NSIS_INSTALLED_ICON_NAME "CallyDemo.exe")
# SET(CPACK_NSIS_INSTALLED_ICON_NAME "Cal3D")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Cal3d
Library")
SET(CPACK_NSIS_HELP_LINK "https:\\\\\\\\gna.org\\\\projects\\\\cal3d")
@@ -228,19 +227,25 @@
#SET(CPACK_NSIS_PACKAGE_NAME "Cal3Dnsis")
# SET(CPACK_NSIS_PROJECT "Cal3Dnsisproj")
#SET(CPACK_SOURCE_STRIP_FILES "src")
+
FILE(GLOB dllfiles "${CMAKE_CURRENT_BINARY_DIR}/bin/Release/*.dll")
+ FILE(GLOB helpdllfiles
"${CMAKE_CURRENT_BINARY_DIR}/Win32GlutAndGlew/*.dll")
FILE(GLOB exefiles "${CMAKE_CURRENT_BINARY_DIR}/bin/Release/*.exe")
#FILE(GLOB datafiles "${CMAKE_CURRENT_BINARY_DIR}/data/*.obj")
- INSTALL(FILES ${dllfiles} ${exefiles} DESTINATION bin)
- INSTALL(FILES ${datafiles} DESTINATION data)
-
-
-
- INSTALL( FILES
-
- ${CAL3D_RUNTIME_LIBRARIES_RELEASE}
-
- DESTINATION bin)
+ INSTALL(FILES ${dllfiles} ${helpdllfiles} ${exefiles} DESTINATION .)
+ FILE(GLOB libfiles "${CMAKE_CURRENT_BINARY_DIR}/bin/Release/*.lib")
+INSTALL(FILES ${libfiles} DESTINATION lib)
+ FILE(GLOB includefiles "${CMAKE_CURRENT_BINARY_DIR}/src/cal3d/*.h")
+INSTALL(FILES ${includefiles} DESTINATION include/cal3d)
+
+ file(GLOB datafiles "${CMAKE_CURRENT_BINARY_DIR}/data")
+
+ file(GLOB callydatafiles
"${CMAKE_CURRENT_BINARY_DIR}/examples/cally/data/*.*")
+ INSTALL(DIRECTORY ${datafiles} DESTINATION .)
+ INSTALL(FILES ${callydatafiles} DESTINATION data)
+
+
+
ELSE(WIN32 AND NOT UNIX)
@@ -255,22 +260,22 @@
#copy all libs in bin
#get real names
-execute_process(
-COMMAND readlink ${item} RESULT_VARIABLE res${item} OUTPUT_VARIABLE
TotalLinkName${item} ERROR_VARIABLE fok${item}
OUTPUT_STRIP_TRAILING_WHITESPACE)
-#copy link target to its real name in bin
-if(TotalLinkName${item})
-#its a link
-set ( LinkName${item} ${CMAKE_HOME_DIRECTORY}/bin/${TotalLinkName${item}} )
-else()
-#its not a link
-set ( LinkName${item} ${CMAKE_HOME_DIRECTORY}/bin/ )
-endif()
-#display copy trace
-message("cp -L ${item} ${LinkName${item}} ")
-#copy
-execute_process(
-COMMAND cp -L ${item} ${LinkName${item}}
- OUTPUT_VARIABLE VAROK)
+ execute_process(
+ COMMAND readlink ${item} RESULT_VARIABLE res${item} OUTPUT_VARIABLE
TotalLinkName${item} ERROR_VARIABLE fok${item}
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ #copy link target to its real name in bin
+ if(TotalLinkName${item})
+ #its a link
+ set ( LinkName${item}
${CMAKE_HOME_DIRECTORY}/bin/${TotalLinkName${item}} )
+ else()
+ #its not a link
+ set ( LinkName${item} ${CMAKE_HOME_DIRECTORY}/bin/ )
+ endif()
+ #display copy trace
+ message("cp -L ${item} ${LinkName${item}} ")
+ #copy
+ execute_process(
+ COMMAND cp -L ${item} ${LinkName${item}}
+ OUTPUT_VARIABLE VAROK)
ENDFOREACH(item ${LIBSTOINSTALL})
#use these copies as install stuff
@@ -286,7 +291,7 @@
# There is a bug in NSI that does not handle full unix paths properly.
Make
# sure there is at least one set of four (4) backlasshes.
#SET(CPACK_PACKAGE_ICON "${Cal3D_SOURCE_DIR}/data/Cal3D.png")
- SET(CPACK_PACKAGE_EXECUTABLES "Cal3DTest" "Test Cal3DSDK")
+ SET(CPACK_PACKAGE_EXECUTABLES "CallyDemo" "Test Cal3DSDK")
SET(CPACK_NSIS_INSTALLED_ICON_NAME
"bin\\\\Release\\\\cal3d_miniviewer.exe")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} a
skeleton based character animation library")
SET(CPACK_NSIS_CONTACT "[email protected]")
@@ -297,7 +302,7 @@
#SET(CPACK_PACKAGE_EXECUTABLES "ccmake" "CMake")
ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "Cal3D;miniviewer_gl")
+#SET(CPACK_PACKAGE_EXECUTABLES "CallyDemo;miniviewer_gl")
INCLUDE(CPack)
#ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
Modified: trunk/cal3d/examples/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/CMakeLists.txt?rev=571&r1=570&r2=571&view=diff
==============================================================================
--- trunk/cal3d/examples/CMakeLists.txt (original)
+++ trunk/cal3d/examples/CMakeLists.txt Thu Jan 22 00:39:11 2015
@@ -1,5 +1,5 @@
subdirs(
-#cally
+cally/src
#miniviewer_bada
#miniviewer_d3d
#miniviewer_d3d_bump
Added: trunk/cal3d/examples/cally/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/cally/src/CMakeLists.txt?rev=571&view=auto
==============================================================================
--- trunk/cal3d/examples/cally/src/CMakeLists.txt (added)
+++ trunk/cal3d/examples/cally/src/CMakeLists.txt Thu Jan 22 00:39:11 2015
@@ -0,0 +1,55 @@
+PROJECT(CallyDemo)
+
+
+#ADD_DEFINITIONS(-Dx64BIT)
+FIND_PACKAGE(GLUT)
+#find_package (Threads)
+
+SET(PROJECT_INCLUDES
+
+global.h tga.h tick.h
+demo.h menu.h model.h
+
+
+)
+
+
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH})
+INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/src)
+
+SET(PROJECT_SOURCES
+
+${PROJECT_INCLUDES}
+main.cpp tga.cpp tick.cpp
+demo.cpp menu.cpp model.cpp
+
+)
+
+
+
+#FIND_PACKAGE(GLEW REQUIRED)
+
+
+
+IF(WIN32)
+
+INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/Glut)
+ELSE(WIN32)
+
+ #linux only : add GL LIBS
+ SET(ADDITIONALS_LIBS
+ GL
+ GLU
+pthread
+ )
+
+ENDIF(WIN32)
+
+ADD_EXECUTABLE(CallyDemo ${PROJECT_SOURCES} )
+TARGET_LINK_LIBRARIES(CallyDemo cal3d ${ADDITIONALS_LIBS} ${GLUT_LIBRARY}
+)
+
+SET_TARGET_PROPERTIES(CallyDemo PROPERTIES PROJECT_LABEL "Demo Cally" )
+
+
_______________________________________________
Cal3d-commits mailing list
[email protected]
https://mail.gna.org/listinfo/cal3d-commits
