##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Merge pull request 329 from SciQLop-fork develop...
trabillard -
r910:d4ae7416f921 merge
parent child
Show More
Show file before | Show file after | Hide comments
@@ -15,7 +15,11 set (OS_LIB_EXTENSION "so")
15 if(WIN32)
15 if(WIN32)
16 set (OS_LIB_EXTENSION "dll")
16 set (OS_LIB_EXTENSION "dll")
17 endif(WIN32)
17 endif(WIN32)
18 # TODO: Add Mac Support
18
19 if (APPLE)
20 set (OS_LIB_EXTENSION "dylib")
21 endif(APPLE)
22
19 set(SCIQLOP-CORE_LIBRARIES ${LIBRARY_OUTPUT_PATH}/libsciqlop_core${DEBUG_SUFFIX}.${OS_LIB_EXTENSION})
23 set(SCIQLOP-CORE_LIBRARIES ${LIBRARY_OUTPUT_PATH}/libsciqlop_core${DEBUG_SUFFIX}.${OS_LIB_EXTENSION})
20
24
21 set(SCIQLOP-CORE_FOUND TRUE)
25 set(SCIQLOP-CORE_FOUND TRUE)
Show file before | Show file after | Hide comments
@@ -15,7 +15,11 set (OS_LIB_EXTENSION "so")
15 if(WIN32)
15 if(WIN32)
16 set (OS_LIB_EXTENSION "dll")
16 set (OS_LIB_EXTENSION "dll")
17 endif(WIN32)
17 endif(WIN32)
18 # TODO: Add Mac Support
18
19 if (APPLE)
20 set (OS_LIB_EXTENSION "dylib")
21 endif(APPLE)
22
19 set(SCIQLOP-GUI_LIBRARIES ${LIBRARY_OUTPUT_PATH}/libsciqlop_gui${DEBUG_SUFFIX}.${OS_LIB_EXTENSION})
23 set(SCIQLOP-GUI_LIBRARIES ${LIBRARY_OUTPUT_PATH}/libsciqlop_gui${DEBUG_SUFFIX}.${OS_LIB_EXTENSION})
20
24
21 set(SCIQLOP-GUI_FOUND TRUE)
25 set(SCIQLOP-GUI_FOUND TRUE)
Show file before | Show file after | Hide comments
@@ -15,7 +15,11 set (OS_LIB_EXTENSION "so")
15 if(WIN32)
15 if(WIN32)
16 set (OS_LIB_EXTENSION "dll")
16 set (OS_LIB_EXTENSION "dll")
17 endif(WIN32)
17 endif(WIN32)
18 # TODO: Add Mac Support
18
19 if (APPLE)
20 set (OS_LIB_EXTENSION "dylib")
21 endif(APPLE)
22
19 set(SCIQLOP-AMDA_LIBRARIES_NAME "libsciqlop_amda${DEBUG_SUFFIX}.${OS_LIB_EXTENSION}")
23 set(SCIQLOP-AMDA_LIBRARIES_NAME "libsciqlop_amda${DEBUG_SUFFIX}.${OS_LIB_EXTENSION}")
20 set(SCIQLOP-AMDA_LIBRARIES "${LIBRARY_OUTPUT_PATH}/${SCIQLOP-AMDA_LIBRARIES_NAME}")
24 set(SCIQLOP-AMDA_LIBRARIES "${LIBRARY_OUTPUT_PATH}/${SCIQLOP-AMDA_LIBRARIES_NAME}")
21
25
Show file before | Show file after | Hide comments
@@ -15,7 +15,11 set (OS_LIB_EXTENSION "so")
15 if(WIN32)
15 if(WIN32)
16 set (OS_LIB_EXTENSION "dll")
16 set (OS_LIB_EXTENSION "dll")
17 endif(WIN32)
17 endif(WIN32)
18 # TODO: Add Mac Support
18
19 if (APPLE)
20 set (OS_LIB_EXTENSION "dylib")
21 endif(APPLE)
22
19 set(SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME "libsciqlop_mockplugin${DEBUG_SUFFIX}.${OS_LIB_EXTENSION}")
23 set(SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME "libsciqlop_mockplugin${DEBUG_SUFFIX}.${OS_LIB_EXTENSION}")
20 set(SCIQLOP-MOCKPLUGIN_LIBRARIES "${LIBRARY_OUTPUT_PATH}/${SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME}")
24 set(SCIQLOP-MOCKPLUGIN_LIBRARIES "${LIBRARY_OUTPUT_PATH}/${SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME}")
21
25
General Comments 0
You need to be logged in to leave comments. Login now