[xml-cppdom-checkins] SF.net SVN: xml-cppdom:[700] trunk/CMakeLists.txt

[<pat...@us...>]

Revision: 700
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=700&view=rev
Author:   patrickh
Date:     2012-07-30 15:03:35 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Correct the usage of lib and lib64 based on the build type.

Submitted by: Doug McCorkle

Modified Paths:
--------------
    trunk/CMakeLists.txt

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-07-30 15:02:59 UTC (rev 699)
+++ trunk/CMakeLists.txt	2012-07-30 15:03:35 UTC (rev 700)
@@ -14,19 +14,28 @@
 set(CPACK_PACKAGE_VERSION
 	"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(VERSION_UNDERSCORES "${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH}")
+
 ###
 # Set up options
 ###
 
+# TODO this is not ideal/complete
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(arch "x86_64")
+	set(ARCH_DIR lib64)
+else()
+	set(arch "x86")
+	set(ARCH_DIR lib)
+endif()
+
 # Define directories
 set(BIN_DIR bin)
-set(ARCH_DIR lib)
 set(FLAGPOLL_INFO_DIR share/flagpoll)
 if(WIN32)
 	set(LIB_DIR bin)
 	set(INCLUDE_DIR include)
 else()
-	set(LIB_DIR lib)
+	set(LIB_DIR ${ARCH_DIR})
 	set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
 endif()
 
@@ -37,12 +46,7 @@
 set(exec_prefix "\${prefix}")
 set(includedir "\${fp_file_cwd}/../../${INCLUDE_DIR}")
 set(libdir "\${fp_file_cwd}/../../${LIB_DIR}")
-# TODO this is not ideal/complete
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set(arch "x86_64")
-else()
-	set(arch "x86")
-endif()
+
 if(CMAKE_COMPILER_IS_GNUCXX)
 	set(cppdom_cxxflags "-Wno-deprecated")
 	set(include_path_flag "-I")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.