GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r911:f9b30b97e672

Add mac support in cmake

Thibaud Rabillard -

r911:f9b30b97e672

parent child

Context file:

r911:f9b30b97e672

core/cmake/Findsciqlop-core.cmake +5 -1

             if(WIN32)
                 set (OS_LIB_EXTENSION "dll")
             endif(WIN32)
-            # TODO: Add Mac Support
+            if (APPLE)
+                set (OS_LIB_EXTENSION "dylib")
+            endif(APPLE)
             set(SCIQLOP-CORE_LIBRARIES ${LIBRARY_OUTPUT_PATH}/libsciqlop_core${DEBUG_SUFFIX}.${OS_LIB_EXTENSION})
             set(SCIQLOP-CORE_FOUND TRUE)

gui/cmake/Findsciqlop-gui.cmake +5 -1

             if(WIN32)
                 set (OS_LIB_EXTENSION "dll")
             endif(WIN32)
-            # TODO: Add Mac Support
+            if (APPLE)
+                set (OS_LIB_EXTENSION "dylib")
+            endif(APPLE)
             set(SCIQLOP-GUI_LIBRARIES ${LIBRARY_OUTPUT_PATH}/libsciqlop_gui${DEBUG_SUFFIX}.${OS_LIB_EXTENSION})
             set(SCIQLOP-GUI_FOUND TRUE)

plugins/amda/cmake/Findsciqlop-amda.cmake +5 -1

             if(WIN32)
                 set (OS_LIB_EXTENSION "dll")
             endif(WIN32)
-            # TODO: Add Mac Support
+            if (APPLE)
+                set (OS_LIB_EXTENSION "dylib")
+            endif(APPLE)
             set(SCIQLOP-AMDA_LIBRARIES_NAME "libsciqlop_amda${DEBUG_SUFFIX}.${OS_LIB_EXTENSION}")
             set(SCIQLOP-AMDA_LIBRARIES "${LIBRARY_OUTPUT_PATH}/${SCIQLOP-AMDA_LIBRARIES_NAME}")

plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake +5 -1

             if(WIN32)
                 set (OS_LIB_EXTENSION "dll")
             endif(WIN32)
-            # TODO: Add Mac Support
+            if (APPLE)
+                set (OS_LIB_EXTENSION "dylib")
+            endif(APPLE)
             set(SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME "libsciqlop_mockplugin${DEBUG_SUFFIX}.${OS_LIB_EXTENSION}")
             set(SCIQLOP-MOCKPLUGIN_LIBRARIES "${LIBRARY_OUTPUT_PATH}/${SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME}")

General Comments 3

trabillard

|

Auto status change to "Under Review"

trabillard

|

Status change > Approved

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages