Regard operating system specific directories

Author: SimplyDanny

Makefile.common

@@ -452,7 +452,9 @@ nox: 3rdParty/trilinos-nox/CMakeLists.txt
 	$(MAKE) -C 3rdParty/trilinos-nox/build install
 	rm -r 3rdParty/trilinos-nox/build/lib/cmake
 	mkdir -p "$(builddir_lib_omc)/cpp"
-	cp -pf 3rdParty/trilinos-nox/build/lib/* "$(builddir_lib_omc)/cpp"
+	(test `uname` = Darwin || test `uname` = Linux) \
+	  && cp -pf 3rdParty/trilinos-nox/build/lib/* "$(builddir_lib_omc)/cpp" \
+	  || cp -pf 3rdParty/trilinos-nox/build/bin/* "$(builddir_lib_omc)/cpp"
 
 clean-nox:
 	test -d 3rdParty/trilinos-nox/build && cd 3rdParty/trilinos-nox/build && make clean

SimulationRuntime/cpp/CMakeLists.txt

@@ -654,7 +654,11 @@ IF(USE_TRILINOS)
     SET(Trilinos_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/trilinos-nox/build")
   ENDIF(MSVC)
   SET(TRILINOS_INLCUDE_HOME  ${Trilinos_Path}/include)
-  SET(TRILINOS_LIBRARY_RELEASE_HOME  ${Trilinos_Path}/bin)
+  IF(WIN32)
+    SET(TRILINOS_LIBRARY_RELEASE_HOME  ${Trilinos_Path}/bin)
+  ELSE(WIN32)
+    SET(TRILINOS_LIBRARY_RELEASE_HOME  ${Trilinos_Path}/lib)
+  ENDIF(WIN32)
   MESSAGE(STATUS "Trilinos include:")
   MESSAGE(STATUS "${TRILINOS_INLCUDE_HOME}")
   MESSAGE(STATUS "Trilinos library:")