Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional work with cmake on Windows, still does not work

Browse Source
This commit is contained in:
xawotihs
2015-09-27 23:23:31 +02:00
parent 85f4a4c36a
commit 34279cfacf
9 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeModules/FindOrBuild.cmake
View File

@@ -46,25 +46,25 @@ macro(FindOrBuildUNZIP)
endmacro()
macro(FindOrBuildBoost)
if(PSP OR UNIX)
if(PSP OR UNIX OR WIN32)
#the psp build does not need more than a few headers
#todo: remove from the repository
set(BOOST_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty)
elseif(WIN32)
# elseif(WIN32)
#set BOOST_ROOT to the root of boost
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED ON)
set(BOOST_ROOT $ENV{BOOST_ROOT})
# set(Boost_USE_STATIC_LIBS ON)
# set(Boost_USE_MULTITHREADED ON)
# set(BOOST_ROOT $ENV{BOOST_ROOT})
set(BOOST_LIBRARYDIR ${BOOST_ROOT}/libs)
set(BOOST_INCLUDEDIR ${BOOST_ROOT})
# set(BOOST_LIBRARYDIR ${BOOST_ROOT}/libs)
# set(BOOST_INCLUDEDIR ${BOOST_ROOT})
find_package(Boost COMPONENTS system thread date_time REQUIRED)
if(NOT Boost_FOUND)
message("Set the BOOST_ROOT environment variable to point to your boost installation.")
message("We need system thread and date_time compiled static libs")
message("These libs are compiler specific.")
endif()
# find_package(Boost COMPONENTS system thread date_time REQUIRED)
# if(NOT Boost_FOUND)
# message("Set the BOOST_ROOT environment variable to point to your boost installation.")
# message("We need system thread and date_time compiled static libs")
# message("These libs are compiler specific.")
# endif()
# elseif(UNIX AND NOT ANDROID)
# find_package(Boost COMPONENTS system thread date_time REQUIRED)
elseif(ANDROID)
@@ -86,7 +86,9 @@ endmacro()
macro(FindOrBuildZLIB)
if(BUILD_ZLIB)
message(WARNING "ZLIB sources are currently not included within the wagic tree")
add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/zlib ${CMAKE_BINARY_DIR}/thirdparty/zlib)
set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/zlib)
set(ZLIB_LIBRARY zlib)
else()
if(WIN32)
set(ZLIB_ROOT ${CMAKE_SOURCE_DIR}/thirdparty/binary/win)
@@ -94,7 +96,7 @@ macro(FindOrBuildZLIB)
else()
find_package(ZLIB)
endif()
endif()
endif()
endmacro()
macro(FindOrBuildGIF)