From 777b92a2adf69c7dcf7a57d1bd83998c07b09e1f Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Wed, 30 May 2012 19:22:54 +0000 Subject: [PATCH] fix HACD/CMakeLists.txt to add .inl files for install fixes Issue 616 https://code.google.com/p/bullet/issues/detail?id=616&colspec=Modified%20ID%20Type%20Stars%20Status%20Owner%20Summary fix Intel cmake build of ParticlesOpenCL and OpenCLClothDemo disable debug printf --- Demos/OpenCLClothDemo/Intel/CMakeLists.txt | 12 +++++------- Demos/OpenGL/GLDebugFont.cpp | 2 +- Demos/ParticlesOpenCL/Intel/CMakeLists.txt | 11 +++++------ Extras/HACD/CMakeLists.txt | 4 ++-- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Demos/OpenCLClothDemo/Intel/CMakeLists.txt b/Demos/OpenCLClothDemo/Intel/CMakeLists.txt index 0acc2c5be..ff8d4b2e2 100644 --- a/Demos/OpenCLClothDemo/Intel/CMakeLists.txt +++ b/Demos/OpenCLClothDemo/Intel/CMakeLists.txt @@ -9,13 +9,15 @@ ${INTEL_OPENCL_INCLUDES} ADD_DEFINITIONS(-DUSE_INTEL_OPENCL) ADD_DEFINITIONS(-DCL_PLATFORM_INTEL) - +IF(WIN32) +ADD_DEFINITIONS(-DGLEW_STATIC) +ENDIF(WIN32) IF (CMAKE_CL_64) SET(CMAK_GLEW_LIBRARY - ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib ) + ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64s.lib ) ELSE(CMAKE_CL_64) - SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32.lib ) + SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32s.lib ) ENDIF(CMAKE_CL_64) @@ -58,15 +60,11 @@ IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_Intel POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR} ) - ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_Intel POST_BUILD - COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW64.DLL ${CMAKE_CURRENT_BINARY_DIR}) ELSE(CMAKE_CL_64) ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_Intel POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR} ) - ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_Intel POST_BUILD - COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW32.DLL ${CMAKE_CURRENT_BINARY_DIR}) ENDIF(CMAKE_CL_64) ENDIF(WIN32) ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_Intel POST_BUILD diff --git a/Demos/OpenGL/GLDebugFont.cpp b/Demos/OpenGL/GLDebugFont.cpp index b62973182..616006810 100644 --- a/Demos/OpenGL/GLDebugFont.cpp +++ b/Demos/OpenGL/GLDebugFont.cpp @@ -75,7 +75,7 @@ void GLDebugResetFont(int screenWidth,int screenHeight) glTexImage2D(GL_TEXTURE_2D, 0, 3, 256 , 256 , 0, GL_RGB, GL_UNSIGNED_BYTE, &sFontData[0]); } - printf("generating font at resolution %d,%d\n",screenWidth,screenHeight); +// printf("generating font at resolution %d,%d\n",screenWidth,screenHeight); } diff --git a/Demos/ParticlesOpenCL/Intel/CMakeLists.txt b/Demos/ParticlesOpenCL/Intel/CMakeLists.txt index 54828a5cc..ff731115a 100644 --- a/Demos/ParticlesOpenCL/Intel/CMakeLists.txt +++ b/Demos/ParticlesOpenCL/Intel/CMakeLists.txt @@ -10,12 +10,15 @@ ${INTEL_OPENCL_INCLUDES} ADD_DEFINITIONS(-DUSE_INTEL_OPENCL) ADD_DEFINITIONS(-DCL_PLATFORM_INTEL) +IF(WIN32) +ADD_DEFINITIONS(-DGLEW_STATIC) +ENDIF(WIN32) IF (CMAKE_CL_64) SET(CMAK_GLEW_LIBRARY - ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib ) + ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64s.lib ) ELSE(CMAKE_CL_64) - SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32.lib ) + SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32s.lib ) ENDIF(CMAKE_CL_64) @@ -59,8 +62,6 @@ IF (CMAKE_CL_64) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ADD_CUSTOM_COMMAND( TARGET AppParticlesOCL_Intel POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR} ) - ADD_CUSTOM_COMMAND( TARGET AppParticlesOCL_Intel POST_BUILD - COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW64.DLL ${CMAKE_CURRENT_BINARY_DIR}) ADD_CUSTOM_COMMAND( TARGET AppParticlesOCL_Intel POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/ParticlesOpenCL/ParticlesOCL.cl ${CMAKE_CURRENT_BINARY_DIR}) ENDIF() @@ -68,8 +69,6 @@ ELSE(CMAKE_CL_64) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ADD_CUSTOM_COMMAND( TARGET AppParticlesOCL_Intel POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}) - ADD_CUSTOM_COMMAND( TARGET AppParticlesOCL_Intel POST_BUILD - COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW32.DLL ${CMAKE_CURRENT_BINARY_DIR}) ADD_CUSTOM_COMMAND( TARGET AppParticlesOCL_Intel POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/ParticlesOpenCL/ParticlesOCL.cl ${CMAKE_CURRENT_BINARY_DIR}) ENDIF() diff --git a/Extras/HACD/CMakeLists.txt b/Extras/HACD/CMakeLists.txt index 389a603f8..4377e45c2 100644 --- a/Extras/HACD/CMakeLists.txt +++ b/Extras/HACD/CMakeLists.txt @@ -38,8 +38,8 @@ IF (INSTALL_EXTRA_LIBS) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS HACD DESTINATION lib${LIB_SUFFIX}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN -".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) + DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN "*.inl" PATTERN + ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)