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

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

Revision: 707
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=707&view=rev
Author:   patrickh
Date:     2012-08-12 18:27:03 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
Fix flagpoll file installation on Windows.

Submitted by: Doug McCorkle

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

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-08-03 18:43:39 UTC (rev 706)
+++ trunk/CMakeLists.txt	2012-08-12 18:27:03 UTC (rev 707)
@@ -39,7 +39,7 @@
     set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
 endif()
 
-set(FLAGPOLL_INFO_DIR ${LIB_DIR}/flagpoll)
+set(FLAGPOLL_INFO_DIR ${ARCH_DIR}/flagpoll)
 
 # Create flagpoll file
 set(provides "cppdom")
@@ -47,7 +47,7 @@
 set(prefix "\${fp_file_cwd}/../..")
 set(exec_prefix "\${prefix}")
 set(includedir "\${fp_file_cwd}/../../${INCLUDE_DIR}")
-set(libdir "\${fp_file_cwd}/../../${LIB_DIR}")
+set(libdir "\${fp_file_cwd}/../../${ARCH_DIR}")
 
 if(CMAKE_COMPILER_IS_GNUCXX OR ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) )
     set(cppdom_cxxflags "-Wno-deprecated")
@@ -123,7 +123,7 @@
 
 # Add all targets to the build-tree export set
 export(TARGETS cppdom 
-    FILE "${PROJECT_BINARY_DIR}/${LIB_DIR}/cppdomLibraryDepends.cmake")
+    FILE "${PROJECT_BINARY_DIR}/${ARCH_DIR}/cppdomLibraryDepends.cmake")
 
 # Export the package for use from the build-tree
 # (this registers the build-tree with a global CMake-registry)
@@ -131,23 +131,23 @@
 
 # Create a cppdomBuildTreeSettings.cmake file for the use from the build tree
 configure_file(cppdomBuildTreeSettings.cmake.in
-    "${PROJECT_BINARY_DIR}/${LIB_DIR}/cppdomBuildTreeSettings.cmake" @ONLY)
+    "${PROJECT_BINARY_DIR}/${ARCH_DIR}/cppdomBuildTreeSettings.cmake" @ONLY)
 
 configure_file(cppdomConfigVersion.cmake.in
-    "${PROJECT_BINARY_DIR}/${LIB_DIR}/cppdomConfigVersion.cmake" @ONLY)
+    "${PROJECT_BINARY_DIR}/${ARCH_DIR}/cppdomConfigVersion.cmake" @ONLY)
 configure_file(Usecppdom.cmake.in
-    "${PROJECT_BINARY_DIR}/${LIB_DIR}/Usecppdom.cmake" @ONLY)
+    "${PROJECT_BINARY_DIR}/${ARCH_DIR}/Usecppdom.cmake" @ONLY)
 
 # Install the export set for use with the install-tree
-install(EXPORT cppdom-targets DESTINATION ${LIB_DIR})
+install(EXPORT cppdom-targets DESTINATION ${ARCH_DIR})
 
 include( CMakePackageConfigHelpers )
 configure_package_config_file( 
-    cppdomConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/cppdomConfig.cmake
-    INSTALL_DESTINATION ${LIB_DIR}
+    cppdomConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${ARCH_DIR}/cppdomConfig.cmake
+    INSTALL_DESTINATION ${ARCH_DIR}
     PATH_VARS INCLUDE_DIR )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/cppdomConfig.cmake 
-              ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/cppdomConfigVersion.cmake
-              ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/Usecppdom.cmake
-        DESTINATION ${LIB_DIR} )
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ARCH_DIR}/cppdomConfig.cmake 
+              ${CMAKE_CURRENT_BINARY_DIR}/${ARCH_DIR}/cppdomConfigVersion.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/${ARCH_DIR}/Usecppdom.cmake
+        DESTINATION ${ARCH_DIR} )

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