linux build cmake

Author: formath

Diff for: CMakeLists.txt

@@ -2,7 +2,15 @@ cmake_minimum_required(VERSION 2.8)
 
 project(tensorflow-predictor-cpp)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -msse4.1 -fPIC -O3 -ggdb -Wall -finline-functions -undefined dynamic_lookup -all_load")
+if(UNIX AND NOT APPLE)
+    set(LINUX TRUE)
+endif()
+if (LINUX)
+	SET(LDFLAGS "-std=c++11 -msse4.1 -fPIC -O3 -ggdb -Wall -finline-functions -Wl,--allow-multiple-definition -Wl,--whole-archive")
+else()
+	SET(LDFLAGS "-std=c++11 -msse4.1 -fPIC -O3 -ggdb -Wall -finline-functions -undefined dynamic_lookup -all_load")
+endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LDFLAGS}")
 
 message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
 message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")

Diff for: README.md

@@ -118,10 +118,6 @@ output value: 0.0553177
 The output value may be different.
 
 # Build on Linux
-The procedure is similar with that of OSX except for you should change those configuration.
-* remove `-undefined dynamic_lookup -all_load` in `CMakeLists.txt`
-* add `-Wl,--allow-multiple-definition -Wl,--whole-archive` in `CMakeLists.txt`
-* change `default.macos.c++11` to `default.linux.c++11` in `src/CMakeLists.txt`
-* append `dl` to `list(APPEND DEEP_CTR_LINKER_LIBS)` in `src/CMakeLists.txt`
+The procedure is similar with that of OSX.
 
 

Diff for: src/CMakeLists.txt

@@ -12,15 +12,28 @@ include_directories(
 
 link_directories(
 	${PROJECT_SOURCE_DIR}/../tensorflow/tensorflow/contrib/makefile/gen/lib
-	${PROJECT_SOURCE_DIR}/../tensorflow/tensorflow/contrib/makefile/gen/protobuf-host/lib
-	${PROJECT_SOURCE_DIR}/../tensorflow/tensorflow/contrib/makefile/downloads/nsync/builds/default.macos.c++11)
+	${PROJECT_SOURCE_DIR}/../tensorflow/tensorflow/contrib/makefile/gen/protobuf-host/lib)
+
+if(UNIX AND NOT APPLE)
+    set(LINUX TRUE)
+endif()
+if (LINUX)
+	link_directories(
+		${PROJECT_SOURCE_DIR}/../tensorflow/tensorflow/contrib/makefile/downloads/nsync/builds/default.linux.c++11)
+else()
+	link_directories(
+		${PROJECT_SOURCE_DIR}/../tensorflow/tensorflow/contrib/makefile/downloads/nsync/builds/default.maxos.c++11)
+endif()
 
 set(DEEP_CTR_LINKER_LIBS "")
 list(APPEND DEEP_CTR_LINKER_LIBS
 	libtensorflow-core.a
 	libprotobuf.a
 	${PROJECT_SOURCE_DIR}/../tensorflow/tensorflow/contrib/makefile/downloads/nsync/builds/default.macos.c++11/nsync.a
 	pthread m z)
+if (LINUX)
+	list(APPEND DEEP_CTR_LINKER_LIBS dl)
+endif()
 
 # executable
 set(SIMPLE_MODEL "simple_model.bin")