From 2287c6c4d7746e95613ee49f8ad22a7482f477b8 Mon Sep 17 00:00:00 2001 From: Arnaud Gelas Date: Fri, 8 Aug 2014 09:52:51 +0200 Subject: [PATCH 1/8] use boost 1.46.1 for windows --- CMake/SuperBuild/External-Boost.cmake | 84 +++++++++++++++------------ 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/CMake/SuperBuild/External-Boost.cmake b/CMake/SuperBuild/External-Boost.cmake index 303e8e8a..a393635e 100644 --- a/CMake/SuperBuild/External-Boost.cmake +++ b/CMake/SuperBuild/External-Boost.cmake @@ -1,45 +1,57 @@ #--------------------------------------------------------------------------- # Get and build boost -set( Boost_Bootstrap_Command ) -if( UNIX ) +if( WIN32 ) + ExternalProject_Add( Boost + GIT_REPOSITORY "${git_protocol}://github.com/pocb/boost.git" + GIT_TAG "origin/cmake-1.46.1" + SOURCE_DIR ${proj} + BINARY_DIR ${proj}-build + CMAKE_GENERATOR ${gen} + CMAKE_ARGS + ${ep_common_args} + -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/INSTALL + -DBUILD_PROJECTS:STRING=program_options + -DWITH_PYTHON:BOOL=OFF + -DWITH_DOXYGEN:BOOL=OFF + -DWITH_EXPAT:BOOL=OFF + -DWITH_BZIP2:BOOL=OFF + -DWITH_MPI:BOOL=OFF + -DWITH_XSLTPROC:BOOL=OFF + -DWITH_ICU:BOOL=OFF + INSTALL_COMMAND "" + ) + + set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/boost/ ) + set( Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/ ) +else() set( Boost_Bootstrap_Command ./bootstrap.sh ) set( Boost_b2_Command ./b2 ) -else() - if( WIN32 ) - set( Boost_Bootstrap_Command bootstrap.bat ) - set( Boost_b2_Command b2.exe ) - endif() -endif() -set( Boost_Patches_DIR ${Patches_DIR}/boost ) -set( Boost_Patch_Script ${Boost_Patches_DIR}/boost_patch.sh ) -set( Boost_Patch_Command sh ${Boost_Patch_Script} ) + set( Boost_Patches_DIR ${Patches_DIR}/boost ) + set( Boost_Patch_Script ${Boost_Patches_DIR}/boost_patch.sh ) + set( Boost_Patch_Command sh ${Boost_Patch_Script} ) -ExternalProject_Add(Boost - URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz" - URL_MD5 efbfbff5a85a9330951f243d0a46e4b9 - BUILD_IN_SOURCE 1 - UPDATE_COMMAND "" - PATCH_COMMAND ${Boost_Patch_Command} - CONFIGURE_COMMAND ${Boost_Bootstrap_Command} --without-icu --prefix=${CMAKE_BINARY_DIR}/INSTALL - BUILD_COMMAND ${Boost_b2_Command} - --without-python - --without-mpi - link=static - link=shared - threading=multi - -d+2 - -j${NProcessors} - install - INSTALL_COMMAND "" - INSTALL_DIR ${CMAKE_BINARY_DIR}/INSTALL -) + ExternalProject_Add(Boost + URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz" + URL_MD5 efbfbff5a85a9330951f243d0a46e4b9 + BUILD_IN_SOURCE 1 + UPDATE_COMMAND "" + PATCH_COMMAND ${Boost_Patch_Command} + CONFIGURE_COMMAND ${Boost_Bootstrap_Command} --without-icu --prefix=${CMAKE_BINARY_DIR}/INSTALL + BUILD_COMMAND ${Boost_b2_Command} + --without-python + --without-mpi + link=static + link=shared + threading=multi + -d+2 + -j${NProcessors} + install + INSTALL_COMMAND "" + INSTALL_DIR ${CMAKE_BINARY_DIR}/INSTALL + ) -if( NOT WIN32 ) - set(Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/boost/ ) - set(Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/ ) -else() - set(Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) - set(Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/boost-1_54/ ) + set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) + set( Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/boost-1_54/ ) endif() From ed7a946174dd7265e640487332218e36f9348e9f Mon Sep 17 00:00:00 2001 From: Arnaud Gelas Date: Wed, 13 Aug 2014 07:45:44 +0200 Subject: [PATCH 2/8] requires at least Boost 1.46 --- CMake/SuperBuild/SuperBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/SuperBuild/SuperBuild.cmake b/CMake/SuperBuild/SuperBuild.cmake index 429bf70a..3bb5d96a 100644 --- a/CMake/SuperBuild/SuperBuild.cmake +++ b/CMake/SuperBuild/SuperBuild.cmake @@ -68,7 +68,7 @@ set(GoFigure2_DEPENDENCIES) #------------------------- -find_package( Boost 1.39 REQUIRED ) +find_package( Boost 1.46 REQUIRED ) if( Boost_FOUND ) set( SUPER_BOOST OFF ) From 485e19706beb5eecacb03fa4496acd671cebae77 Mon Sep 17 00:00:00 2001 From: Arnaud Gelas Date: Wed, 13 Aug 2014 07:52:36 +0200 Subject: [PATCH 3/8] improve FindMySQL for MySQL 5.* on Windows --- CMake/FindMySQL.cmake | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CMake/FindMySQL.cmake b/CMake/FindMySQL.cmake index 8cd16709..f01e421d 100644 --- a/CMake/FindMySQL.cmake +++ b/CMake/FindMySQL.cmake @@ -1,6 +1,6 @@ # - Find MySQL # This module finds MySQL libraries. -# +# # # MYSQL_INCLUDE_DIR - Directories to include to use MySQL # MYSQL_LIBRARIES - Files to link against to use MySQL @@ -14,21 +14,21 @@ find_path( MYSQL_INCLUDE_DIR NAMES mysql.h "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/" "C:/Program Files/MySQL/include" - "C:/Program Files/MySQL/MySQL Server 5.1/include" - PATH_SUFFIXES "include" "include/mysql" "mysql/include" + "C:/Program Files/MySQL/MySQL Server 5.*/include" + PATH_SUFFIXES "include" "include/mysql" "mysql/include" DOC "Specify the directory containing mysql.h" ) set( MYSQL_LIBRARY_NAMES mysql libmysql mysqlclient mysqlclient_r ) -find_library( MYSQL_LIBRARIES +find_library( MYSQL_LIBRARIES NAMES ${MYSQL_LIBRARY_NAMES} PATHS "$ENV{ProgramFiles}/MySQL/*/" "$ENV{SystemDrive}/MySQL/*/" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib/opt" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib/opt" - "C:/Program Files/MySQL/MySQL Server 5.1/lib/opt" + "C:/Program Files/MySQL/MySQL Server 5.*/lib/opt" PATH_SUFFIXES "lib" "mysql" "mysql/lib" "mysql/lib/mysql" "lib/opt" DOC "Specify the mysql library here." ) @@ -38,32 +38,32 @@ find_library( MYSQL_LIBRARIES if( NOT WIN32 ) find_package( ZLIB ) set( MYSQL_EXTRA_LIBRARIES ${ZLIB_LIBRARY} ) - + include( FindPackageHandleStandardArgs ) - FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG + FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG MYSQL_INCLUDE_DIR MYSQL_LIBRARIES MYSQL_EXTRA_LIBRARIES ) - mark_as_advanced( MYSQL_FOUND - MYSQL_LIBRARIES - MYSQL_EXTRA_LIBRARIES - MYSQL_INCLUDE_DIR + mark_as_advanced( MYSQL_FOUND + MYSQL_LIBRARIES + MYSQL_EXTRA_LIBRARIES + MYSQL_INCLUDE_DIR ) else( NOT WIN32 ) set( MYSQL_EXTRA_LIBRARIES "" ) - + include( FindPackageHandleStandardArgs ) - FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG + FIND_PACKAGE_HANDLE_STANDARD_ARGS( MYSQL DEFAULT_MSG MYSQL_INCLUDE_DIR MYSQL_LIBRARIES ) - mark_as_advanced( MYSQL_FOUND - MYSQL_LIBRARIES - MYSQL_INCLUDE_DIR + mark_as_advanced( MYSQL_FOUND + MYSQL_LIBRARIES + MYSQL_INCLUDE_DIR ) endif( NOT WIN32 ) From 0f6c84c67d7e440addc9efe6f62fc84c1f47d1b9 Mon Sep 17 00:00:00 2001 From: Arnaud Gelas Date: Tue, 21 Oct 2014 15:52:38 +0200 Subject: [PATCH 4/8] Boost 1.46 is not REQUIRED --- CMake/SuperBuild/SuperBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/SuperBuild/SuperBuild.cmake b/CMake/SuperBuild/SuperBuild.cmake index 3bb5d96a..d2206934 100644 --- a/CMake/SuperBuild/SuperBuild.cmake +++ b/CMake/SuperBuild/SuperBuild.cmake @@ -68,7 +68,7 @@ set(GoFigure2_DEPENDENCIES) #------------------------- -find_package( Boost 1.46 REQUIRED ) +find_package( Boost 1.46 ) if( Boost_FOUND ) set( SUPER_BOOST OFF ) From a63ca4e189321bad6d33ffc6eb807375c3ab9d2b Mon Sep 17 00:00:00 2001 From: Kishore Mosaliganti Date: Tue, 21 Oct 2014 11:36:44 -0400 Subject: [PATCH 5/8] ENH: Commented out install command for Boost configuration --- CMake/SuperBuild/External-Boost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/SuperBuild/External-Boost.cmake b/CMake/SuperBuild/External-Boost.cmake index a393635e..2fbab2e1 100644 --- a/CMake/SuperBuild/External-Boost.cmake +++ b/CMake/SuperBuild/External-Boost.cmake @@ -19,7 +19,7 @@ if( WIN32 ) -DWITH_MPI:BOOL=OFF -DWITH_XSLTPROC:BOOL=OFF -DWITH_ICU:BOOL=OFF - INSTALL_COMMAND "" + #INSTALL_COMMAND "" ) set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/boost/ ) From ef4b9ad0fb14fa67a15ebacbd2195b56574c1c3a Mon Sep 17 00:00:00 2001 From: Arnaud Gelas Date: Tue, 21 Oct 2014 17:43:14 +0200 Subject: [PATCH 6/8] fix boost library dir for windows --- CMake/SuperBuild/External-Boost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/SuperBuild/External-Boost.cmake b/CMake/SuperBuild/External-Boost.cmake index 2fbab2e1..fc6368ae 100644 --- a/CMake/SuperBuild/External-Boost.cmake +++ b/CMake/SuperBuild/External-Boost.cmake @@ -22,7 +22,7 @@ if( WIN32 ) #INSTALL_COMMAND "" ) - set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/boost/ ) + set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) set( Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/ ) else() set( Boost_Bootstrap_Command ./bootstrap.sh ) From a9ccd9119a05f2061e20ac1829025aa5347d0498 Mon Sep 17 00:00:00 2001 From: Arnaud Gelas Date: Tue, 21 Oct 2014 17:48:57 +0200 Subject: [PATCH 7/8] set Boost_LIBRARYDIR for windows --- CMake/SuperBuild/External-Boost.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/CMake/SuperBuild/External-Boost.cmake b/CMake/SuperBuild/External-Boost.cmake index fc6368ae..9cae302c 100644 --- a/CMake/SuperBuild/External-Boost.cmake +++ b/CMake/SuperBuild/External-Boost.cmake @@ -23,6 +23,7 @@ if( WIN32 ) ) set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) + set( Boost_LIBRARYDIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) set( Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/ ) else() set( Boost_Bootstrap_Command ./bootstrap.sh ) From cf9bb2e0e01c59a1a6a49f3aeb4cd01bd16d9f6b Mon Sep 17 00:00:00 2001 From: Arnaud Gelas Date: Tue, 21 Oct 2014 17:59:25 +0200 Subject: [PATCH 8/8] Boost_LIBRARY_DIR -> BOOST_LIBRARY_DIR --- CMake/SuperBuild/External-Boost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/SuperBuild/External-Boost.cmake b/CMake/SuperBuild/External-Boost.cmake index 9cae302c..9d4caaea 100644 --- a/CMake/SuperBuild/External-Boost.cmake +++ b/CMake/SuperBuild/External-Boost.cmake @@ -23,7 +23,7 @@ if( WIN32 ) ) set( Boost_LIBRARY_DIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) - set( Boost_LIBRARYDIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) + set( BOOST_LIBRARYDIR ${CMAKE_BINARY_DIR}/INSTALL/lib/ ) set( Boost_INCLUDE_DIR ${CMAKE_BINARY_DIR}/INSTALL/include/ ) else() set( Boost_Bootstrap_Command ./bootstrap.sh )