First attempt at changing install suffixes based upon cmake cache variables

Author: Kent Knox

src/CMakeLists.txt

@@ -80,8 +80,9 @@ else()
 endif()
 
 if( MSVC_IDE )
-	set( BUILD64 ${CMAKE_CL_64} )
     set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
+
+	set( BUILD64 ${CMAKE_CL_64} )
 else()
 	option( BUILD64 "Build a 64-bit product" ON )
 
@@ -93,15 +94,25 @@ else()
 	endif()
 endif()
 
+# These variables are meant to contain string which should be appended to the installation paths 
+# of library and executable binaries, respectively.  They are meant to be user configurable/overridable.  
+set( SUFFIX_LIB_DEFAULT "" )
+set( SUFFIX_BIN_DEFAULT "" )
+
 # Modify the global find property to help us find libraries like Boost in the correct paths for 64-bit
 # Essentially, find_library calls will look for /lib64 instead of /lib; works for windows and linux
 if( BUILD64 )
 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
 	message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" )
-else()
+
+    set( SUFFIX_LIB_DEFAULT "64" )
+else( )
 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
 	message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
-endif()
+endif( )
+
+set( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
+set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
 
 # Client is built only if boost is found; on windows, we need vs10 or higher
 # Find Boost on the system, and configure the type of boost build we want

src/client/CMakeLists.txt

@@ -48,22 +48,9 @@ target_link_libraries( Client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_
 set_target_properties( Client PROPERTIES VERSION ${CLFFT_VERSION} )
 set_target_properties( Client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 
-if( BUILD64 )
-	# CPack configuration; include the executable into the package
-	install( TARGETS Client
-			RUNTIME DESTINATION bin64
-			LIBRARY DESTINATION lib64
-			ARCHIVE DESTINATION lib64/import
-			)
-
-else()
-	# CPack configuration; include the executable into the package
-	install( TARGETS Client
-			RUNTIME DESTINATION bin32
-			LIBRARY DESTINATION lib32
-			ARCHIVE DESTINATION lib32/import
-			)
-endif()
-
-# configure_file( "${PROJECT_SOURCE_DIR}/client/CMakeLists.pack"
-		# "${PROJECT_BINARY_DIR}/samples/CMakeLists.txt" COPYONLY )
+# CPack configuration; include the executable into the package
+install( TARGETS Client
+        RUNTIME DESTINATION bin${SUFFIX_BIN}
+        LIBRARY DESTINATION lib${SUFFIX_LIB}
+        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+        )

src/library/CMakeLists.txt

@@ -85,18 +85,9 @@ if( UNIX )
 	# set_target_properties( clFFT PROPERTIES COMPILE_FLAGS "-frtti" )
 endif( )
 
-if( BUILD64 )
-	# CPack configuration; include the executable into the package
-	install( TARGETS clFFT
-			RUNTIME DESTINATION bin64
-			LIBRARY DESTINATION lib64
-			ARCHIVE DESTINATION lib64/import
-			)
-else()
-	# CPack configuration; include the executable into the package
-	install( TARGETS clFFT
-			RUNTIME DESTINATION bin32
-			LIBRARY DESTINATION lib32
-			ARCHIVE DESTINATION lib32/import
-			)
-endif()
+# CPack configuration; include the executable into the package
+install( TARGETS clFFT
+        RUNTIME DESTINATION bin${SUFFIX_BIN}
+        LIBRARY DESTINATION lib${SUFFIX_LIB}
+        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+        )

src/scripts/perf/CMakeLists.txt

@@ -21,10 +21,4 @@ set(GRAPHING_SCRIPTS 	measurePerformance.py
 						performanceUtility.py
 						)
 
-if( BUILD64 )
-    set( BIN_DIR bin64 )
-else()
-    set( BIN_DIR bin32 )
-endif()
-
-install( FILES ${GRAPHING_SCRIPTS} DESTINATION ${BIN_DIR} )
+install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )

src/statTimer/CMakeLists.txt

@@ -73,18 +73,9 @@ if( UNIX )
 	target_link_libraries( StatTimer -lrt )
 endif( )
 
-if( BUILD64 )
-	# CPack configuration; include the executable into the package
-	install( TARGETS StatTimer
-			RUNTIME DESTINATION bin64
-			LIBRARY DESTINATION lib64
-			ARCHIVE DESTINATION lib64/import
-			)
-else()
-	# CPack configuration; include the executable into the package
-	install( TARGETS StatTimer
-			RUNTIME DESTINATION bin32
-			LIBRARY DESTINATION lib32
-			ARCHIVE DESTINATION lib32/import
-			)
-endif()
+# CPack configuration; include the executable into the package
+install( TARGETS StatTimer
+        RUNTIME DESTINATION bin${SUFFIX_BIN}
+        LIBRARY DESTINATION lib${SUFFIX_LIB}
+        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+        )

src/tests/CMakeLists.txt

@@ -49,16 +49,6 @@ set( clFFT.Test.Headers
 
 set( clFFT.Test.Files ${clFFT.Test.Source} ${clFFT.Test.Headers} )
 
-
-
-if( BUILD64 )
-    set( BIN_DIR bin64 )
-	set( LIB_DIR lib64 )
-else()
-    set( BIN_DIR bin32 )
-	set( LIB_DIR lib32 )
-endif()
-
 set( LD_PTHREAD "" )
 if( CMAKE_COMPILER_IS_GNUCXX )
 	set( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
@@ -103,7 +93,7 @@ set_target_properties( Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINAR
 
 # CPack configuration; include the executable into the package
 install( TARGETS Test
-		RUNTIME DESTINATION ${BIN_DIR}
-		LIBRARY DESTINATION ${LIB_DIR}
-		ARCHIVE DESTINATION ${LIB_DIR}/import
-		)
+        RUNTIME DESTINATION bin${SUFFIX_BIN}
+        LIBRARY DESTINATION lib${SUFFIX_LIB}
+        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+        )