Skip to content
Snippets Groups Projects
Commit 7188def3 authored by Kyle Machulis's avatar Kyle Machulis
Browse files

Finally removed the _s's from the cmake files. Now that the support emails...

Finally removed the _s's from the cmake files. Now that the support emails will stop, who will I talk to? :(
parent f9ad9227
No related branches found
Tags 0.4.1
No related merge requests found
......@@ -31,7 +31,7 @@ cmake
with no . or options to list the generators available for your platform.
cmake will search for any required libraries on *nix platforms, since we have a reasonable set of directories to look through (/usr/*, /usr/local/*, etc...). On Windows (Visual Studio specifically), these checks are bypassed and all available projects are created (since there is no dedicated place to check for library code).
cmake will search for any required libraries on *nix platforms, since we have a reasonable set of directories to look through (/usr/*, /usr/local/*, etc...). On Windows (Visual Studio specifically), these checks are bypassed and all available projects are created (since there is no dedicated place to check for library code). You will need to prune whatever libraries you don't want to build out of the generated Visual Studio projects.
After cmake generates the files, you may use them to compile as normal.
......
......@@ -5,10 +5,10 @@ SET(SRCS falcon_dk_math.c)
IF(LIBUSB_FOUND)
IF(LIBFTDI_FOUND)
ADD_EXECUTABLE(falcon_dk_math_libftdi ${SRCS})
TARGET_LINK_LIBRARIES(falcon_dk_math_libftdi ${LIBNIFALCON_LIBFTDI}_s ${LIBFTDI}_s usb_s m)
TARGET_LINK_LIBRARIES(falcon_dk_math_libftdi ${LIBNIFALCON_LIBFTDI} ${LIBFTDI} usb m)
SET_TARGET_PROPERTIES (falcon_dk_math_libftdi PROPERTIES COMPILE_FLAGS -DLIBFTDI)
IF(UNIX AND NOT APPLE)
TARGET_LINK_LIBRARIES(falcon_dk_math_libftdi ${LIBNIFALCON_LIBFTDI}_s ${LIBFTDI}_s usb_s m glut)
TARGET_LINK_LIBRARIES(falcon_dk_math_libftdi ${LIBNIFALCON_LIBFTDI} ${LIBFTDI} usb m glut)
ENDIF(UNIX AND NOT APPLE)
IF(APPLE)
SET_TARGET_PROPERTIES (falcon_dk_math_libftdi PROPERTIES LINK_FLAGS "-framework GLUT -framework OpenGL -framework IOKit -framework Carbon")
......@@ -20,7 +20,7 @@ IF(LIBFTD2XX_FOUND)
ADD_EXECUTABLE(falcon_dk_math_ftd2xx ${SRCS})
SET_TARGET_PROPERTIES (falcon_dk_math_ftd2xx PROPERTIES COMPILE_FLAGS -DLIBFTD2XX)
IF(WIN32)
TARGET_LINK_LIBRARIES(falcon_dk_math_ftd2xx ${LIBNIFALCON_FTD2XX}_s ${LIBFTD2XX} glut32)
TARGET_LINK_LIBRARIES(falcon_dk_math_ftd2xx ${LIBNIFALCON_FTD2XX} ${LIBFTD2XX} glut32)
ENDIF(WIN32)
IF(UNIX AND NOT APPLE)
TARGET_LINK_LIBRARIES(falcon_dk_math_ftd2xx ${LIBNIFALCON_FTD2XX} ${LIBFTD2XX} m glut)
......
......@@ -5,7 +5,7 @@ SET(SRCS findfalcons.c)
IF(LIBUSB_FOUND)
IF(LIBFTDI_FOUND)
ADD_EXECUTABLE(findfalcons_libftdi ${SRCS})
TARGET_LINK_LIBRARIES(findfalcons_libftdi ${LIBNIFALCON_LIBFTDI}_s ${LIBFTDI} ${LIBUSB})
TARGET_LINK_LIBRARIES(findfalcons_libftdi ${LIBNIFALCON_LIBFTDI} ${LIBFTDI} ${LIBUSB})
SET_TARGET_PROPERTIES (findfalcons_libftdi PROPERTIES COMPILE_FLAGS -DLIBFTDI)
IF(NOT WIN32)
INSTALL(TARGETS findfalcons_libftdi RUNTIME DESTINATION "/usr/local/bin")
......@@ -15,7 +15,7 @@ ENDIF(LIBUSB_FOUND)
IF(LIBFTD2XX_FOUND)
ADD_EXECUTABLE(findfalcons_ftd2xx ${SRCS})
TARGET_LINK_LIBRARIES(findfalcons_ftd2xx ${LIBNIFALCON_FTD2XX}_s ${LIBFTD2XX})
TARGET_LINK_LIBRARIES(findfalcons_ftd2xx ${LIBNIFALCON_FTD2XX} ${LIBFTD2XX})
SET_TARGET_PROPERTIES (findfalcons_ftd2xx PROPERTIES COMPILE_FLAGS -DLIBFTD2XX)
IF(NOT WIN32)
INSTALL(TARGETS findfalcons_ftd2xx RUNTIME DESTINATION "/usr/local/bin")
......
......@@ -8,7 +8,7 @@ IF(LIBFTD2XX_FOUND)
ADD_LIBRARY (nifalcon_ftd2xx_shared SHARED ${FTD2XX_SRCS})
SET_TARGET_PROPERTIES (nifalcon_ftd2xx_static PROPERTIES COMPILE_FLAGS -DLIBFTD2XX)
SET_TARGET_PROPERTIES (nifalcon_ftd2xx_shared PROPERTIES COMPILE_FLAGS -DLIBFTD2XX)
SET_TARGET_PROPERTIES (nifalcon_ftd2xx_static PROPERTIES OUTPUT_NAME ${LIBNIFALCON_FTD2XX}_s)
SET_TARGET_PROPERTIES (nifalcon_ftd2xx_static PROPERTIES OUTPUT_NAME ${LIBNIFALCON_FTD2XX})
SET_TARGET_PROPERTIES (nifalcon_ftd2xx_shared PROPERTIES OUTPUT_NAME ${LIBNIFALCON_FTD2XX})
SET_TARGET_PROPERTIES (nifalcon_ftd2xx_shared PROPERTIES VERSION ${LIBNIFVERSION})
......@@ -29,7 +29,7 @@ IF(LIBUSB_FOUND)
ADD_LIBRARY (nifalcon_libftdi_shared SHARED ${LIBFTDI_SRCS})
SET_TARGET_PROPERTIES (nifalcon_libftdi_static PROPERTIES COMPILE_FLAGS -DLIBFTDI)
SET_TARGET_PROPERTIES (nifalcon_libftdi_shared PROPERTIES COMPILE_FLAGS -DLIBFTDI)
SET_TARGET_PROPERTIES (nifalcon_libftdi_static PROPERTIES OUTPUT_NAME ${LIBNIFALCON_LIBFTDI}_s)
SET_TARGET_PROPERTIES (nifalcon_libftdi_static PROPERTIES OUTPUT_NAME ${LIBNIFALCON_LIBFTDI})
SET_TARGET_PROPERTIES (nifalcon_libftdi_shared PROPERTIES OUTPUT_NAME ${LIBNIFALCON_LIBFTDI})
SET_TARGET_PROPERTIES (nifalcon_libftdi_shared PROPERTIES VERSION ${LIBNIFVERSION})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment