Changeset 812 for library/system

Timestamp:

02/21/10 22:36:35 (14 years ago)

Author:

smidl

Message:

ITPP included into BDM

Files:

• library/system/SetBdmEnv.cmake (modified) (4 diffs)

library/system/SetBdmEnv.cmake

@@ -53 +53 @@
 INCLUDE(CMakeLists.local OPTIONAL)      
 
-FIND_PACKAGE(ITPP REQUIRED)
+#FIND_PACKAGE(ITPP REQUIRED)
 FIND_PACKAGE(ACML COMPONENTS)
 FIND_PACKAGE(Matlab COMPONENTS)
 
-IF(ITPP_FOUND)
-        INCLUDE_DIRECTORIES(${ITPP_INCLUDE_DIR})
-        LINK_DIRECTORIES(${NATIVE_ITPP_LIB_PATH})
-ENDIF(ITPP_FOUND)
+INCLUDE_DIRECTORIES("${BDM_SOURCE_DIR}/bdm/base")#${ITPP_INCLUDE_DIR})
+LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm/base/itpp")#${NATIVE_ITPP_LIB_PATH})
 
 IF(ACML_FOUND)
@@ -87 +85 @@
 MACRO(EXEC FN)
         add_executable (${FN} ${FN}.cpp)
+        target_link_libraries (${FN} bdm)
         IF(WIN32)
                 target_link_libraries (${FN} debug itpp_debug)
@@ -98 +97 @@
                         target_link_libraries (${FN} debug itpp_debug)
                         target_link_libraries (${FN} optimized itpp)
+                        target_link_libraries (${FN} lapack blas)
                 ELSE(ITPP_LIBRARY_DEBUG)
                         target_link_libraries (${FN} itpp)      
-                ENDIF(ITPP_LIBRARY_DEBUG)
+                        target_link_libraries (${FN} lapack blas)
+        ENDIF(ITPP_LIBRARY_DEBUG)
         ENDIF(WIN32)
-        target_link_libraries (${FN} bdm)
         target_link_libraries (${FN} ${ARGN}) ## Additional libraries can be added to a macro
 ENDMACRO(EXEC)
 
 MACRO(LINK_EXEC FN)
+        target_link_libraries (${FN} bdm)
         IF(WIN32)
                 target_link_libraries (${FN} debug itpp_debug)
@@ -118 +119 @@
                         target_link_libraries (${FN} debug itpp_debug)
                         target_link_libraries (${FN} optimized itpp)
+                        target_link_libraries (${FN} lapack blas)
                 ELSE(ITPP_LIBRARY_DEBUG)
                         target_link_libraries (${FN} itpp)      
+                        target_link_libraries (${FN} lapack blas)
                 ENDIF(ITPP_LIBRARY_DEBUG)
         ENDIF(WIN32)
-        target_link_libraries (${FN} bdm)
 ENDMACRO(LINK_EXEC)
         
 MACRO(MEX FN)
         IF(MATLAB_FOUND)
-        INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm")
-        LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm")
-        IF(APPLE)
-            LINK_DIRECTORIES("/Applications/MATLAB_R2007b/bin/maci/")
-        ENDIF(APPLE)
-        IF(WIN32)
-                ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp "${BDM_SOURCE_DIR}/system/mexFunction.def")
-        ELSE(WIN32)
-                ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp)
-        ENDIF(WIN32)
+                INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm")
+                LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm")
+                IF(APPLE)
+                    LINK_DIRECTORIES("/Applications/MATLAB_R2007b/bin/maci/")
+                ENDIF(APPLE)
+                IF(WIN32)
+                        ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp "${BDM_SOURCE_DIR}/system/mexFunction.def")
+                ELSE(WIN32)
+                        ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp)
+                ENDIF(WIN32)
 
-        set_target_properties("${FN}.${MATLAB_MEX_SUFFIX}" PROPERTIES
-                PREFIX ""
-                SUFFIX "" 
-                COMPILE_FLAGS "-DMEX"
-        )
-        # general libraries
-        TARGET_LINK_LIBRARIES("${FN}.${MATLAB_MEX_SUFFIX}" ${MATLAB_LIBRARIES} bdm itpp)
-        # platform specific libraries
-        IF(WIN32)
-                target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" libacml_dll)
-        ELSE(WIN32)
-                IF(APPLE)
-                        target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${FRAMEWORK_VECLIB})
-                ENDIF(APPLE)
-        ENDIF(WIN32)
-        ## Additional libraries can be added to a macro
-        target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${ARGN}) 
+                set_target_properties("${FN}.${MATLAB_MEX_SUFFIX}" PROPERTIES
+                        PREFIX ""
+                        SUFFIX "" 
+                        COMPILE_FLAGS "-DMEX"
+                )
+                # general libraries
+                TARGET_LINK_LIBRARIES("${FN}.${MATLAB_MEX_SUFFIX}" ${MATLAB_LIBRARIES} bdm itpp lapack blas)
+                # platform specific libraries
+                IF(WIN32)
+                        target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" libacml_dll)
+                ELSE(WIN32)
+                        IF(APPLE)
+                                target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${FRAMEWORK_VECLIB})
+                        ENDIF(APPLE)
+                ENDIF(WIN32)
+                ## Additional libraries can be added to a macro
+                target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${ARGN}) 
         ENDIF(MATLAB_FOUND)
 ENDMACRO(MEX)