Revert "Export targets in CMake and add include directories to target properties"

src/Bullet3Dynamics/CMakeLists.txt

@@ -1,3 +1,8 @@
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+)
+
 SET(Bullet3Dynamics_SRCS
 	b3CpuRigidBodyPipeline.cpp
 	ConstraintSolver/b3FixedConstraint.cpp
@@ -25,10 +30,6 @@ SET(Bullet3Dynamics_HDRS
 )
 
 ADD_LIBRARY(Bullet3Dynamics ${Bullet3Dynamics_SRCS} ${Bullet3Dynamics_HDRS})
-target_include_directories(Bullet3Dynamics PUBLIC
-	$<BUILD_INTERFACE:${BULLET_PHYSICS_SOURCE_DIR}/src>
-	$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_DIR}>
-)
 if (BUILD_SHARED_LIBS)
   target_link_libraries(Bullet3Dynamics Bullet3Collision)
 endif ()
@@ -40,13 +41,12 @@ IF (INSTALL_LIBS)
 		#FILES_MATCHING requires CMake 2.6
 		IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 			IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
-				INSTALL(TARGETS Bullet3Dynamics EXPORT Bullet DESTINATION .)
+				INSTALL(TARGETS Bullet3Dynamics DESTINATION .)
 			ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 				INSTALL(TARGETS Bullet3Dynamics
-					EXPORT Bullet
-					RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-					LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-					ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX})
 				INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h"  PATTERN
 ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)