History

Document boost and bison dependencies, clean up detection

Wolfgang Thaller committed 11 years ago

Commit 41e327d1 parent 2268b5f3 files · +13 −8Browse files

Unified · Split

3 files
  1. README.md +5 −4
  2. ResourceFiles/CMakeLists.txt +1 −1
  3. Rez/CMakeLists.txt +7 −3
README.md+5−4
@@ -13,21 +13,22 @@ Prerequisites · 12 unmodified lines
13-------------13-------------
14 14
15- Linux or Mac OS X15- Linux or Mac OS X
16- boost, if using gcc 4.8 or earlier to compile on Linux16- boost
17- CMake 2.817- CMake 2.8
18- GCC dependencies: GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+18- GCC dependencies: GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+
19- bison version 3.0.2 or later
19- Apple Universal Interfaces (tested with version 3.1 - see below)20- Apple Universal Interfaces (tested with version 3.1 - see below)
20- An ancient Mac and/or an emulator.21- An ancient Mac and/or an emulator.
21 22
22For Ubuntu Linux, the following should help a bit:23For Ubuntu Linux, the following should help a bit:
23 24
24 sudo apt-get install cmake libgmp-dev libmpfr-dev libmpc-dev25 sudo apt-get install cmake libgmp-dev libmpfr-dev libmpc-dev libboost-all-dev bison
25 26
26On a Mac, get the homebrew package manager and:27On a Mac, get the homebrew package manager and:
27 28
28 brew install cmake gmp mpfr libmpc29 brew install cmake gmp mpfr libmpc boost bison
29 30
30You can also run Retro68 on a PowerMac G4 or G5 running Mac OS 10.4 (Tiger).31In theory, you can also run Retro68 on a PowerMac G4 or G5 running Mac OS 10.4 (Tiger).
31In that case, get the tigerbrew package manager and32In that case, get the tigerbrew package manager and
32 33
33 brew install gcc cmake34 brew install gcc cmake
ResourceFiles/CMakeLists.txt+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18cmake_minimum_required(VERSION 2.8)18cmake_minimum_required(VERSION 2.8)
19set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Werror=return-type")19set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Werror=return-type")
20 20
21find_package(Boost COMPONENTS filesystem system)21find_package(Boost COMPONENTS filesystem system REQUIRED)
22 22
23add_library(ResourceFiles23add_library(ResourceFiles
24 ResourceFork.h ResourceFork.cc24 ResourceFork.h ResourceFork.cc
Rez/CMakeLists.txt+7−3
@@ -21,9 +21,11 @@ set(CMAKE_CXX_FLAGS "--std=c++11 -Wall") · 20 unmodified lines
21 21
22find_package(Boost COMPONENTS wave filesystem system thread regex program_options)22find_package(Boost COMPONENTS wave filesystem system thread regex program_options)
23 23
24if(Boost_FOUND)24set(CMAKE_PROGRAM_PATH $CMAKE_PROGRAM_PATH "/usr/local/opt/bison/bin")
25find_package(BISON 3.0.2)
26
27if(Boost_FOUND AND BISON_FOUND)
25 28
26find_package(BISON REQUIRED)
27 29
28include_directories(. ${CMAKE_CURRENT_BINARY_DIR})30include_directories(. ${CMAKE_CURRENT_BINARY_DIR})
29 31
@@ -68,4 +70,6 @@ install(TARGETS Rez RUNTIME DESTINATION bin) · 38 unmodified lines
68 70
69add_subdirectory(Test)71add_subdirectory(Test)
70 72
71endif(Boost_FOUND)73else(Boost_FOUND AND BISON_FOUND)
74 message(WARNING "Rez compiler will not be built; both boost and Bison 3.0.2 are required")
75endif(Boost_FOUND AND BISON_FOUND)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t