xml-cppdom-checkins

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

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

Revision: 695
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=695&view=rev
Author:   patrickh
Date:     2012-07-27 22:21:58 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Set the package version to 1.3.0.

Submitted by: Doug McCorkle

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

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-07-27 22:21:26 UTC (rev 694)
+++ trunk/CMakeLists.txt	2012-07-27 22:21:58 UTC (rev 695)
@@ -9,8 +9,8 @@
 project(cppdom)
 
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION_MINOR "3")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
 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}")

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

[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.

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

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

Revision: 702
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=702&view=rev
Author:   patrickh
Date:     2012-07-30 15:05:22 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Add cppdom-config back into the install target.

Submitted by: Doug McCorkle

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

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-07-30 15:04:41 UTC (rev 701)
+++ trunk/CMakeLists.txt	2012-07-30 15:05:22 UTC (rev 702)
@@ -64,6 +64,10 @@
 	DESTINATION ${FLAGPOLL_INFO_DIR}
 	COMPONENT Development)
 
+install(FILES cppdom-config
+	DESTINATION ${BIN_DIR}
+	COMPONENT Development)
+
 ###
 # Perform build configuration of dependencies
 ###

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

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

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

Revision: 706
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=706&view=rev
Author:   patrickh
Date:     2012-08-03 18:43:39 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
Fix flagpoll file creation when using Clang.

Submitted by: Doug McCorkle

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

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-07-31 17:48:27 UTC (rev 705)
+++ trunk/CMakeLists.txt	2012-08-03 18:43:39 UTC (rev 706)
@@ -49,7 +49,7 @@
 set(includedir "\${fp_file_cwd}/../../${INCLUDE_DIR}")
 set(libdir "\${fp_file_cwd}/../../${LIB_DIR}")
 
-if(CMAKE_COMPILER_IS_GNUCXX)
+if(CMAKE_COMPILER_IS_GNUCXX OR ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) )
     set(cppdom_cxxflags "-Wno-deprecated")
     set(include_path_flag "-I")
     set(cppdom_libs "-lcppdom-${VERSION_UNDERSCORES}")

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

[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.

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

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

Revision: 709
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=709&view=rev
Author:   patrickh
Date:     2012-09-05 13:32:00 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Fix .fpc content on Windows.

Submitted by Doug McCorkle

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

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-08-12 18:30:22 UTC (rev 708)
+++ trunk/CMakeLists.txt	2012-09-05 13:32:00 UTC (rev 709)
@@ -56,7 +56,7 @@
     set(lib_path_flag "-L")
 elseif(MSVC)
     set(include_path_flag "/I")
-    set(lib_path_flag "/L")
+    set(lib_path_flag "/libpath:")
 else()
     message(FATAL_ERROR "Compiler not recognized - can't generate values for Flagpoll file")
 endif()

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