diff --git a/CMakeLists.txt b/CMakeLists.txt index b321261..56ba17b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,8 @@ cmake_minimum_required(VERSION 2.6) -#set( CMAKE_OSX_ARCHITECTURES ppc;i386 ) # Uncomment for universal binary - -#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../bin) -#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../bin) -#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ../bin) +IF(APPLE) +# set( CMAKE_OSX_ARCHITECTURES ppc;i386 ) # Uncomment for universal binary +ENDIF(APPLE) include_directories(/usr/local/include $ENV{EXTRA_INC}) diff --git a/README.markdown b/README.markdown index 6afb42b..252acc1 100644 --- a/README.markdown +++ b/README.markdown @@ -31,11 +31,11 @@ Note that libusb-1.0 must have been built and installed prior to this step. Thi Download and install [CMake](http://www.cmake.org/cmake/resources/software.html). Then: cd libpinproc - mkdir build; cd build + mkdir bin; cd bin cmake .. make -The CMakeLists.txt file is presently designed to be run from a directory inside the libpinproc directory. This will build both libpinproc and pinproctest. Binaries will be placed in the directory that make was run from. +The CMakeLists.txt file is presently designed to be run from a directory inside the libpinproc directory. This will build both libpinproc and pinproctest. Binaries will be placed in the directory that make was run from. We recommend 'bin', as it is the path expected by pypinproc. Note: On some systems, it may be necessary to build libpinproc with the '-fPIC' option. To do this with cmake, instead of running 'cmake ..', run 'cmake .. -DCMAKE_CXX_FLAGS="-fPIC"'. Compiling without '-fPIC' may cause problems when building the python extensions on some 64-bit Linux machines.